Paint local attachment backgrounds into composited scrolling contents layer

third_party/WebKit/Source/core/style/FillLayer.cpp

Index: third_party/WebKit/Source/core/style/FillLayer.cpp
diff --git a/third_party/WebKit/Source/core/style/FillLayer.cpp b/third_party/WebKit/Source/core/style/FillLayer.cpp
index a2f016698b256c7daf4de4b047f8d03c678ebe2c..307ede3623e1921107477663920c6dc1943cfb51 100644
--- a/third_party/WebKit/Source/core/style/FillLayer.cpp
+++ b/third_party/WebKit/Source/core/style/FillLayer.cpp
@@ -316,17 +316,6 @@ void FillLayer::cullEmptyLayers()
     }
 }
 
-static EFillBox clipMax(EFillBox clipA, EFillBox clipB)
-{
-    if (clipA == BorderFillBox || clipB == BorderFillBox)
-        return BorderFillBox;
-    if (clipA == PaddingFillBox || clipB == PaddingFillBox)
-        return PaddingFillBox;
-    if (clipA == ContentFillBox || clipB == ContentFillBox)
-        return ContentFillBox;
-    return TextFillBox;
-}
-
 void FillLayer::computeCachedPropertiesIfNeeded() const
 {
     if (m_cachedPropertiesComputed)
@@ -338,7 +327,7 @@ void FillLayer::computeCachedPropertiesIfNeeded() const
 
     if (m_next) {
         m_next->computeCachedPropertiesIfNeeded();
-        m_thisOrNextLayersClipMax = clipMax(thisOrNextLayersClipMax(), m_next->thisOrNextLayersClipMax());
+        m_thisOrNextLayersClipMax = enclosingFillBox(thisOrNextLayersClipMax(), m_next->thisOrNextLayersClipMax());
         m_thisOrNextLayersUseContentBox |= m_next->m_thisOrNextLayersUseContentBox;
         m_thisOrNextLayersHaveLocalAttachment |= m_next->m_thisOrNextLayersHaveLocalAttachment;
     }