| Index: Source/core/css/CSSComputedStyleDeclaration.cpp
|
| diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp
|
| index d4a2e3bff2497583893772c4b62d6eb170e0ea0e..def0485927fcf7335e1e714a7e1aa4d7c673c6f0 100644
|
| --- a/Source/core/css/CSSComputedStyleDeclaration.cpp
|
| +++ b/Source/core/css/CSSComputedStyleDeclaration.cpp
|
| @@ -286,7 +286,6 @@ static const CSSPropertyID staticComputableProperties[] = {
|
| CSSPropertyWebkitLocale,
|
| CSSPropertyWebkitMarginBeforeCollapse,
|
| CSSPropertyWebkitMarginAfterCollapse,
|
| - CSSPropertyWebkitMarqueeDirection,
|
| CSSPropertyWebkitMarqueeIncrement,
|
| CSSPropertyWebkitMarqueeRepetition,
|
| CSSPropertyWebkitMarqueeStyle,
|
| @@ -2109,8 +2108,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
|
| return zoomAdjustedPixelValueForLength(marginLeft, style.get());
|
| return zoomAdjustedPixelValue(toRenderBox(renderer)->marginLeft(), style.get());
|
| }
|
| - case CSSPropertyWebkitMarqueeDirection:
|
| - return cssValuePool().createValue(style->marqueeDirection());
|
| case CSSPropertyWebkitMarqueeIncrement:
|
| return cssValuePool().createValue(style->marqueeIncrement());
|
| case CSSPropertyWebkitMarqueeRepetition:
|
| @@ -2875,6 +2872,11 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
|
| case CSSPropertyUserZoom:
|
| break;
|
|
|
| + // Internal properties that shouldn't be exposed throught getComputedStyle.
|
| + case CSSPropertyInternalMarqueeDirection:
|
| + ASSERT_NOT_REACHED();
|
| + return 0;
|
| +
|
| case CSSPropertyBufferedRendering:
|
| case CSSPropertyClipPath:
|
| case CSSPropertyClipRule:
|
| @@ -3048,10 +3050,12 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(const Stri
|
| return value ? value->cloneForCSSOM() : 0;
|
| }
|
|
|
| -String CSSComputedStyleDeclaration::getPropertyValue(const String &propertyName)
|
| +String CSSComputedStyleDeclaration::getPropertyValue(const String& propertyName)
|
| {
|
| CSSPropertyID propertyID = cssPropertyID(propertyName);
|
| - if (!propertyID)
|
| + // FIXME: This should check RuntimeEnabledFeature::isCSSPropertyEnabled instead of just
|
| + // isInternalProperty. However we need to test that which requires crbug.com/234853 to be fixed.
|
| + if (!propertyID || isInternalProperty(propertyID))
|
| return String();
|
| return getPropertyValue(propertyID);
|
| }
|
|
|