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

dom/ipc/TabParent.cpp

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

dom/ipc/TabParent.h

@@ -512,11 +512,6 @@ private:
     // CreateWindow response. Then TabChild loads them immediately.
     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:
     // This is used when APZ needs to find the TabParent associated with a layer
     // to dispatch events.