Update PaintLayer size during layout, not after.

third_party/WebKit/Source/core/paint/BoxPaintInvalidatorTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/HTMLNames.h"
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/GraphicsLayer.h"
@@ skipping 364 matching lines @@
   const auto& raster_invalidations =
       GetRasterInvalidationTracking()->tracked_raster_invalidations;
   ASSERT_EQ(2u, raster_invalidations.size());
   EXPECT_EQ(IntRect(0, 100, 100, 100), raster_invalidations[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(iframe->GetLayoutObject()),
             raster_invalidations[0].client);
   EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[0].reason);
   EXPECT_EQ(
       static_cast<const DisplayItemClient*>(content->GetLayoutObject()->View()),
       raster_invalidations[1].client);
-  if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-    // TODO(skobes): Treat LayoutView in the same way as normal objects having
-    // background-attachment: local. crbug.com/568847.
-    EXPECT_EQ(IntRect(0, 0, 100, 200), raster_invalidations[1].rect);
-    EXPECT_EQ(kPaintInvalidationFull, raster_invalidations[1].reason);
-  } else {
-    EXPECT_EQ(IntRect(0, 100, 100, 100), raster_invalidations[1].rect);
-    EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[1].reason);
-  }
+  EXPECT_EQ(IntRect(0, 100, 100, 100), raster_invalidations[1].rect);
+  EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, NonCompositedLayoutViewGradientResize) {
   SetBodyInnerHTML(
       "<style>"
       "  body { margin: 0 }"
       "  iframe { display: block; width: 100px; height: 100px; border: none; }"
       "</style>"
       "<iframe id='iframe'></iframe>");
@@ skipping 35 matching lines @@
   raster_invalidations =
       &GetRasterInvalidationTracking()->tracked_raster_invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(IntRect(0, 100, 100, 100), (*raster_invalidations)[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(iframe->GetLayoutObject()),
             (*raster_invalidations)[0].client);
   EXPECT_EQ(kPaintInvalidationIncremental, (*raster_invalidations)[0].reason);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(frame_layout_view),
             (*raster_invalidations)[1].client);
   EXPECT_EQ(IntRect(0, 0, 100, 200), (*raster_invalidations)[1].rect);
-  if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-    // TODO(skobes): Treat LayoutView in the same way as normal objects having
-    // background-attachment: local. crbug.com/568847.
-    EXPECT_EQ(kPaintInvalidationFull, (*raster_invalidations)[1].reason);
-  } else {
-    EXPECT_EQ(kPaintInvalidationViewBackground,
-              (*raster_invalidations)[1].reason);
-  }
+  EXPECT_EQ(kPaintInvalidationViewBackground,
+            (*raster_invalidations)[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, CompositedBackgroundAttachmentLocalResize) {
   EnableCompositing();
 
   Element* target = GetDocument().getElementById("target");
   target->setAttribute(HTMLNames::classAttr, "border local-background");
   target->setAttribute(HTMLNames::styleAttr, "will-change: transform");
   target->setInnerHTML(
@@ skipping 128 matching lines @@
       GetRasterInvalidationTracking()->tracked_raster_invalidations;
   ASSERT_EQ(1u, raster_invalidations.size());
   EXPECT_EQ(IntRect(0, 120, 70, 120), raster_invalidations[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(target->GetLayoutObject()),
             raster_invalidations[0].client);
   EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[0].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 }  // namespace blink