Commit a5cbaaf6 authored by Nika Layzell's avatar Nika Layzell
Browse files

Bug 1522579 - Part 4: Remove {As,Is}ContentParent, r=mccr8 

These casts are now unnecessary after Part 2, due to all consumers directly
using `ContentParent`.

Depends on D20551

Differential Revision: https://phabricator.services.mozilla.com/D20552

--HG--
extra : moz-landing-system : lando
parent 305c3ca9

dom/base/nsFrameLoader.cpp

+5 −7
Original line number Diff line number Diff line
@@ -2396,9 +2396,8 @@ static Tuple<ContentParent*, TabParent*> GetContentParent(Element* aBrowser) { 
  }



  TabParent* tabParent = TabParent::GetFrom(otherLoader);

  if (tabParent && tabParent->Manager() &&

      tabParent->Manager()->IsContentParent()) {

    return MakeTuple(tabParent->Manager()->AsContentParent(), tabParent);

  if (tabParent && tabParent->Manager()) {

    return MakeTuple(tabParent->Manager(), tabParent);

  }



  return ReturnTuple(nullptr, nullptr);
@@ -2442,9 +2441,8 @@ bool nsFrameLoader::TryRemoteBrowser() { 
  RefPtr<ContentParent> openerContentParent;

  RefPtr<TabParent> sameTabGroupAs;



  if (openingTab && openingTab->Manager() &&

      openingTab->Manager()->IsContentParent()) {

    openerContentParent = openingTab->Manager()->AsContentParent();

  if (openingTab && openingTab->Manager()) {

    openerContentParent = openingTab->Manager();

  }



  // <iframe mozbrowser> gets to skip these checks.
@@ -2969,7 +2967,7 @@ void nsFrameLoader::Print(uint64_t aOuterWindowID, 
#if defined(NS_PRINTING)

  if (mRemoteBrowser) {

    RefPtr<embedding::PrintingParent> printingParent =

        mRemoteBrowser->Manager()->AsContentParent()->GetPrintingParent();

        mRemoteBrowser->Manager()->GetPrintingParent();



    embedding::PrintData printData;

    nsresult rv = printingParent->SerializeAndEnsureRemotePrintJob(

dom/events/EventStateManager.cpp

+2 −9
Original line number Diff line number Diff line
@@ -1245,10 +1245,7 @@ void EventStateManager::DispatchCrossProcessEvent(WidgetEvent* aEvent, 
    }

    case eDragEventClass: {

      RefPtr<TabParent> tabParent = remote;

      if (tabParent->Manager()->IsContentParent()) {

        tabParent->Manager()->AsContentParent()->MaybeInvokeDragSession(

            tabParent);

      }

      tabParent->Manager()->MaybeInvokeDragSession(tabParent);



      nsCOMPtr<nsIDragSession> dragSession = nsContentUtils::GetDragSession();

      uint32_t dropEffect = nsIDragService::DRAGDROP_ACTION_NONE;
@@ -5510,14 +5507,10 @@ nsresult EventStateManager::DoContentCommandEvent( 
          nsIContent* focusedContent = fm ? fm->GetFocusedElement() : nullptr;

          RefPtr<TabParent> remote = TabParent::GetFrom(focusedContent);

          if (remote) {

            NS_ENSURE_TRUE(remote->Manager()->IsContentParent(),

                           NS_ERROR_FAILURE);



            nsCOMPtr<nsITransferable> transferable = aEvent->mTransferable;

            IPCDataTransfer ipcDataTransfer;

            ContentParent* cp = remote->Manager()->AsContentParent();

            nsContentUtils::TransferableToIPCTransferable(

                transferable, &ipcDataTransfer, false, nullptr, cp);

                transferable, &ipcDataTransfer, false, nullptr, remote->Manager());

            bool isPrivateData = transferable->GetIsPrivateData();

            nsCOMPtr<nsIPrincipal> requestingPrincipal =

                transferable->GetRequestingPrincipal();

dom/ipc/ContentParent.h

+0 −2
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ class ContentParent final : public PContentParent, 
#endif



 public:

  virtual bool IsContentParent() const override { return true; }



  using LaunchError = GeckoChildProcessHost::LaunchError;

  using LaunchPromise =

      GeckoChildProcessHost::LaunchPromise<RefPtr<ContentParent>>;

dom/ipc/ProcessPriorityManager.cpp

+3 −3
Original line number Diff line number Diff line
@@ -442,7 +442,8 @@ void ProcessPriorityManagerImpl::ObserveContentParentCreated( 
  // don't leak the already_AddRefed object.

  nsCOMPtr<nsIContentParent> cp = do_QueryInterface(aContentParent);

  RefPtr<ParticularProcessPriorityManager> pppm =

      GetParticularProcessPriorityManager(cp->AsContentParent());

      GetParticularProcessPriorityManager(

          static_cast<ContentParent*>(cp.get()));

}



void ProcessPriorityManagerImpl::ObserveContentParentDestroyed(
@@ -477,9 +478,8 @@ void ProcessPriorityManagerImpl::NotifyProcessPriorityChanged( 


void ProcessPriorityManagerImpl::TabActivityChanged(TabParent* aTabParent,

                                                    bool aIsActive) {

  ContentParent* cp = aTabParent->Manager()->AsContentParent();

  RefPtr<ParticularProcessPriorityManager> pppm =

      GetParticularProcessPriorityManager(cp);

      GetParticularProcessPriorityManager(aTabParent->Manager());

  if (!pppm) {

    return;

  }

dom/ipc/TabParent.cpp

+25 −32
Original line number Diff line number Diff line
@@ -385,8 +385,7 @@ void TabParent::Destroy() { 


  mIsDestroyed = true;



  ContentParent::NotifyTabDestroying(this->GetTabId(),

                                     Manager()->AsContentParent()->ChildID());

  ContentParent::NotifyTabDestroying(this->GetTabId(), Manager()->ChildID());



  mMarkedDestroying = true;

}
@@ -401,8 +400,8 @@ mozilla::ipc::IPCResult TabParent::RecvEnsureLayersConnected( 


mozilla::ipc::IPCResult TabParent::Recv__delete__() {

  MOZ_RELEASE_ASSERT(XRE_IsParentProcess());

  ContentParent::UnregisterRemoteFrame(

      mTabId, Manager()->AsContentParent()->ChildID(), mMarkedDestroying);

  ContentParent::UnregisterRemoteFrame(mTabId, Manager()->ChildID(),

                                       mMarkedDestroying);



  return IPC_OK();

}
@@ -952,7 +951,6 @@ auto TabParent::AllocPIndexedDBPermissionRequestParent( 
    return nullptr;

  }



  RefPtr<ContentParent> manager = Manager();

  if (NS_WARN_IF(!mFrameElement)) {

    return nullptr;

  }
@@ -1063,8 +1061,7 @@ void TabParent::SendRealMouseEvent(WidgetMouseEvent& aEvent) { 
  uint64_t blockId;

  ApzAwareEventRoutingToChild(&guid, &blockId, nullptr);



  bool isInputPriorityEventEnabled =

      Manager()->AsContentParent()->IsInputPriorityEventEnabled();

  bool isInputPriorityEventEnabled = Manager()->IsInputPriorityEventEnabled();



  if (mIsMouseEnterIntoWidgetEventSuppressed) {

    // In the case that the TabParent suppressed the eMouseEnterWidget event due
@@ -1191,7 +1188,7 @@ void TabParent::SendRealDragEvent(WidgetDragEvent& aEvent, uint32_t aDragAction, 
  if (mIsDestroyed || !mIsReadyToHandleInputEvents) {

    return;

  }

  MOZ_ASSERT(!Manager()->AsContentParent()->IsInputPriorityEventEnabled());

  MOZ_ASSERT(!Manager()->IsInputPriorityEventEnabled());

  aEvent.mRefPoint += GetChildProcessOffset();

  if (aEvent.mMessage == eDrop) {

    if (!QueryDropLinksForVerification()) {
@@ -1214,7 +1211,7 @@ void TabParent::SendMouseWheelEvent(WidgetWheelEvent& aEvent) { 
  ApzAwareEventRoutingToChild(&guid, &blockId, nullptr);

  aEvent.mRefPoint += GetChildProcessOffset();

  DebugOnly<bool> ret =

      Manager()->AsContentParent()->IsInputPriorityEventEnabled()

      Manager()->IsInputPriorityEventEnabled()

          ? PBrowserParent::SendMouseWheelEvent(aEvent, guid, blockId)

          : PBrowserParent::SendNormalPriorityMouseWheelEvent(aEvent, guid,

                                                              blockId);
@@ -1476,7 +1473,7 @@ void TabParent::SendRealKeyEvent(WidgetKeyboardEvent& aEvent) { 
    aEvent.PreventNativeKeyBindings();

  }

  DebugOnly<bool> ret =

      Manager()->AsContentParent()->IsInputPriorityEventEnabled()

      Manager()->IsInputPriorityEventEnabled()

          ? PBrowserParent::SendRealKeyEvent(aEvent)

          : PBrowserParent::SendNormalPriorityRealKeyEvent(aEvent);
@@ -1515,8 +1512,7 @@ void TabParent::SendRealTouchEvent(WidgetTouchEvent& aEvent) { 
    aEvent.mTouches[i]->mRefPoint += offset;

  }



  bool inputPriorityEventEnabled =

      Manager()->AsContentParent()->IsInputPriorityEventEnabled();

  bool inputPriorityEventEnabled = Manager()->IsInputPriorityEventEnabled();



  if (aEvent.mMessage == eTouchMove) {

    DebugOnly<bool> ret =
@@ -1569,7 +1565,7 @@ bool TabParent::SendHandleTap(TapType aType, const LayoutDevicePoint& aPoint, 
    }

  }

  LayoutDeviceIntPoint offset = GetChildProcessOffset();

  return Manager()->AsContentParent()->IsInputPriorityEventEnabled()

  return Manager()->IsInputPriorityEventEnabled()

             ? PBrowserParent::SendHandleTap(aType, aPoint + offset, aModifiers,

                                             aGuid, aInputBlockId)

             : PBrowserParent::SendNormalPriorityHandleTap(
@@ -2179,7 +2175,7 @@ bool TabParent::SendCompositionEvent(WidgetCompositionEvent& aEvent) { 
    return true;

  }



  bool ret = Manager()->AsContentParent()->IsInputPriorityEventEnabled()

  bool ret = Manager()->IsInputPriorityEventEnabled()

                 ? PBrowserParent::SendCompositionEvent(aEvent)

                 : PBrowserParent::SendNormalPriorityCompositionEvent(aEvent);

  if (NS_WARN_IF(!ret)) {
@@ -2198,7 +2194,7 @@ bool TabParent::SendSelectionEvent(WidgetSelectionEvent& aEvent) { 
    return true;

  }

  mContentCache.OnSelectionEvent(aEvent);

  bool ret = Manager()->AsContentParent()->IsInputPriorityEventEnabled()

  bool ret = Manager()->IsInputPriorityEventEnabled()

                 ? PBrowserParent::SendSelectionEvent(aEvent)

                 : PBrowserParent::SendNormalPrioritySelectionEvent(aEvent);

  if (NS_WARN_IF(!ret)) {
@@ -2605,7 +2601,7 @@ TabParent::SetDocShellIsActive(bool isActive) { 
#endif



  // Keep track of how many active recording/replaying tabs there are.

  if (Manager()->AsContentParent()->IsRecordingOrReplaying()) {

  if (Manager()->IsRecordingOrReplaying()) {

    SetIsActiveRecordReplayTab(isActive);

  }
@@ -2702,8 +2698,8 @@ void TabParent::SetRenderLayersInternal(bool aEnabled, bool aForceRepaint) { 
  // Ask the child to repaint using the PHangMonitor channel/thread (which may

  // be less congested).

  if (aEnabled) {

    ContentParent* cp = Manager()->AsContentParent();

    cp->PaintTabWhileInterruptingJS(this, aForceRepaint, mLayerTreeEpoch);

    Manager()->PaintTabWhileInterruptingJS(this, aForceRepaint,

                                           mLayerTreeEpoch);

  }

}
@@ -2720,7 +2716,7 @@ TabParent::SaveRecording(const nsAString& aFilename, bool* aRetval) { 
  if (NS_FAILED(rv)) {

    return rv;

  }

  return Manager()->AsContentParent()->SaveRecording(file, aRetval);

  return Manager()->SaveRecording(file, aRetval);

}



NS_IMETHODIMP
@@ -3105,13 +3101,11 @@ mozilla::ipc::IPCResult TabParent::RecvInvokeDragSession( 
  mInitialDataTransferItems.Clear();

  nsIPresShell* shell = mFrameElement->OwnerDoc()->GetShell();

  if (!shell) {

    if (Manager()->IsContentParent()) {

      Unused << Manager()->AsContentParent()->SendEndDragSession(

          true, true, LayoutDeviceIntPoint(), 0);

    Unused << Manager()->SendEndDragSession(true, true, LayoutDeviceIntPoint(),

                                            0);

    // Continue sending input events with input priority when stopping the dnd

    // session.

      Manager()->AsContentParent()->SetInputPriorityEventEnabled(true);

    }

    Manager()->SetInputPriorityEventEnabled(true);

    return IPC_OK();

  }
@@ -3119,12 +3113,11 @@ mozilla::ipc::IPCResult TabParent::RecvInvokeDragSession( 
  for (uint32_t i = 0; i < aTransfers.Length(); ++i) {

    mInitialDataTransferItems.AppendElement(std::move(aTransfers[i].items()));

  }

  if (Manager()->IsContentParent()) {



  nsCOMPtr<nsIDragService> dragService =

      do_GetService("@mozilla.org/widget/dragservice;1");

  if (dragService) {

      dragService->MaybeAddChildProcess(Manager()->AsContentParent());

    }

    dragService->MaybeAddChildProcess(Manager());

  }



  if (aVisualDnDData.type() == OptionalShmem::Tvoid_t ||