Bug 1503655 part 2 - Remove unused and outdated code from RenderFrameParent. r=kats

eqrion · eqrion · commit 165193148f18 · 2018-10-25T15:23:46.000-05:00
This commit removes a bunch of cruft from RenderFrameParent that isn't used and isn't needed. Some functions that have no reason to be in RenderFrameParent are moved to TabParent in anticipation of the PRenderFrame protocol being dropped. Differential Revision: https://phabricator.services.mozilla.com/D10411
diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl
@@ -534,6 +534,11 @@ parent:
      */
     async RemotePaintIsReady();
 
+    /**
+     * Child informs the parent that a compositor transaction has ocurred.
+     */
+    async NotifyCompositorTransaction();
+
     /**
      * Child informs the parent that the content is ready to handle input
      * events. This is sent when the TabChild is created.
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
@@ -2923,7 +2923,7 @@ TabChild::NotifyPainted()
     if (!mNotified) {
         // Recording/replaying processes have a compositor but not a remote frame.
         if (!recordreplay::IsRecordingOrReplaying()) {
-            mRemoteFrame->SendNotifyCompositorTransaction();
+            SendNotifyCompositorTransaction();
         }
         mNotified = true;
     }
@@ -3302,7 +3302,7 @@ TabChild::RecvRequestNotifyAfterRemotePaint()
 
   // Tell the CompositorBridgeChild that, when it gets a RemotePaintIsReady
   // message that it should forward it us so that we can bounce it to our
-  // RenderFrameParent.
+  // TabParent.
   compositor->RequestNotifyAfterRemotePaint(this);
   return IPC_OK();
 }
diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
@@ -641,7 +641,7 @@ TabParent::InitRenderFrame()
     MOZ_ASSERT(frameLoader);
     if (frameLoader) {
       RenderFrameParent* renderFrame = new RenderFrameParent(frameLoader);
-      MOZ_ASSERT(renderFrame->IsInitted());
+      MOZ_ASSERT(renderFrame->IsInitialized());
       layers::LayersId layersId = renderFrame->GetLayersId();
       AddTabParentToTable(layersId, this);
       if (!SendPRenderFrameConstructor(renderFrame)) {
@@ -1654,9 +1654,19 @@ TabParent::SendHandleTap(TapType aType,
   if (mIsDestroyed || !mIsReadyToHandleInputEvents) {
     return false;
   }
-  if ((aType == TapType::eSingleTap || aType == TapType::eSecondTap) &&
-      GetRenderFrame()) {
-    GetRenderFrame()->TakeFocusForClickFromTap();
+  if ((aType == TapType::eSingleTap || aType == TapType::eSecondTap)) {
+    nsIFocusManager* fm = nsFocusManager::GetFocusManager();
+    if (fm) {
+      RefPtr<nsFrameLoader> frameLoader = GetFrameLoader();
+      if (frameLoader) {
+        RefPtr<Element> element = frameLoader->GetOwnerContent();
+        if (element) {
+          fm->SetFocus(element, nsIFocusManager::FLAG_BYMOUSE |
+                                nsIFocusManager::FLAG_BYTOUCH |
+                                nsIFocusManager::FLAG_NOSCROLL);
+        }
+      }
+    }
   }
   LayoutDeviceIntPoint offset = GetChildProcessOffset();
   return Manager()->AsContentParent()->IsInputPriorityEventEnabled()
@@ -2604,7 +2614,7 @@ TabParent::AllocPRenderFrameParent()
   RefPtr<nsFrameLoader> frameLoader = GetFrameLoader();
 
   RenderFrameParent* rfp = new RenderFrameParent(frameLoader);
-  if (rfp->IsInitted()) {
+  if (rfp->IsInitialized()) {
     layers::LayersId layersId = rfp->GetLayersId();
     AddTabParentToTable(layersId, this);
   }
@@ -2632,7 +2642,7 @@ TabParent::SetRenderFrame(PRenderFrameParent* aRFParent)
   }
 
   RenderFrameParent* renderFrame = static_cast<RenderFrameParent*>(aRFParent);
-  bool success = renderFrame->Init(frameLoader);
+  bool success = renderFrame->Initialize(frameLoader);
   if (!success) {
     return false;
   }
@@ -3184,6 +3194,30 @@ TabParent::RecvRemotePaintIsReady()
   return IPC_OK();
 }
 
+mozilla::ipc::IPCResult
+TabParent::RecvNotifyCompositorTransaction()
+{
+  RefPtr<nsFrameLoader> frameLoader = GetFrameLoader();
+
+  if (!frameLoader) {
+    return IPC_OK();
+  }
+
+  nsIFrame* docFrame = frameLoader->GetPrimaryFrameOfOwningContent();
+
+  if (!docFrame) {
+    // Bad, but nothing we can do about it (XXX/cjones: or is there?
+    // maybe bug 589337?).  When the new frame is created, we'll
+    // probably still be the current render frame and will get to draw
+    // our content then.  Or, we're shutting down and this update goes
+    // to /dev/null.
+    return IPC_OK();
+  }
+
+  docFrame->InvalidateLayer(DisplayItemType::TYPE_REMOTE);
+  return IPC_OK();
+}
+
 mozilla::ipc::IPCResult
 TabParent::RecvRemoteIsReadyToHandleInputEvents()
 {
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
@@ -626,6 +626,8 @@ class TabParent final : public PBrowserParent
 
   virtual mozilla::ipc::IPCResult RecvRemotePaintIsReady() override;
 
+  virtual mozilla::ipc::IPCResult RecvNotifyCompositorTransaction() override;
+
   virtual mozilla::ipc::IPCResult RecvRemoteIsReadyToHandleInputEvents() override;
 
   virtual mozilla::ipc::IPCResult RecvPaintWhileInterruptingJSNoOp(const LayersObserverEpoch& aEpoch) override;
diff --git a/layout/ipc/PRenderFrame.ipdl b/layout/ipc/PRenderFrame.ipdl
@@ -28,7 +28,6 @@ sync protocol PRenderFrame
     manager PBrowser;
 
 parent:
-    async NotifyCompositorTransaction();
 
     async __delete__();
 };
diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
diff --git a/layout/ipc/RenderFrameParent.h b/layout/ipc/RenderFrameParent.h

Original file line number	Diff line number	Diff line change
`@@ -2923,7 +2923,7 @@ TabChild::NotifyPainted()`
`2923`	`2923`	`if (!mNotified) {`
`2924`	`2924`	`// Recording/replaying processes have a compositor but not a remote frame.`
`2925`	`2925`	`if (!recordreplay::IsRecordingOrReplaying()) {`
`2926`		`- mRemoteFrame->SendNotifyCompositorTransaction();`
	`2926`	`+ SendNotifyCompositorTransaction();`
`2927`	`2927`	`}`
`2928`	`2928`	`mNotified = true;`
`2929`	`2929`	`}`
`@@ -3302,7 +3302,7 @@ TabChild::RecvRequestNotifyAfterRemotePaint()`
`3302`	`3302`
`3303`	`3303`	`// Tell the CompositorBridgeChild that, when it gets a RemotePaintIsReady`
`3304`	`3304`	`// message that it should forward it us so that we can bounce it to our`
`3305`		`- // RenderFrameParent.`
	`3305`	`+ // TabParent.`
`3306`	`3306`	`compositor->RequestNotifyAfterRemotePaint(this);`
`3307`	`3307`	`return IPC_OK();`
`3308`	`3308`	`}`