| Index: Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
|
| index 3afe6b0f21186afadd0a80061ec423cb2ea028f0..54dd5636646847aae469d2e2eafc45bae6d99dbe 100644
|
| --- a/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -562,7 +562,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForDocument(const Document& document
|
| return documentStyle.release();
|
|
|
| FontBuilder fontBuilder;
|
| - fontBuilder.initForStyleResolve(&document, documentStyle.get(), document.isSVGDocument());
|
| + fontBuilder.initForStyleResolve(document, documentStyle.get(), document.isSVGDocument());
|
| fontBuilder.createFontForDocument(fontSelector, documentStyle.get());
|
|
|
| return documentStyle.release();
|
| @@ -635,7 +635,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForElement(Element* element, RenderS
|
| }
|
| }
|
|
|
| - state.fontBuilder().initForStyleResolve(&state.document(), state.style(), state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(state.document(), state.style(), state.useSVGZoomRules());
|
|
|
| if (element->isLink()) {
|
| state.style()->setIsLink(true);
|
| @@ -706,7 +706,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForKeyframe(Element* e, const Render
|
| state.setStyle(RenderStyle::clone(elementStyle));
|
| state.setLineHeightValue(0);
|
|
|
| - state.fontBuilder().initForStyleResolve(&state.document(), state.style(), state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(state.document(), state.style(), state.useSVGZoomRules());
|
|
|
| // 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.
|
| @@ -925,7 +925,7 @@ PassRefPtr<RenderStyle> StyleResolver::pseudoStyleForElement(Element* e, const P
|
| state.setParentStyle(RenderStyle::clone(state.style()));
|
| }
|
|
|
| - state.fontBuilder().initForStyleResolve(&state.document(), state.style(), state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(state.document(), state.style(), state.useSVGZoomRules());
|
|
|
| // Since we don't use pseudo-elements in any of our quirk/print
|
| // user agent rules, don't waste time walking those rules.
|
| @@ -974,7 +974,7 @@ PassRefPtr<RenderStyle> StyleResolver::styleForPage(int pageIndex)
|
| state.setStyle(RenderStyle::create());
|
| state.style()->inheritFrom(state.rootElementStyle());
|
|
|
| - state.fontBuilder().initForStyleResolve(&state.document(), state.style(), state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(state.document(), state.style(), state.useSVGZoomRules());
|
|
|
| PageRuleCollector collector(state.elementContext(), pageIndex);
|
|
|
| @@ -1040,7 +1040,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.useSVGZoomRules());
|
| state.style()->setLineHeight(RenderStyle::initialLineHeight());
|
| state.setLineHeightValue(0);
|
| state.fontBuilder().setInitial(state.style()->effectiveZoom());
|
| @@ -1486,7 +1486,7 @@ void StyleResolver::applyPropertiesToStyle(const CSSPropertyValue* properties, s
|
| StyleResolverState state(document(), 0, style);
|
| state.setStyle(style);
|
|
|
| - state.fontBuilder().initForStyleResolve(&document(), style, state.useSVGZoomRules());
|
| + state.fontBuilder().initForStyleResolve(document(), style, state.useSVGZoomRules());
|
|
|
| for (size_t i = 0; i < count; ++i) {
|
| if (properties[i].value) {
|
|
|