Backed out 2 changesets (bug 1509575) for failing wpt at css/cssom-vi…

…ew/scroll-behavior-main-frame-root.html on a CLOSED TREE Backed out changeset 245d6855cd3b (bug 1509575) Backed out changeset 7dcfa876f76c (bug 1509575)
trman · Jan 11, 2019 · 2a44f0a · 2a44f0a
1 parent f47fd95
commit 2a44f0a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 13 deletions.
diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
@@ -610,7 +610,6 @@ class LayerManager : public FrameRecorder {
    * Flag the next paint as the first for a document.
    */
   virtual void SetIsFirstPaint() {}
-  virtual bool GetIsFirstPaint() const { return false; }
 
   /**
    * Set the current focus target to be sent with the next paint.

diff --git a/gfx/layers/client/ClientLayerManager.h b/gfx/layers/client/ClientLayerManager.h
@@ -134,9 +134,6 @@ class ClientLayerManager final : public LayerManager,
   }
 
   virtual void SetIsFirstPaint() override;
-  virtual bool GetIsFirstPaint() const override {
-    return mForwarder->GetIsFirstPaint();
-  }
 
   virtual void SetFocusTarget(const FocusTarget& aFocusTarget) override;
 

diff --git a/gfx/layers/ipc/ShadowLayers.h b/gfx/layers/ipc/ShadowLayers.h
@@ -338,7 +338,6 @@ class ShadowLayerForwarder final : public LayersIPCActor,
    * Flag the next paint as the first for a document.
    */
   void SetIsFirstPaint() { mIsFirstPaint = true; }
-  bool GetIsFirstPaint() const { return mIsFirstPaint; }
 
   /**
    * Set the current focus target to be sent with the next paint.

diff --git a/gfx/layers/wr/WebRenderLayerManager.h b/gfx/layers/wr/WebRenderLayerManager.h
@@ -139,7 +139,6 @@ class WebRenderLayerManager final : public LayerManager {
   }
   virtual bool NeedsComposite() const override { return mNeedsComposite; }
   virtual void SetIsFirstPaint() override { mIsFirstPaint = true; }
-  virtual bool GetIsFirstPaint() const override { return mIsFirstPaint; }
   virtual void SetFocusTarget(const FocusTarget& aFocusTarget) override;
 
   virtual already_AddRefed<PersistentBufferProvider>

diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
@@ -8708,13 +8708,6 @@ static void MaybeReflowForInflationScreenSizeChange(
     metrics.SetBaseScrollOffset(apzScrollPosition);
 
     if (aIsRootContent) {
-      if (aLayerManager->GetIsFirstPaint()) {
-        // Restore the visual viewport offset to the copy stored on the
-        // main thread.
-        presShell->SetPendingVisualViewportOffset(
-            Some(presShell->GetVisualViewportOffset()));
-      }
-
       if (const Maybe<nsPoint>& visualOffset =
               presShell->GetPendingVisualViewportOffset()) {
         metrics.SetVisualViewportOffset(CSSPoint::FromAppUnits(*visualOffset));