Index: Source/core/css/resolver/StyleResolver.cpp |
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp |
index b3702d1d7c405ff6df17fe01bed1f3c0fb81309e..1048d1440e708a7ea047c2a326435d4da91cc25a 100644 |
--- a/Source/core/css/resolver/StyleResolver.cpp |
+++ b/Source/core/css/resolver/StyleResolver.cpp |
@@ -611,8 +611,6 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS |
} |
} |
- state.fontBuilder().initForStyleResolve(state.document(), state.style()); |
- |
if (element->isLink()) { |
state.style()->setIsLink(true); |
EInsideLink linkState = state.elementLinkState(); |
@@ -686,8 +684,6 @@ PassRefPtr<RenderStyle> StyleResolver::styleForKeyframe(Element& element, const |
state.setStyle(RenderStyle::clone(&elementStyle)); |
state.setLineHeightValue(0); |
- 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. |
// We also don't need to bother with animation properties since the only |
@@ -724,7 +720,6 @@ PassRefPtrWillBeRawPtr<AnimatableValue> StyleResolver::createAnimatableValueSnap |
style = RenderStyle::create(); |
StyleResolverState state(element.document(), &element); |
state.setStyle(style); |
- state.fontBuilder().initForStyleResolve(state.document(), state.style()); |
return createAnimatableValueSnapshot(state, property, value); |
} |
@@ -810,7 +805,6 @@ bool StyleResolver::pseudoStyleForElementInternal(Element& element, const Pseudo |
} |
state.style()->setStyleType(pseudoStyleRequest.pseudoId); |
- 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. |
@@ -887,8 +881,6 @@ PassRefPtr<RenderStyle> StyleResolver::styleForPage(int pageIndex) |
ASSERT(rootElementStyle); |
state.style()->inheritFrom(rootElementStyle); |
- state.fontBuilder().initForStyleResolve(state.document(), state.style()); |
- |
PageRuleCollector collector(rootElementStyle, pageIndex); |
collector.matchPageRules(CSSDefaultStyleSheets::instance().defaultPrintStyle()); |
@@ -942,7 +934,6 @@ PassRefPtr<RenderStyle> StyleResolver::defaultStyleForElement() |
{ |
StyleResolverState state(document(), 0); |
state.setStyle(RenderStyle::create()); |
- state.fontBuilder().initForStyleResolve(document(), state.style()); |
state.style()->setLineHeight(RenderStyle::initialLineHeight()); |
state.setLineHeightValue(0); |
state.fontBuilder().setInitial(state.style()->effectiveZoom()); |
@@ -1577,8 +1568,6 @@ void StyleResolver::applyPropertiesToStyle(const CSSPropertyValue* properties, s |
StyleResolverState state(document(), document().documentElement(), style); |
state.setStyle(style); |
- state.fontBuilder().initForStyleResolve(document(), style); |
- |
for (size_t i = 0; i < count; ++i) { |
if (properties[i].value) { |
// As described in BUG66291, setting font-size and line-height on a font may entail a CSSPrimitiveValue::computeLengthDouble call, |