Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 22849019: Unexpose -webkit-marquee-direction (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
« no previous file with comments | « LayoutTests/webexposed/internal-properties-should-not-be-exposed-expected.txt ('k') | Source/core/css/CSSParser-in.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698