| 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:
|
|
|