Background attachment behavior update for rootlayer with root-layer-scrolls enabled

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

Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
index bf4faf4eff447320bad99429f6ec2a72e5b5e13d..b55aac16105cd276531b04b81df610295d83ebb4 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -2603,10 +2603,15 @@ GraphicsLayer* PaintLayer::graphicsLayerBacking(const LayoutObject* obj) const {
 }
 
 BackgroundPaintLocation PaintLayer::backgroundPaintLocation() const {
-  BackgroundPaintLocation location =
-      isRootLayer() || !scrollsOverflow()
-          ? BackgroundPaintInGraphicsLayer
-          : layoutObject()->backgroundPaintLocation();
+  BackgroundPaintLocation location;
+  if (!scrollsOverflow()) {
+    location = BackgroundPaintInGraphicsLayer;
+  } else if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
+    location = layoutObject()->backgroundPaintLocation();
+  } else {
+    location = isRootLayer() ? BackgroundPaintInGraphicsLayer
+                             : layoutObject()->backgroundPaintLocation();
+  }
   m_stackingNode->updateLayerListsIfNeeded();
   if (m_stackingNode->hasNegativeZOrderList())
     location = BackgroundPaintInGraphicsLayer;