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

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

Issue 15012010: Remove the CSS_COMPOSITING define, leaving the implementation under the runtime flag, since runtime… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: removed bogus test Created 7 years, 7 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
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSComputedStyleDeclaration.cpp
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp
index 4b7281954b74b3dbae074481150eb2d7ccfdf936..0137f54e66caac517a0b32d15b976e74f254dc46 100644
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -86,9 +86,7 @@ namespace WebCore {
// to respect runtime enabling of CSS properties.
static const CSSPropertyID staticComputableProperties[] = {
CSSPropertyBackgroundAttachment,
-#if ENABLE(CSS_COMPOSITING)
CSSPropertyBackgroundBlendMode,
-#endif
CSSPropertyBackgroundClip,
CSSPropertyBackgroundColor,
CSSPropertyBackgroundImage,
@@ -151,9 +149,7 @@ static const CSSPropertyID staticComputableProperties[] = {
CSSPropertyMaxWidth,
CSSPropertyMinHeight,
CSSPropertyMinWidth,
-#if ENABLE(CSS_COMPOSITING)
CSSPropertyMixBlendMode,
-#endif
CSSPropertyOpacity,
CSSPropertyOrphans,
CSSPropertyOutlineColor,
@@ -2605,7 +2601,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
return cssValuePool().createValue(style->wrapThrough());
case CSSPropertyWebkitFilter:
return valueForFilter(renderer, style.get());
-#if ENABLE(CSS_COMPOSITING)
case CSSPropertyMixBlendMode:
return cssValuePool().createValue(style->blendMode());
@@ -2620,7 +2615,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
return list.release();
}
-#endif
case CSSPropertyBackground:
return getBackgroundShorthandValue();
case CSSPropertyBorder: {
« no previous file with comments | « LayoutTests/webexposed/css-properties-as-js-properties-expected.txt ('k') | Source/core/css/CSSParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698