| Index: Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
|
| index 9878f21af0ef2732cc3142665bc8aa5f5714481d..de06b59acfe76d97ad3bf6c9b89954e567f4842e 100644
|
| --- a/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -651,7 +651,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
|
| }
|
| }
|
|
|
| - state.fontBuilder().initForStyleResolve(state.document(), state.style(), state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(state.document(), state.style());
|
|
|
| if (element->isLink()) {
|
| state.style()->setIsLink(true);
|
| @@ -719,7 +719,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForKeyframe(Element* element, const
|
| state.setStyle(RenderStyle::clone(&elementStyle));
|
| state.setLineHeightValue(0);
|
|
|
| - state.fontBuilder().initForStyleResolve(state.document(), state.style(), state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(state.document(), state.style());
|
|
|
| // We don't need to bother with !important. Since there is only ever one
|
| // decl, there's nothing to override. So just add the first properties.
|
| @@ -766,7 +766,7 @@ PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnap
|
| {
|
| StyleResolverState state(element.document(), &element);
|
| state.setStyle(&style);
|
| - state.fontBuilder().initForStyleResolve(state.document(), state.style(), state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(state.document(), state.style());
|
| StyleBuilder::applyProperty(property, state, &value);
|
| return CSSAnimatableValueFactory::create(property, style);
|
| }
|
| @@ -827,7 +827,7 @@ bool StyleResolver::pseudoStyleForElementInternal(Element& element, const Pseudo
|
| state.setParentStyle(RenderStyle::clone(state.style()));
|
| }
|
|
|
| - state.fontBuilder().initForStyleResolve(state.document(), state.style(), state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(state.document(), state.style());
|
|
|
| // Since we don't use pseudo-elements in any of our quirk/print
|
| // user agent rules, don't waste time walking those rules.
|
| @@ -896,7 +896,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForPage(int pageIndex)
|
| ASSERT(rootElementStyle);
|
| state.style()->inheritFrom(rootElementStyle);
|
|
|
| - state.fontBuilder().initForStyleResolve(state.document(), state.style(), state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(state.document(), state.style());
|
|
|
| PageRuleCollector collector(rootElementStyle, pageIndex);
|
|
|
| @@ -951,7 +951,7 @@ PassRefPtr<RenderStyle> StyleResolver::defaultStyleForElement()
|
| {
|
| StyleResolverState state(document(), 0);
|
| state.setStyle(RenderStyle::create());
|
| - state.fontBuilder().initForStyleResolve(document(), state.style(), state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(document(), state.style());
|
| state.style()->setLineHeight(RenderStyle::initialLineHeight());
|
| state.setLineHeightValue(0);
|
| state.fontBuilder().setInitial(state.style()->effectiveZoom());
|
| @@ -1460,7 +1460,7 @@ void StyleResolver::applyPropertiesToStyle(const CSSPropertyValue* properties, s
|
| StyleResolverState state(document(), document().documentElement(), style);
|
| state.setStyle(style);
|
|
|
| - state.fontBuilder().initForStyleResolve(document(), style, state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(document(), style);
|
|
|
| for (size_t i = 0; i < count; ++i) {
|
| if (properties[i].value) {
|
|
|