Merge mozilla-central to mozilla-inbound

dom/base/nsDOMWindowUtils.cpp

@@ -2326,26 +2326,6 @@ nsDOMWindowUtils::GetLayerManagerRemote(bool* retval)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsDOMWindowUtils::GetUsingAdvancedLayers(bool* retval)
-{
-  nsCOMPtr<nsIWidget> widget = GetWidget();
-  if (!widget) {
-    return NS_ERROR_FAILURE;
-  }
-
-  LayerManager *mgr = widget->GetLayerManager();
-  if (!mgr) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *retval = false;
-  if (KnowsCompositor* fwd = mgr->AsKnowsCompositor()) {
-    *retval = fwd->GetTextureFactoryIdentifier().mUsingAdvancedLayers;
-  }
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDOMWindowUtils::GetSupportsHardwareH264Decoding(JS::MutableHandle<JS::Value> aPromise)
 {

dom/canvas/WebGLShaderValidator.cpp

@@ -44,8 +44,8 @@ ChooseValidatorCompileOptions(const ShBuiltInResources& resources,
     options |= SH_CLAMP_INDIRECT_ARRAY_BOUNDS;
 #endif
 
-    if (gl->WorkAroundDriverBugs()) {
 #ifdef XP_MACOSX
+    if (gl->WorkAroundDriverBugs()) {
         // Work around https://bugs.webkit.org/show_bug.cgi?id=124684,
         // https://chromium.googlesource.com/angle/angle/+/5e70cf9d0b1bb
         options |= SH_UNFOLD_SHORT_CIRCUIT;
@@ -59,13 +59,6 @@ ChooseValidatorCompileOptions(const ShBuiltInResources& resources,
             options |= SH_ADD_AND_TRUE_TO_LOOP_CONDITION;
 #endif
 
-        if (!gl->IsANGLE() && gl->Vendor() == gl::GLVendor::Intel) {
-            // Failures on at least Windows+Intel+OGL on:
-            // conformance/glsl/constructors/glsl-construct-mat2.html
-            options |= SH_SCALARIZE_VEC_AND_MAT_CONSTRUCTOR_ARGS;
-        }
-    }
-
     if (gfxPrefs::WebGLAllANGLEOptions()) {
         options = -1;
 

dom/interfaces/base/nsIDOMWindowUtils.idl

@@ -1416,11 +1416,6 @@ interface nsIDOMWindowUtils : nsISupports {
    */
   readonly attribute boolean layerManagerRemote;
 
-  /**
-   * True if advanced layers is enabled on this window, false otherwise.
-   */
-  readonly attribute boolean usingAdvancedLayers;
-
   /**
    * Returns a Promise that will be resolved with a string once the capabilities
    * of the h264 decoder have been determined.

gfx/config/gfxFeature.h

@@ -26,7 +26,6 @@ namespace gfx {
   _(GPU_PROCESS,                  Feature,      "GPU Process")                    \
   _(WEBRENDER,                    Feature,      "WebRender")                      \
   _(OMTP,                         Feature,      "Off Main Thread Painting")       \
-  _(ADVANCED_LAYERS,              Feature,      "Advanced Layers")                \
   /* Add new entries above this comment */
 
 enum class Feature : uint32_t {

gfx/ipc/CompositorOptions.h

@@ -32,25 +32,18 @@ class CompositorOptions
   CompositorOptions()
     : mUseAPZ(false)
     , mUseWebRender(false)
-    , mUseAdvancedLayers(false)
   {
   }
 
   explicit CompositorOptions(bool aUseAPZ,
                              bool aUseWebRender)
     : mUseAPZ(aUseAPZ)
     , mUseWebRender(aUseWebRender)
-    , mUseAdvancedLayers(false)
   {
   }
 
   bool UseAPZ() const { return mUseAPZ; }
   bool UseWebRender() const { return mUseWebRender; }
-  bool UseAdvancedLayers() const { return mUseAdvancedLayers; }
-
-  void SetUseAdvancedLayers(bool aUseAdvancedLayers) {
-    mUseAdvancedLayers = aUseAdvancedLayers;
-  }
 
   bool operator==(const CompositorOptions& aOther) const {
     return mUseAPZ == aOther.mUseAPZ &&
@@ -62,7 +55,6 @@ class CompositorOptions
 private:
   bool mUseAPZ;
   bool mUseWebRender;
-  bool mUseAdvancedLayers;
 
   // Make sure to add new fields to the ParamTraits implementation
 };

gfx/ipc/GPUChild.cpp

@@ -67,7 +67,6 @@ GPUChild::Init()
   devicePrefs.hwCompositing() = gfxConfig::GetValue(Feature::HW_COMPOSITING);
   devicePrefs.d3d11Compositing() = gfxConfig::GetValue(Feature::D3D11_COMPOSITING);
   devicePrefs.oglCompositing() = gfxConfig::GetValue(Feature::OPENGL_COMPOSITING);
-  devicePrefs.advancedLayers() = gfxConfig::GetValue(Feature::ADVANCED_LAYERS);
   devicePrefs.useD2D1() = gfxConfig::GetValue(Feature::DIRECT2D);
 
   nsTArray<LayerTreeIdMapping> mappings;
@@ -273,13 +272,6 @@ GPUChild::ActorDestroy(ActorDestroyReason aWhy)
   mHost->OnChannelClosed();
 }
 
-mozilla::ipc::IPCResult
-GPUChild::RecvUpdateFeature(const Feature& aFeature, const FeatureFailure& aChange)
-{
-  gfxConfig::SetFailed(aFeature, aChange.status(), aChange.message().get(), aChange.failureId());
-  return IPC_OK();
-}
-
 class DeferredDeleteGPUChild : public Runnable
 {
 public:

gfx/ipc/GPUChild.h

@@ -58,7 +58,6 @@ class GPUChild final
   mozilla::ipc::IPCResult RecvNotifyDeviceReset(const GPUDeviceData& aData) override;
   mozilla::ipc::IPCResult RecvAddMemoryReport(const MemoryReport& aReport) override;
   mozilla::ipc::IPCResult RecvFinishMemoryReport(const uint32_t& aGeneration) override;
-  mozilla::ipc::IPCResult RecvUpdateFeature(const Feature& aFeature, const FeatureFailure& aChange) override;
 
   bool SendRequestMemoryReport(const uint32_t& aGeneration,
                                const bool& aAnonymize,

gfx/ipc/GPUParent.cpp

@@ -29,7 +29,6 @@
 #include "mozilla/layers/ImageBridgeParent.h"
 #include "mozilla/layers/LayerTreeOwnerTracker.h"
 #include "mozilla/layers/UiCompositorControllerParent.h"
-#include "mozilla/layers/MemoryReportingMLGPU.h"
 #include "mozilla/webrender/RenderThread.h"
 #include "nsDebugImpl.h"
 #include "nsExceptionHandler.h"
@@ -105,7 +104,6 @@ GPUParent::Init(base::ProcessId aParentPid,
   gfxPlatform::InitNullMetadata();
   // Ensure our Factory is initialised, mainly for gfx logging to work.
   gfxPlatform::InitMoz2DLogging();
-  mlg::InitializeMemoryReporters();
 #if defined(XP_WIN)
   DeviceManagerDx::Init();
 #endif
@@ -170,7 +168,6 @@ GPUParent::RecvInit(nsTArray<GfxPrefSetting>&& prefs,
   gfxConfig::Inherit(Feature::HW_COMPOSITING, devicePrefs.hwCompositing());
   gfxConfig::Inherit(Feature::D3D11_COMPOSITING, devicePrefs.d3d11Compositing());
   gfxConfig::Inherit(Feature::OPENGL_COMPOSITING, devicePrefs.oglCompositing());
-  gfxConfig::Inherit(Feature::ADVANCED_LAYERS, devicePrefs.advancedLayers());
   gfxConfig::Inherit(Feature::DIRECT2D, devicePrefs.useD2D1());
 
   for (const LayerTreeIdMapping& map : aMappings) {
@@ -303,7 +300,6 @@ GPUParent::RecvGetDeviceStatus(GPUDeviceData* aOut)
 {
   CopyFeatureChange(Feature::D3D11_COMPOSITING, &aOut->d3d11Compositing());
   CopyFeatureChange(Feature::OPENGL_COMPOSITING, &aOut->oglCompositing());
-  CopyFeatureChange(Feature::ADVANCED_LAYERS, &aOut->advancedLayers());
 
 #if defined(XP_WIN)
   if (DeviceManagerDx* dm = DeviceManagerDx::Get()) {

gfx/ipc/GfxMessageUtils.h

@@ -13,7 +13,6 @@
 #include "RegionBuilder.h"
 #include "base/process_util.h"
 #include "chrome/common/ipc_message_utils.h"
-#include "gfxFeature.h"
 #include "gfxPoint.h"
 #include "gfxRect.h"
 #include "gfxTelemetry.h"
@@ -220,14 +219,6 @@ struct ParamTraits<mozilla::gfx::BackendType>
              mozilla::gfx::BackendType::BACKEND_LAST>
 {};
 
-template <>
-struct ParamTraits<mozilla::gfx::Feature>
-  : public ContiguousEnumSerializer<
-             mozilla::gfx::Feature,
-             mozilla::gfx::Feature::HW_COMPOSITING,
-             mozilla::gfx::Feature::NumValues>
-{};
-
 template <>
 struct ParamTraits<mozilla::gfx::FeatureStatus>
   : public ContiguousEnumSerializer<
@@ -913,7 +904,6 @@ struct ParamTraits<mozilla::Array<T, Length>>
   }
 };
 
-
 } /* namespace IPC */
 
 #endif /* __GFXMESSAGEUTILS_H__ */

gfx/ipc/GraphicsMessages.ipdlh

@@ -28,7 +28,6 @@ struct DevicePrefs
   FeatureStatus hwCompositing;
   FeatureStatus d3d11Compositing;
   FeatureStatus oglCompositing;
-  FeatureStatus advancedLayers;
   FeatureStatus useD2D1;
 };
 
@@ -64,7 +63,6 @@ struct GPUDeviceData
 {
   FeatureChange d3d11Compositing;
   FeatureChange oglCompositing;
-  FeatureChange advancedLayers;
   GPUDeviceStatus gpuDevice;
 };
 

gfx/ipc/PGPU.ipdl

@@ -21,7 +21,6 @@ using mozilla::Telemetry::ScalarAction from "mozilla/TelemetryComms.h";
 using mozilla::Telemetry::KeyedScalarAction from "mozilla/TelemetryComms.h";
 using mozilla::Telemetry::ChildEventData from "mozilla/TelemetryComms.h";
 using mozilla::Telemetry::DiscardedData from "mozilla/TelemetryComms.h";
-using mozilla::gfx::Feature from "gfxFeature.h";
 
 namespace mozilla {
 namespace gfx {
@@ -116,10 +115,6 @@ child:
 
   async AddMemoryReport(MemoryReport aReport);
   async FinishMemoryReport(uint32_t aGeneration);
-
-  // Update the UI process after a feature's status has changed. This is used
-  // outside of the normal startup flow.
-  async UpdateFeature(Feature aFeature, FeatureFailure aChange);
 };
 
 } // namespace gfx

gfx/layers/CompositorTypes.h

@@ -175,7 +175,6 @@ struct TextureFactoryIdentifier
   bool mSupportsPartialUploads;
   bool mSupportsComponentAlpha;
   bool mSupportsBackdropCopyForComponentAlpha;
-  bool mUsingAdvancedLayers;
   SyncHandle mSyncHandle;
 
   explicit TextureFactoryIdentifier(LayersBackend aLayersBackend = LayersBackend::LAYERS_NONE,
@@ -194,7 +193,6 @@ struct TextureFactoryIdentifier
     , mSupportsPartialUploads(aSupportsPartialUploads)
     , mSupportsComponentAlpha(aSupportsComponentAlpha)
     , mSupportsBackdropCopyForComponentAlpha(true)
-    , mUsingAdvancedLayers(false)
     , mSyncHandle(aSyncHandle)
   {}
 };

gfx/layers/LayersHelpers.h

@@ -10,7 +10,6 @@
 #include "mozilla/gfx/Rect.h"
 #include "mozilla/gfx/Matrix.h"
 #include "mozilla/gfx/Polygon.h"
-#include "nsRegion.h"
 #include "nsTArray.h"
 
 namespace mozilla {

gfx/layers/apz/util/ContentProcessController.cpp

@@ -9,7 +9,6 @@
 #include "mozilla/dom/TabChild.h"
 #include "mozilla/layers/APZCCallbackHelper.h"
 #include "mozilla/layers/APZChild.h"
-#include "nsIContentInlines.h"
 
 #include "InputData.h"                  // for InputData
 

gfx/layers/composite/LayerManagerComposite.h

@@ -63,8 +63,6 @@ class TextRenderer;
 class CompositingRenderTarget;
 struct FPSState;
 class PaintCounter;
-class LayerMLGPU;
-class LayerManagerMLGPU;
 class UiCompositorControllerParent;
 
 static const int kVisualWarningDuration = 150; // ms
@@ -125,9 +123,6 @@ class HostLayerManager : public LayerManager
   virtual HostLayerManager* AsHostLayerManager() override {
     return this;
   }
-  virtual LayerManagerMLGPU* AsLayerManagerMLGPU() {
-    return nullptr;
-  }
 
   void ExtractImageCompositeNotifications(nsTArray<ImageCompositeNotificationInfo>* aNotifications)
   {
@@ -555,8 +550,6 @@ class HostLayer
 
   virtual Layer* GetLayer() = 0;
 
-  virtual LayerMLGPU* AsLayerMLGPU() { return nullptr; }
-
   virtual bool SetCompositableHost(CompositableHost*)
   {
     // We must handle this gracefully, see bug 967824
@@ -576,10 +569,6 @@ class HostLayer
   {
     mShadowVisibleRegion = aRegion;
   }
-  void SetShadowVisibleRegion(LayerIntRegion&& aRegion)
-  {
-    mShadowVisibleRegion = Move(aRegion);
-  }
 
   void SetShadowOpacity(float aOpacity)
   {
@@ -607,12 +596,11 @@ class HostLayer
   // These getters can be used anytime.
   float GetShadowOpacity() { return mShadowOpacity; }
   const Maybe<ParentLayerIntRect>& GetShadowClipRect() { return mShadowClipRect; }
-  const LayerIntRegion& GetShadowVisibleRegion() const { return mShadowVisibleRegion; }
+  const LayerIntRegion& GetShadowVisibleRegion() { return mShadowVisibleRegion; }
   const gfx::Matrix4x4& GetShadowBaseTransform() { return mShadowTransform; }
   gfx::Matrix4x4 GetShadowTransform();
   bool GetShadowTransformSetByAnimation() { return mShadowTransformSetByAnimation; }
   bool GetShadowOpacitySetByAnimation() { return mShadowOpacitySetByAnimation; }
-  LayerIntRegion&& GetShadowVisibleRegion() { return Move(mShadowVisibleRegion); }
 
 protected:
   HostLayerManager* mCompositorManager;

gfx/layers/d3d11/CompositorD3D11.cpp

@@ -47,7 +47,7 @@ using namespace gfx;
 
 namespace layers {
 
-bool CanUsePartialPresents(ID3D11Device* aDevice);
+static bool CanUsePartialPresents(ID3D11Device* aDevice);
 
 const FLOAT sBlendFactor[] = { 0, 0, 0, 0 };
 
@@ -255,7 +255,7 @@ CompositorD3D11::Initialize(nsCString* const out_failureReason)
   return true;
 }
 
-bool
+static bool
 CanUsePartialPresents(ID3D11Device* aDevice)
 {
   if (gfxPrefs::PartialPresent() > 0) {