Backed out 2 changesets (bug 1509575) for failing wpt at css/cssom-view/scroll-behavior-main-frame-root.html on a CLOSED TREE
authorAndreea Pavel <apavel@mozilla.com>
Fri, 11 Jan 2019 09:08:19 +0200
changeset 510548 c908cdfffe306ae3c461c54ae24c6c9882985592
parent 510547 65511e8d7a7e0df5df7c4b7c96ffc3cbd2590db3
child 510549 30fd54bb80897d6139d84e6c64937a6bc182f70d
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1509575
milestone66.0a1
backs out245d6855cd3bcb4ff5afd2ab9cc90ce2cedf8a00
7dcfa876f76cd181cb7f8d482770c09b32f6a849
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1509575) for failing wpt at css/cssom-view/scroll-behavior-main-frame-root.html on a CLOSED TREE Backed out changeset 245d6855cd3b (bug 1509575) Backed out changeset 7dcfa876f76c (bug 1509575)
gfx/layers/Layers.h
gfx/layers/client/ClientLayerManager.h
gfx/layers/ipc/ShadowLayers.h
gfx/layers/wr/WebRenderLayerManager.h
layout/base/nsLayoutUtils.cpp
--- a/gfx/layers/Layers.h
+++ b/gfx/layers/Layers.h
@@ -605,17 +605,16 @@ class LayerManager : public FrameRecorde
    * is null.  |aSubtree|'s manager must be this.
    */
   virtual void ClearCachedResources(Layer* aSubtree = nullptr) {}
 
   /**
    * 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.
    */
   virtual void SetFocusTarget(const FocusTarget& aFocusTarget) {}
 
   /**
    * Make sure that the previous transaction has been entirely
--- a/gfx/layers/client/ClientLayerManager.h
+++ b/gfx/layers/client/ClientLayerManager.h
@@ -129,19 +129,16 @@ class ClientLayerManager final : public 
   bool HasShadowManager() const { return mForwarder->HasShadowManager(); }
 
   virtual bool IsCompositingCheap() override;
   virtual bool HasShadowManagerInternal() const override {
     return HasShadowManager();
   }
 
   virtual void SetIsFirstPaint() override;
-  virtual bool GetIsFirstPaint() const override {
-    return mForwarder->GetIsFirstPaint();
-  }
 
   virtual void SetFocusTarget(const FocusTarget& aFocusTarget) override;
 
   /**
    * Pass through call to the forwarder for nsPresContext's
    * CollectPluginGeometryUpdates. Passes widget configuration information
    * to the compositor for transmission to the chrome process. This
    * configuration gets set when the window paints.
--- a/gfx/layers/ipc/ShadowLayers.h
+++ b/gfx/layers/ipc/ShadowLayers.h
@@ -333,17 +333,16 @@ class ShadowLayerForwarder final : publi
    * LayerManagerComposite.
    */
   LayerHandle ConstructShadowFor(ShadowableLayer* aLayer);
 
   /**
    * 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.
    */
   void SetFocusTarget(const FocusTarget& aFocusTarget) {
     mFocusTarget = aFocusTarget;
   }
 
--- a/gfx/layers/wr/WebRenderLayerManager.h
+++ b/gfx/layers/wr/WebRenderLayerManager.h
@@ -134,17 +134,16 @@ class WebRenderLayerManager final : publ
 
   virtual void ScheduleComposite() override;
 
   virtual void SetNeedsComposite(bool aNeedsComposite) override {
     mNeedsComposite = aNeedsComposite;
   }
   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>
   CreatePersistentBufferProvider(const gfx::IntSize& aSize,
                                  gfx::SurfaceFormat aFormat) override;
 
   bool AsyncPanZoomEnabled() const override;
 
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -8703,23 +8703,16 @@ static void MaybeReflowForInflationScree
     CSSPoint scrollPosition =
         CSSPoint::FromAppUnits(scrollableFrame->GetScrollPosition());
     CSSPoint apzScrollPosition =
         CSSPoint::FromAppUnits(scrollableFrame->GetApzScrollPosition());
     metrics.SetScrollOffset(scrollPosition);
     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));
         metrics.SetVisualScrollUpdateType(FrameMetrics::eMainThread);
         presShell->SetPendingVisualViewportOffset(Nothing());
       }
     }