wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 38c35f7b2b7d (bug 1132072) for frequent bc3 failures CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2015-03-20 17:17:57 -07:00
parent 92e3b93e2d
commit a2a1636174
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom/ipc/TabParent.cpp
View File

@ -276,7 +276,6 @@ TabParent::TabParent(nsIContentParent* aManager,
, mInitedByParent(false) , mInitedByParent(false)
, mTabId(aTabId) , mTabId(aTabId)
, mCreatingWindow(false) , mCreatingWindow(false)
, mNeedLayerTreeReadyNotification(false)
{ {
MOZ_ASSERT(aManager); MOZ_ASSERT(aManager);
} }
@ -2316,12 +2315,6 @@ TabParent::RecvGetRenderFrameInfo(PRenderFrameParent* aRenderFrame,
RenderFrameParent* renderFrame = static_cast<RenderFrameParent*>(aRenderFrame); RenderFrameParent* renderFrame = static_cast<RenderFrameParent*>(aRenderFrame);
renderFrame->GetTextureFactoryIdentifier(aTextureFactoryIdentifier); renderFrame->GetTextureFactoryIdentifier(aTextureFactoryIdentifier);
*aLayersId = renderFrame->GetLayersId(); *aLayersId = renderFrame->GetLayersId();
if (mNeedLayerTreeReadyNotification) {
RequestNotifyLayerTreeReady();
mNeedLayerTreeReadyNotification = false;
}
return true; return true;
} }
@ -2624,11 +2617,11 @@ TabParent::RequestNotifyLayerTreeReady()
{ {
RenderFrameParent* frame = GetRenderFrame(); RenderFrameParent* frame = GetRenderFrame();
if (!frame) { if (!frame) {
mNeedLayerTreeReadyNotification = true; return false;
} else {
CompositorParent::RequestNotifyLayerTreeReady(frame->GetLayersId(),
new LayerTreeUpdateObserver());
} }
CompositorParent::RequestNotifyLayerTreeReady(frame->GetLayersId(),
new LayerTreeUpdateObserver());
return true; return true;
} }

5
dom/ipc/TabParent.h
View File

@ -512,11 +512,6 @@ private:
// CreateWindow response. Then TabChild loads them immediately. // CreateWindow response. Then TabChild loads them immediately.
nsTArray<FrameScriptInfo> mDelayedFrameScripts; nsTArray<FrameScriptInfo> mDelayedFrameScripts;
// If the user called RequestNotifyLayerTreeReady and the RenderFrameParent
// wasn't ready yet, we set this flag and call RequestNotifyLayerTreeReady
// again once the RenderFrameParent arrives.
bool mNeedLayerTreeReadyNotification;
private: private:
// This is used when APZ needs to find the TabParent associated with a layer // This is used when APZ needs to find the TabParent associated with a layer
// to dispatch events. // to dispatch events.