Index: Source/core/css/RenderStyleCSSValueMapping.cpp |
diff --git a/Source/core/css/RenderStyleCSSValueMapping.cpp b/Source/core/css/RenderStyleCSSValueMapping.cpp |
index e482f0b7d3469152c56539de8005252b4402cf17..f98062d948dc36c8566ba26c7d36db4fcd7afb3e 100644 |
--- a/Source/core/css/RenderStyleCSSValueMapping.cpp |
+++ b/Source/core/css/RenderStyleCSSValueMapping.cpp |
@@ -635,18 +635,18 @@ static LayoutRect sizingBox(const RenderObject* renderer) |
return box->style()->boxSizing() == BORDER_BOX ? box->borderBoxRect() : box->computedCSSContentBoxRect(); |
} |
-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(); |