corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out 5 changesets (bug 1274149) for intermittent failures in apz tests CLOSED TREE

Browse Source 
Backed out changeset 1117598ac875 (bug 1274149)
Backed out changeset 540cb6d10745 (bug 1274149)
Backed out changeset 057223823e5d (bug 1274149)
Backed out changeset 9932689ab717 (bug 1274149)
Backed out changeset a22a53c503a6 (bug 1274149)
This commit is contained in:
Wes Kocher
2016-05-23 13:01:22 -07:00
parent 13787fc18b
commit 9a683a7c55
13 changed files with 64 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/ipc/CompositorSession.cpp
View File

@@ -25,7 +25,7 @@ public:
CompositorBridgeParent* GetInProcessBridge() const override;
void SetContentController(GeckoContentController* aController) override;
uint64_t RootLayerTreeId() const override;
already_AddRefed<APZCTreeManager> GetAPZCTreeManager() const override;
APZCTreeManager* GetAPZCTreeManager() const override;
void Shutdown() override;
private:
@@ -33,12 +33,12 @@ private:
};
already_AddRefed<CompositorSession>
CompositorSession::CreateInProcess(widget::CompositorWidgetProxy* aWidgetProxy,
ClientLayerManager* aLayerManager,
CSSToLayoutDeviceScale aScale,
bool aUseAPZ,
bool aUseExternalSurfaceSize,
int aSurfaceWidth, int aSurfaceHeight)
CompositorSession::CreateTopLevel(widget::CompositorWidgetProxy* aWidgetProxy,
ClientLayerManager* aLayerManager,
CSSToLayoutDeviceScale aScale,
bool aUseAPZ,
bool aUseExternalSurfaceSize,
int aSurfaceWidth, int aSurfaceHeight)
{
RefPtr<InProcessCompositorSession> session = new InProcessCompositorSession(
aWidgetProxy,
@@ -101,7 +101,7 @@ InProcessCompositorSession::RootLayerTreeId() const
return mCompositorBridgeParent->RootLayerTreeId();
}
already_AddRefed<APZCTreeManager>
APZCTreeManager*
InProcessCompositorSession::GetAPZCTreeManager() const
{
return mCompositorBridgeParent->GetAPZCTreeManager(RootLayerTreeId());