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..77ced7c1f704790b13e80828d180e1a0c4a3d2be 100644 |
--- a/Source/core/css/resolver/StyleResolver.cpp |
+++ b/Source/core/css/resolver/StyleResolver.cpp |
@@ -651,7 +651,17 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS |
} |
} |
- state.fontBuilder().initForStyleResolve(state.document(), state.style(), state.useSVGZoomRules()); |
+ if (UNLIKELY(isSVGForeignObjectElement(element))) { |
+ // RenderSVGRoot handles zooming for the whole SVG subtree, so foreignObject content should |
+ // not be scaled again. |
+ state.style()->setEffectiveZoom(RenderStyle::initialZoom()); |
davve
2014/06/04 08:04:24
If I use the StyleResolverState to set effective z
|
+ |
+ // Always rebuild font. We cannot inherit the font when crossing svg -> html border because |
+ // of the forced zoom factor. |
+ state.fontBuilder().initForStyleResolve(state.document(), state.style(), FontBuilder::AlwaysBuildFont); |
+ } else { |
+ state.fontBuilder().initForStyleResolve(state.document(), state.style(), FontBuilder::OnlyBuildFontOnChange); |
pdr.
2014/06/03 16:40:46
Is the last parameter necessary?
|
+ } |
if (element->isLink()) { |
state.style()->setIsLink(true); |
@@ -719,7 +729,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 +776,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 +837,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 +906,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 +961,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 +1470,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) { |