Initial scroll-blocks-on compositor integration

Source/core/css/CSSComputedStyleDeclaration.cpp

Index: Source/core/css/CSSComputedStyleDeclaration.cpp
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp
index 8bc54f208274f696bb40a2d17488a3342a726da2..32f5296373c41f6e5bf4321afc234c8ff0502680 100644
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -1469,18 +1469,18 @@ static PassRefPtrWillBeRawPtr<CSSValue> touchActionFlagsToCSSValue(TouchAction t
     return list.release();
 }
 
-static PassRefPtrWillBeRawPtr<CSSValue> scrollBlocksOnFlagsToCSSValue(ScrollBlocksOn scrollBlocksOn)
+static PassRefPtrWillBeRawPtr<CSSValue> scrollBlocksOnFlagsToCSSValue(WebScrollBlocksOn scrollBlocksOn)
 {
     RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
 
-    if (scrollBlocksOn == ScrollBlocksOnNone)
+    if (scrollBlocksOn == WebScrollBlocksOnNone)
         return cssValuePool().createIdentifierValue(CSSValueNone);
 
-    if (scrollBlocksOn & ScrollBlocksOnStartTouch)
+    if (scrollBlocksOn & WebScrollBlocksOnStartTouch)
         list->append(cssValuePool().createIdentifierValue(CSSValueStartTouch));
-    if (scrollBlocksOn & ScrollBlocksOnWheelEvent)
+    if (scrollBlocksOn & WebScrollBlocksOnWheelEvent)
         list->append(cssValuePool().createIdentifierValue(CSSValueWheelEvent));
-    if (scrollBlocksOn & ScrollBlocksOnScrollEvent)
+    if (scrollBlocksOn & WebScrollBlocksOnScrollEvent)
         list->append(cssValuePool().createIdentifierValue(CSSValueScrollEvent));
     ASSERT(list->length());
     return list.release();