Decouple font unit conversion in computeLengthDouble from RenderStyle.

Source/core/css/resolver/StyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 571 matching lines @@
 
     ActiveAnimations* activeAnimations = element->activeAnimations();
     const RenderStyle* baseRenderStyle = activeAnimations ? activeAnimations->baseRenderStyle() : nullptr;
 
     if (baseRenderStyle) {
         state.setStyle(RenderStyle::clone(baseRenderStyle));
         if (!state.parentStyle())
             state.setParentStyle(defaultStyleForElement());
     } else {
         if (state.parentStyle()) {
-            state.setStyle(RenderStyle::create());
-            state.style()->inheritFrom(state.parentStyle(), isAtShadowBoundary(element) ? RenderStyle::AtShadowBoundary : RenderStyle::NotAtShadowBoundary);
+            RefPtr<RenderStyle> style = RenderStyle::create();
+            style->inheritFrom(state.parentStyle(), isAtShadowBoundary(element) ? RenderStyle::AtShadowBoundary : RenderStyle::NotAtShadowBoundary);
+            state.setStyle(style);

[Timothy Loh, 2014/11/06 16:24:01]

state.setStyle(style.release())?

[andersr, 2014/11/07 10:43:11]

Done.

         } else {
             state.setStyle(defaultStyleForElement());
             state.setParentStyle(RenderStyle::clone(state.style()));
         }
     }
 
     // contenteditable attribute (implemented by -webkit-user-modify) should
     // be propagated from shadow host to distributed node.
     if (state.distributedToInsertionPoint()) {
         if (Element* parent = element->parentElement()) {
@@ skipping 165 matching lines @@
     StyleResolverParentScope::ensureParentStackIsPushed();
 
     Element* pseudoElement = element.pseudoElement(pseudoStyleRequest.pseudoId);
 
     ActiveAnimations* activeAnimations = pseudoElement ? pseudoElement->activeAnimations() : nullptr;
     const RenderStyle* baseRenderStyle = activeAnimations ? activeAnimations->baseRenderStyle() : nullptr;
 
     if (baseRenderStyle) {
         state.setStyle(RenderStyle::clone(baseRenderStyle));
     } else if (pseudoStyleRequest.allowsInheritance(state.parentStyle())) {
-        state.setStyle(RenderStyle::create());
-        state.style()->inheritFrom(state.parentStyle());
+        RefPtr<RenderStyle> style = RenderStyle::create();
+        style->inheritFrom(state.parentStyle());
+        state.setStyle(style);

[Timothy Loh, 2014/11/06 16:24:01]

style.release()

[andersr, 2014/11/07 10:43:11]

Done.

     } else {
         state.setStyle(defaultStyleForElement());
         state.setParentStyle(RenderStyle::clone(state.style()));
     }
 
     state.style()->setStyleType(pseudoStyleRequest.pseudoId);
 
     // Since we don't use pseudo-elements in any of our quirk/print
     // user agent rules, don't waste time walking those rules.
 
@@ skipping 57 matching lines @@
     // Now return the style.
     return state.takeStyle();
 }
 
 PassRefPtr<RenderStyle> StyleResolver::styleForPage(int pageIndex)
 {
     ASSERT(!hasPendingAuthorStyleSheets());
     resetDirectionAndWritingModeOnDocument(document());
     StyleResolverState state(document(), document().documentElement()); // m_rootElementStyle will be set to the document style.
 
-    state.setStyle(RenderStyle::create());
+    RefPtr<RenderStyle> style = RenderStyle::create();
     const RenderStyle* rootElementStyle = state.rootElementStyle() ? state.rootElementStyle() : document().renderStyle();
     ASSERT(rootElementStyle);
-    state.style()->inheritFrom(rootElementStyle);
+    style->inheritFrom(rootElementStyle);
+    state.setStyle(style);

[Timothy Loh, 2014/11/06 16:24:01]

style.release()

[andersr, 2014/11/07 10:43:11]

Done.

 
     PageRuleCollector collector(rootElementStyle, pageIndex);
 
     collector.matchPageRules(CSSDefaultStyleSheets::instance().defaultPrintStyle());
 
     if (ScopedStyleResolver* scopedResolver = document().scopedStyleResolver())
         scopedResolver->matchPageRules(collector);
 
     bool inheritedOnly = false;
 
@@ skipping 27 matching lines @@
         viewportStyleResolver()->collectViewportRules(defaultStyleSheets.defaultXHTMLMobileProfileStyle(), ViewportStyleResolver::UserAgentOrigin);
 
     if (ScopedStyleResolver* scopedResolver = document().scopedStyleResolver())
         scopedResolver->collectViewportRulesTo(this);
 
     viewportStyleResolver()->resolve();
 }
 
 PassRefPtr<RenderStyle> StyleResolver::defaultStyleForElement()
 {
-    StyleResolverState state(document(), 0);
-    state.setStyle(RenderStyle::create());
-    state.fontBuilder().setInitial(state.style()->effectiveZoom());
-    state.style()->font().update(document().styleEngine()->fontSelector());
-    return state.takeStyle();
+    RefPtr<RenderStyle> style = RenderStyle::create();
+    FontBuilder fontBuilder(document());
+    fontBuilder.setStyle(style.get());
+    fontBuilder.setInitial(style->effectiveZoom());
+    style->font().update(document().styleEngine()->fontSelector());
+    return style;

[Timothy Loh, 2014/11/06 16:24:01]

style.release()

[andersr, 2014/11/07 10:43:11]

Done.

 }
 
 PassRefPtr<RenderStyle> StyleResolver::styleForText(Text* textNode)
 {
     ASSERT(textNode);
 
     Node* parentNode = NodeRenderingTraversal::parent(textNode);
     if (!parentNode || !parentNode->renderStyle())
         return defaultStyleForElement();
     return parentNode->renderStyle();
 }
 
 void StyleResolver::updateFont(StyleResolverState& state)
 {
     state.fontBuilder().createFont(document().styleEngine()->fontSelector(), state.parentStyle(), state.style());
+    state.setConversionFontSizes(CSSToLengthFontSizes(state.style(), state.rootElementStyle()));
+    state.setConversionZoom(state.style()->effectiveZoom());
 }
 
 PassRefPtrWillBeRawPtr<StyleRuleList> StyleResolver::styleRulesForElement(Element* element, unsigned rulesToInclude)
 {
     ASSERT(element);
     StyleResolverState state(document(), element);
     ElementRuleCollector collector(state.elementContext(), m_selectorFilter, state.style());
     collector.setMode(SelectorChecker::CollectingStyleRules);
     collectPseudoRulesForElement(element, collector, NOPSEUDO, rulesToInclude);
     return collector.matchedStyleRuleList();
@@ skipping 473 matching lines @@
             && (!state.distributedToInsertionPoint() || state.style()->userModify() == READ_ONLY)) {
             INCREMENT_STYLE_STATS_COUNTER(*this, matchedPropertyCacheInheritedHit);
 
             EInsideLink linkStatus = state.style()->insideLink();
             // If the cache item parent style has identical inherited properties to the current parent style then the
             // resulting style will be identical too. We copy the inherited properties over from the cache and are done.
             state.style()->inheritFrom(cachedMatchedProperties->renderStyle.get());
 
             // Unfortunately the link status is treated like an inherited property. We need to explicitly restore it.
             state.style()->setInsideLink(linkStatus);
+
+            updateFont(state);

[Timothy Loh, 2014/11/06 16:24:01]

This call is for animations, right?

[andersr, 2014/11/06 16:35:27]

Yes.

+
             return;
         }
         applyInheritedOnly = true;
     }
 
     // Now we have all of the matched rules in the appropriate order. Walk the rules and apply
     // high-priority properties first, i.e., those properties that other properties depend on.
     // The order is (1) high-priority not important, (2) high-priority important, (3) normal not important
     // and (4) normal important.
     applyMatchedProperties<HighPriorityProperties>(state, matchResult, false, 0, matchResult.matchedProperties.size() - 1, applyInheritedOnly);
@@ skipping 148 matching lines @@
     visitor->trace(m_uncommonAttributeRuleSet);
     visitor->trace(m_watchedSelectorsRules);
     visitor->trace(m_treeBoundaryCrossingRules);
     visitor->trace(m_styleSharingLists);
     visitor->trace(m_pendingStyleSheets);
     visitor->trace(m_document);
 #endif
 }
 
 } // namespace blink