From 40947fdc4f3991e912004b09693ae185617bf3ab Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Wed, 25 Jan 2017 14:03:36 -0500 Subject: [PATCH] Bug 1333503 - Remove some dead code relating to overfill calculation. r=mchang,mrbkap MozReview-Commit-ID: HiT0jJynpyC --- dom/base/nsGlobalWindow.cpp | 18 ----------- dom/base/nsGlobalWindow.h | 1 - dom/webidl/Window.webidl | 11 ------- gfx/layers/Layers.h | 6 ---- gfx/layers/client/ClientLayerManager.cpp | 30 ------------------- gfx/layers/client/ClientLayerManager.h | 3 -- gfx/layers/ipc/CompositorBridgeChild.cpp | 17 ----------- gfx/layers/ipc/CompositorBridgeChild.h | 8 ----- gfx/layers/ipc/CompositorBridgeParent.cpp | 8 ----- gfx/layers/ipc/CompositorBridgeParent.h | 1 - .../ipc/CrossProcessCompositorBridgeParent.h | 1 - gfx/layers/ipc/PCompositorBridge.ipdl | 6 ---- 12 files changed, 110 deletions(-) diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index ca9fb9a77f30..d50c7a3f6d68 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -8000,24 +8000,6 @@ nsGlobalWindow::MozScrollSnap() } } -void -nsGlobalWindow::MozRequestOverfill(OverfillCallback& aCallback, - mozilla::ErrorResult& aError) -{ - MOZ_ASSERT(IsInnerWindow()); - - nsIWidget* widget = nsContentUtils::WidgetForDocument(mDoc); - if (widget) { - mozilla::layers::LayerManager* manager = widget->GetLayerManager(); - if (manager) { - manager->RequestOverfill(&aCallback); - return; - } - } - - aError.Throw(NS_ERROR_NOT_AVAILABLE); -} - void nsGlobalWindow::ClearTimeout(int32_t aHandle) { diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h index 85ce8170bab5..16ccbae39053 100644 --- a/dom/base/nsGlobalWindow.h +++ b/dom/base/nsGlobalWindow.h @@ -1071,7 +1071,6 @@ public: { return GetScrollY(aError); } - void MozRequestOverfill(mozilla::dom::OverfillCallback& aCallback, mozilla::ErrorResult& aError); void GetScreenX(JSContext* aCx, JS::MutableHandle aValue, mozilla::dom::CallerType aCallerType, mozilla::ErrorResult& aError); diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl index 1a2b9b707436..6e7b4659fff3 100644 --- a/dom/webidl/Window.webidl +++ b/dom/webidl/Window.webidl @@ -207,17 +207,6 @@ partial interface Window { [Throws, NeedsCallerType] attribute any outerHeight; }; -/** - * Special function that gets the fill ratio from the compositor used for testing - * and is an indicator that we're layerizing correctly. - * This function will call the given callback current fill ratio for a - * composited frame. We don't guarantee which frame fill ratios will be returned. - */ -partial interface Window { - [ChromeOnly, Throws] void mozRequestOverfill(OverfillCallback callback); -}; -callback OverfillCallback = void (unsigned long overfill); - // https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/RequestAnimationFrame/Overview.html partial interface Window { [Throws] long requestAnimationFrame(FrameRequestCallback callback); diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h index cccfb04c2dd4..3d908799c961 100644 --- a/gfx/layers/Layers.h +++ b/gfx/layers/Layers.h @@ -70,10 +70,6 @@ namespace gfx { class DrawTarget; } // namespace gfx -namespace dom { -class OverfillCallback; -} // namespace dom - namespace layers { class Animation; @@ -642,8 +638,6 @@ public: bool IsInTransaction() const { return mInTransaction; } virtual void GetFrameUniformity(FrameUniformityData* aOutData) { } - virtual bool RequestOverfill(mozilla::dom::OverfillCallback* aCallback) { return true; } - virtual void RunOverfillCallback(const uint32_t aOverfill) { } virtual void SetRegionToClear(const nsIntRegion& aRegion) { diff --git a/gfx/layers/client/ClientLayerManager.cpp b/gfx/layers/client/ClientLayerManager.cpp index dec312000f68..1e59e87a3347 100644 --- a/gfx/layers/client/ClientLayerManager.cpp +++ b/gfx/layers/client/ClientLayerManager.cpp @@ -26,7 +26,6 @@ #include "nsTArray.h" // for AutoTArray #include "nsXULAppAPI.h" // for XRE_GetProcessType, etc #include "TiledLayerBuffer.h" -#include "mozilla/dom/WindowBinding.h" // for Overfill Callback #include "FrameLayerBuilder.h" // for FrameLayerbuilder #ifdef MOZ_WIDGET_ANDROID #include "AndroidBridge.h" @@ -545,35 +544,6 @@ ClientLayerManager::GetFrameUniformity(FrameUniformityData* aOutData) return LayerManager::GetFrameUniformity(aOutData); } -bool -ClientLayerManager::RequestOverfill(mozilla::dom::OverfillCallback* aCallback) -{ - MOZ_ASSERT(aCallback != nullptr); - MOZ_ASSERT(HasShadowManager(), "Request Overfill only supported on b2g for now"); - - if (HasShadowManager()) { - CompositorBridgeChild* child = GetRemoteRenderer(); - NS_ASSERTION(child, "Could not get CompositorBridgeChild"); - - child->AddOverfillObserver(this); - child->SendRequestOverfill(); - mOverfillCallbacks.AppendElement(aCallback); - } - - return true; -} - -void -ClientLayerManager::RunOverfillCallback(const uint32_t aOverfill) -{ - for (size_t i = 0; i < mOverfillCallbacks.Length(); i++) { - ErrorResult error; - mOverfillCallbacks[i]->Call(aOverfill, error); - } - - mOverfillCallbacks.Clear(); -} - void ClientLayerManager::MakeSnapshotIfRequired() { diff --git a/gfx/layers/client/ClientLayerManager.h b/gfx/layers/client/ClientLayerManager.h index ace3d0ed726d..818a5f9e1bd2 100644 --- a/gfx/layers/client/ClientLayerManager.h +++ b/gfx/layers/client/ClientLayerManager.h @@ -174,8 +174,6 @@ public: virtual void Composite() override; virtual void GetFrameUniformity(FrameUniformityData* aFrameUniformityData) override; - virtual bool RequestOverfill(mozilla::dom::OverfillCallback* aCallback) override; - virtual void RunOverfillCallback(const uint32_t aOverfill) override; void DidComposite(uint64_t aTransactionId, const mozilla::TimeStamp& aCompositeStart, @@ -336,7 +334,6 @@ private: APZTestData mApzTestData; RefPtr mForwarder; - AutoTArray mOverfillCallbacks; mozilla::TimeStamp mTransactionStart; nsTArray mDidCompositeObservers; diff --git a/gfx/layers/ipc/CompositorBridgeChild.cpp b/gfx/layers/ipc/CompositorBridgeChild.cpp index 066e7eef73a5..dd1bbdf50c64 100644 --- a/gfx/layers/ipc/CompositorBridgeChild.cpp +++ b/gfx/layers/ipc/CompositorBridgeChild.cpp @@ -585,23 +585,6 @@ CompositorBridgeChild::RecvDidComposite(const uint64_t& aId, const uint64_t& aTr return IPC_OK(); } -mozilla::ipc::IPCResult -CompositorBridgeChild::RecvOverfill(const uint32_t &aOverfill) -{ - for (size_t i = 0; i < mOverfillObservers.Length(); i++) { - mOverfillObservers[i]->RunOverfillCallback(aOverfill); - } - mOverfillObservers.Clear(); - return IPC_OK(); -} - -void -CompositorBridgeChild::AddOverfillObserver(ClientLayerManager* aLayerManager) -{ - MOZ_ASSERT(aLayerManager); - mOverfillObservers.AppendElement(aLayerManager); -} - mozilla::ipc::IPCResult CompositorBridgeChild::RecvClearCachedResources(const uint64_t& aId) { diff --git a/gfx/layers/ipc/CompositorBridgeChild.h b/gfx/layers/ipc/CompositorBridgeChild.h index c7586eb0c7d5..f5b2562bdda4 100644 --- a/gfx/layers/ipc/CompositorBridgeChild.h +++ b/gfx/layers/ipc/CompositorBridgeChild.h @@ -93,8 +93,6 @@ public: // process). This may only be called on the main thread. static bool CompositorIsInGPUProcess(); - void AddOverfillObserver(ClientLayerManager* aLayerManager); - virtual mozilla::ipc::IPCResult RecvClearCachedResources(const uint64_t& id) override; @@ -111,9 +109,6 @@ public: const TextureFactoryIdentifier& aNewIdentifier, const uint64_t& aSequenceNumber) override; - virtual mozilla::ipc::IPCResult - RecvOverfill(const uint32_t &aOverfill) override; - virtual mozilla::ipc::IPCResult RecvUpdatePluginConfigurations(const LayoutDeviceIntPoint& aContentOffset, const LayoutDeviceIntRegion& aVisibleRegion, @@ -308,9 +303,6 @@ private: DISALLOW_EVIL_CONSTRUCTORS(CompositorBridgeChild); - // When we receive overfill numbers, notify these client layer managers - AutoTArray mOverfillObservers; - // True until the beginning of the two-step shutdown sequence of this actor. bool mCanSend; diff --git a/gfx/layers/ipc/CompositorBridgeParent.cpp b/gfx/layers/ipc/CompositorBridgeParent.cpp index 6fc42f9ac146..fcc5ff3a5f9a 100644 --- a/gfx/layers/ipc/CompositorBridgeParent.cpp +++ b/gfx/layers/ipc/CompositorBridgeParent.cpp @@ -1273,14 +1273,6 @@ CompositorBridgeParent::RecvGetFrameUniformity(FrameUniformityData* aOutData) return IPC_OK(); } -mozilla::ipc::IPCResult -CompositorBridgeParent::RecvRequestOverfill() -{ - uint32_t overfillRatio = mCompositor->GetFillRatio(); - Unused << SendOverfill(overfillRatio); - return IPC_OK(); -} - void CompositorBridgeParent::FlushApzRepaints(const LayerTransactionParent* aLayerTree) { diff --git a/gfx/layers/ipc/CompositorBridgeParent.h b/gfx/layers/ipc/CompositorBridgeParent.h index 2bfab67ec6a1..c89229adc932 100644 --- a/gfx/layers/ipc/CompositorBridgeParent.h +++ b/gfx/layers/ipc/CompositorBridgeParent.h @@ -177,7 +177,6 @@ public: bool* aResult, TextureFactoryIdentifier* aOutIdentifier) override; virtual mozilla::ipc::IPCResult RecvGetFrameUniformity(FrameUniformityData* aOutData) override; - virtual mozilla::ipc::IPCResult RecvRequestOverfill() override; virtual mozilla::ipc::IPCResult RecvWillClose() override; virtual mozilla::ipc::IPCResult RecvPause() override; virtual mozilla::ipc::IPCResult RecvResume() override; diff --git a/gfx/layers/ipc/CrossProcessCompositorBridgeParent.h b/gfx/layers/ipc/CrossProcessCompositorBridgeParent.h index c4d1e06df369..03fe2d3103f9 100644 --- a/gfx/layers/ipc/CrossProcessCompositorBridgeParent.h +++ b/gfx/layers/ipc/CrossProcessCompositorBridgeParent.h @@ -50,7 +50,6 @@ public: bool* aResult, TextureFactoryIdentifier* aOutIdentifier) override { return IPC_FAIL_NO_REASON(this); } - virtual mozilla::ipc::IPCResult RecvRequestOverfill() override { return IPC_OK(); } virtual mozilla::ipc::IPCResult RecvWillClose() override { return IPC_OK(); } virtual mozilla::ipc::IPCResult RecvPause() override { return IPC_OK(); } virtual mozilla::ipc::IPCResult RecvResume() override { return IPC_OK(); } diff --git a/gfx/layers/ipc/PCompositorBridge.ipdl b/gfx/layers/ipc/PCompositorBridge.ipdl index b35718315877..a1008ea35933 100644 --- a/gfx/layers/ipc/PCompositorBridge.ipdl +++ b/gfx/layers/ipc/PCompositorBridge.ipdl @@ -95,9 +95,6 @@ child: async DidComposite(uint64_t id, uint64_t transactionId, TimeStamp compositeStart, TimeStamp compositeEnd); - // The parent sends the child the requested fill ratio numbers. - async Overfill(uint32_t aOverfill); - /** * Parent informs the child that the graphics objects are ready for * compositing. This usually means that the graphics objects (textures @@ -164,9 +161,6 @@ parent: // request layers against an old compositor. async AcknowledgeCompositorUpdate(uint64_t aLayersId, uint64_t aSeqNo); - // Child sends the parent a request for fill ratio numbers. - async RequestOverfill(); - // Child requests frame uniformity measurements sync GetFrameUniformity() returns (FrameUniformityData data);