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

Unified Diff: Source/core/css/resolver/StyleResolver.cpp

Issue 15157002: Begin moving DeprecatedStyleBuilder properties to new generated StyleBuilder. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: move StyleBuilder call to below DeprecatedStyleBuilder 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 | « Source/core/css/resolver/StyleBuilder.h ('k') | Source/core/scripts/make_style_builder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index 3f219b2c92839d26cfbf2eedf8a6d2cf9ab473cd..6cd2b962e17fca40e4b198d6a95bcf1d1e9ccd27 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -78,6 +78,7 @@
#include "core/css/WebKitCSSKeyframesRule.h"
#include "core/css/WebKitCSSRegionRule.h"
#include "core/css/resolver/FilterOperationResolver.h"
+#include "core/css/resolver/StyleBuilder.h"
#include "core/css/resolver/TransformBuilder.h"
#include "core/css/resolver/ViewportStyleResolver.h"
#include "core/dom/Attribute.h"
@@ -2466,6 +2467,10 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
return;
}
+ // Use the new StyleBuilder.
+ if (StyleBuilder::applyProperty(id, this, value, isInitial, isInherit))
+ return;
+
CSSPrimitiveValue* primitiveValue = value->isPrimitiveValue() ? toCSSPrimitiveValue(value) : 0;
float zoomFactor = state.style()->effectiveZoom();
@@ -3055,7 +3060,7 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
case CSSPropertyTransitionProperty:
case CSSPropertyTransitionTimingFunction:
return;
- // These properties are implemented in the DeprecatedStyleBuilder lookup table.
+ // These properties are implemented in the DeprecatedStyleBuilder lookup table or in the new StyleBuilder.
case CSSPropertyBackgroundAttachment:
case CSSPropertyBackgroundBlendMode:
case CSSPropertyBackgroundClip:
« no previous file with comments | « Source/core/css/resolver/StyleBuilder.h ('k') | Source/core/scripts/make_style_builder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698