[sailfishos][gecko] Remove PuppetWidget from TabChild interface

Format patch from this
sailfishos · May 27, 2020 · f26d0a5 · f26d0a5
1 parent 2bc7a02
commit f26d0a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
@@ -440,6 +440,7 @@ TabChild::TabChild(nsIContentChild* aManager,
                    const TabContext& aContext,
                    uint32_t aChromeFlags)
   : TabContext(aContext)
+  , mPuppetWidget(nullptr)
   , mRemoteFrame(nullptr)
   , mManager(aManager)
   , mChromeFlags(aChromeFlags)
@@ -2425,7 +2426,7 @@ TabChild::RecvSetDocShellIsActive(const bool& aIsActive,
       // to paints as quickly as possible.
       APZCCallbackHelper::SuppressDisplayport(true, presShell);
       if (nsContentUtils::IsSafeToRunScript()) {
-        WebWidget()->PaintNowIfNeeded();
+        static_cast<PuppetWidget*>(WebWidget())->PaintNowIfNeeded();
       } else {
         RefPtr<nsViewManager> vm = presShell->GetViewManager();
         if (nsView* view = vm->GetRootView()) {

diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
@@ -206,7 +206,7 @@ class TabChildBase : public nsISupports,
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(TabChildBase)
 
   virtual nsIWebNavigation* WebNavigation() const = 0;
-  virtual PuppetWidget* WebWidget() = 0;
+  virtual nsIWidget* WebWidget() = 0;
   nsIPrincipal* GetPrincipal() { return mPrincipal; }
   virtual bool DoUpdateZoomConstraints(const uint32_t& aPresShellId,
                                        const mozilla::layers::FrameMetrics::ViewID& aViewId,
@@ -472,7 +472,7 @@ class TabChild final : public TabChildBase,
     return mWebNav;
   }
 
-  virtual PuppetWidget* WebWidget() override { return mPuppetWidget; }
+  virtual nsIWidget* WebWidget() override { return mPuppetWidget; }
 
   /** Return the DPI of the widget this TabChild draws to. */
   void GetDPI(float* aDPI);