<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179012] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179012">179012</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-01-23 10:44:22 -0800 (Fri, 23 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Hang CSSFontSelector off Document instead of StyleResolver.
<https://webkit.org/b/140820>
Reviewed by Antti Koivisto.
Move the CSSFontSelector from StyleResolver to Document. This is the first
step towards making the CSSFontSelector be able to survive full style recalc.
Clearing a Document's StyleResolver will still nuke the CSSFontSelector,
though that is done in Document::clearStyleResolver() now.
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::CSSFontSelector):
* css/CSSFontSelector.h:
Modernize CSSFontSelector construction a bit by having create() return
a Ref and the constructor take a Document& instead of a Document*.
Also made the constructor explicit.
(WebCore::StyleResolver::~StyleResolver):
* dom/Document.cpp:
(WebCore::Document::clearStyleResolver):
Nuke the current CSSFontSelector in clearStyleResolver() instead of
in ~StyleResolver. It's a minor change, but shows the way forward.
Added a FIXME about how CSSFontSelector should eventually survive
this operation.
(WebCore::Document::fontSelector):
* css/FontLoader.cpp:
(WebCore::FontLoader::loadFont):
(WebCore::FontLoader::checkFont):
(WebCore::FontLoader::resolveFontStyle):
* css/RuleSet.cpp:
(WebCore::RuleSet::addChildRules):
* css/StyleResolver.h:
(WebCore::StyleResolver::fontSelector): Deleted.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::StyleResolver):
(WebCore::StyleResolver::appendAuthorStyleSheets):
(WebCore::StyleResolver::styleForElement):
(WebCore::StyleResolver::defaultStyleForElement):
(WebCore::StyleResolver::updateFont):
* dom/Document.h:
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::setFont):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::updateFromElement):
(WebCore::RenderListBox::paintItemForeground):
* rendering/RenderMenuList.cpp:
(RenderMenuList::fontSelector):
* rendering/RenderSearchField.cpp:
(WebCore::RenderSearchField::fontSelector):
* rendering/TextAutoSizing.cpp:
(WebCore::TextAutoSizingValue::adjustNodeSizes):
(WebCore::TextAutoSizingValue::reset):
* rendering/svg/RenderSVGInlineText.cpp:
(WebCore::RenderSVGInlineText::computeNewScaledFontForStyle):
* style/StyleResolveForDocument.cpp:
(WebCore::Style::resolveForDocument):
* style/StyleResolveTree.cpp:
(WebCore::Style::resolveTree):
Move CSSFontSelector ownership from StyleResolver to Document.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorh">trunk/Source/WebCore/css/CSSFontSelector.h</a></li>
<li><a href="#trunkSourceWebCorecssFontLoadercpp">trunk/Source/WebCore/css/FontLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorecssRuleSetcpp">trunk/Source/WebCore/css/RuleSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListcpp">trunk/Source/WebCore/rendering/RenderMenuList.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSearchFieldcpp">trunk/Source/WebCore/rendering/RenderSearchField.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeSafaricpp">trunk/Source/WebCore/rendering/RenderThemeSafari.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextAutoSizingcpp">trunk/Source/WebCore/rendering/TextAutoSizing.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGInlineTextcpp">trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveForDocumentcpp">trunk/Source/WebCore/style/StyleResolveForDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/ChangeLog 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -1,3 +1,70 @@
</span><ins>+2015-01-23 Andreas Kling <akling@apple.com>
+
+ Hang CSSFontSelector off Document instead of StyleResolver.
+ <https://webkit.org/b/140820>
+
+ Reviewed by Antti Koivisto.
+
+ Move the CSSFontSelector from StyleResolver to Document. This is the first
+ step towards making the CSSFontSelector be able to survive full style recalc.
+
+ Clearing a Document's StyleResolver will still nuke the CSSFontSelector,
+ though that is done in Document::clearStyleResolver() now.
+
+ * css/CSSFontSelector.cpp:
+ (WebCore::CSSFontSelector::CSSFontSelector):
+ * css/CSSFontSelector.h:
+
+ Modernize CSSFontSelector construction a bit by having create() return
+ a Ref and the constructor take a Document& instead of a Document*.
+ Also made the constructor explicit.
+
+ (WebCore::StyleResolver::~StyleResolver):
+ * dom/Document.cpp:
+ (WebCore::Document::clearStyleResolver):
+
+ Nuke the current CSSFontSelector in clearStyleResolver() instead of
+ in ~StyleResolver. It's a minor change, but shows the way forward.
+ Added a FIXME about how CSSFontSelector should eventually survive
+ this operation.
+
+ (WebCore::Document::fontSelector):
+ * css/FontLoader.cpp:
+ (WebCore::FontLoader::loadFont):
+ (WebCore::FontLoader::checkFont):
+ (WebCore::FontLoader::resolveFontStyle):
+ * css/RuleSet.cpp:
+ (WebCore::RuleSet::addChildRules):
+ * css/StyleResolver.h:
+ (WebCore::StyleResolver::fontSelector): Deleted.
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::StyleResolver):
+ (WebCore::StyleResolver::appendAuthorStyleSheets):
+ (WebCore::StyleResolver::styleForElement):
+ (WebCore::StyleResolver::defaultStyleForElement):
+ (WebCore::StyleResolver::updateFont):
+ * dom/Document.h:
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::setFont):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::updateFromElement):
+ (WebCore::RenderListBox::paintItemForeground):
+ * rendering/RenderMenuList.cpp:
+ (RenderMenuList::fontSelector):
+ * rendering/RenderSearchField.cpp:
+ (WebCore::RenderSearchField::fontSelector):
+ * rendering/TextAutoSizing.cpp:
+ (WebCore::TextAutoSizingValue::adjustNodeSizes):
+ (WebCore::TextAutoSizingValue::reset):
+ * rendering/svg/RenderSVGInlineText.cpp:
+ (WebCore::RenderSVGInlineText::computeNewScaledFontForStyle):
+ * style/StyleResolveForDocument.cpp:
+ (WebCore::Style::resolveForDocument):
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::resolveTree):
+
+ Move CSSFontSelector ownership from StyleResolver to Document.
+
</ins><span class="cx"> 2015-01-23 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Layout Test http/tests/media/track-in-band-hls-metadata.html is flaky
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -58,12 +58,11 @@
</span><span class="cx">
</span><span class="cx"> static unsigned fontSelectorId;
</span><span class="cx">
</span><del>-CSSFontSelector::CSSFontSelector(Document* document)
- : m_document(document)
</del><ins>+CSSFontSelector::CSSFontSelector(Document& document)
+ : m_document(&document)
</ins><span class="cx"> , m_beginLoadingTimer(*this, &CSSFontSelector::beginLoadTimerFired)
</span><span class="cx"> , m_uniqueId(++fontSelectorId)
</span><span class="cx"> , m_version(0)
</span><del>-
</del><span class="cx"> {
</span><span class="cx"> // FIXME: An old comment used to say there was no need to hold a reference to m_document
</span><span class="cx"> // because "we are guaranteed to be destroyed before the document". But there does not
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.h (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.h 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/css/CSSFontSelector.h 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx">
</span><span class="cx"> class CSSFontSelector final : public FontSelector {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<CSSFontSelector> create(Document* document)
</del><ins>+ static Ref<CSSFontSelector> create(Document& document)
</ins><span class="cx"> {
</span><del>- return adoptRef(new CSSFontSelector(document));
</del><ins>+ return adoptRef(*new CSSFontSelector(document));
</ins><span class="cx"> }
</span><span class="cx"> virtual ~CSSFontSelector();
</span><span class="cx">
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> void beginLoadingFontSoon(CachedFont*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CSSFontSelector(Document*);
</del><ins>+ explicit CSSFontSelector(Document&);
</ins><span class="cx">
</span><span class="cx"> void dispatchInvalidationCallbacks();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontLoader.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontLoader.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/css/FontLoader.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> m_numLoadingFromJS += callback->familyCount();
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < font.familyCount(); i++) {
</span><del>- CSSSegmentedFontFace* face = m_document->ensureStyleResolver().fontSelector()->getFontFace(font.fontDescription(), font.familyAt(i));
</del><ins>+ CSSSegmentedFontFace* face = m_document->fontSelector().getFontFace(font.fontDescription(), font.familyAt(i));
</ins><span class="cx"> if (!face) {
</span><span class="cx"> if (callback)
</span><span class="cx"> callback->notifyError();
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> if (!resolveFontStyle(fontString, font))
</span><span class="cx"> return false;
</span><span class="cx"> for (unsigned i = 0; i < font.familyCount(); i++) {
</span><del>- CSSSegmentedFontFace* face = m_document->ensureStyleResolver().fontSelector()->getFontFace(font.fontDescription(), font.familyAt(i));
</del><ins>+ CSSSegmentedFontFace* face = m_document->fontSelector().getFontFace(font.fontDescription(), font.familyAt(i));
</ins><span class="cx"> if (!face || !face->checkFont())
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> applyPropertyToCurrentStyle(styleResolver, CSSPropertyLineHeight, parsedStyle);
</span><span class="cx">
</span><span class="cx"> font = style->fontCascade();
</span><del>- font.update(styleResolver.fontSelector());
</del><ins>+ font.update(&m_document->fontSelector());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> addChildRules(mediaRule.childRules(), medium, resolver, hasDocumentSecurityOrigin, addRuleFlags);
</span><span class="cx"> } else if (is<StyleRuleFontFace>(*rule) && resolver) {
</span><span class="cx"> // Add this font face to our set.
</span><del>- resolver->fontSelector()->addFontFaceRule(downcast<StyleRuleFontFace>(rule.get()));
</del><ins>+ resolver->document().fontSelector().addFontFaceRule(downcast<StyleRuleFontFace>(rule.get()));
</ins><span class="cx"> resolver->invalidateMatchedPropertiesCache();
</span><span class="cx"> } else if (is<StyleRuleKeyframes>(*rule) && resolver)
</span><span class="cx"> resolver->addKeyframeStyle(downcast<StyleRuleKeyframes>(rule.get()));
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -257,7 +257,6 @@
</span><span class="cx"> , m_matchedPropertiesCacheSweepTimer(*this, &StyleResolver::sweepMatchedPropertiesCache)
</span><span class="cx"> , m_document(document)
</span><span class="cx"> , m_matchAuthorAndUserStyles(matchAuthorAndUserStyles)
</span><del>- , m_fontSelector(CSSFontSelector::create(&m_document))
</del><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx"> , m_viewportStyleResolver(ViewportStyleResolver::create(&document))
</span><span class="cx"> #endif
</span><span class="lines">@@ -295,7 +294,7 @@
</span><span class="cx"> const HashSet<SVGFontFaceElement*>& svgFontFaceElements = m_document.svgExtensions()->svgFontFaceElements();
</span><span class="cx"> HashSet<SVGFontFaceElement*>::const_iterator end = svgFontFaceElements.end();
</span><span class="cx"> for (HashSet<SVGFontFaceElement*>::const_iterator it = svgFontFaceElements.begin(); it != end; ++it)
</span><del>- fontSelector()->addFontFaceRule((*it)->fontFaceRule());
</del><ins>+ m_document.fontSelector().addFontFaceRule((*it)->fontFaceRule());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -306,7 +305,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_ruleSets.appendAuthorStyleSheets(firstNew, styleSheets, m_medium.get(), m_inspectorCSSOMWrappers, this);
</span><span class="cx"> if (auto renderView = document().renderView())
</span><del>- renderView->style().fontCascade().update(fontSelector());
</del><ins>+ renderView->style().fontCascade().update(&document().fontSelector());
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx"> viewportStyleResolver()->resolve();
</span><span class="lines">@@ -344,8 +343,6 @@
</span><span class="cx">
</span><span class="cx"> StyleResolver::~StyleResolver()
</span><span class="cx"> {
</span><del>- m_fontSelector->clearDocument();
-
</del><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx"> m_viewportStyleResolver->clearDocument();
</span><span class="cx"> #endif
</span><span class="lines">@@ -748,7 +745,7 @@
</span><span class="cx"> if (!s_styleNotYetAvailable) {
</span><span class="cx"> s_styleNotYetAvailable = &RenderStyle::create().leakRef();
</span><span class="cx"> s_styleNotYetAvailable->setDisplay(NONE);
</span><del>- s_styleNotYetAvailable->fontCascade().update(m_fontSelector);
</del><ins>+ s_styleNotYetAvailable->fontCascade().update(&document().fontSelector());
</ins><span class="cx"> }
</span><span class="cx"> element->document().setHasNodesWithPlaceholderStyle();
</span><span class="cx"> return *s_styleNotYetAvailable;
</span><span class="lines">@@ -1031,7 +1028,7 @@
</span><span class="cx"> // Make sure our fonts are initialized if we don't inherit them from our parent style.
</span><span class="cx"> if (Settings* settings = documentSettings()) {
</span><span class="cx"> initializeFontStyle(settings);
</span><del>- m_state.style()->fontCascade().update(fontSelector());
</del><ins>+ m_state.style()->fontCascade().update(&document().fontSelector());
</ins><span class="cx"> } else
</span><span class="cx"> m_state.style()->fontCascade().update(nullptr);
</span><span class="cx">
</span><span class="lines">@@ -1484,7 +1481,7 @@
</span><span class="cx"> checkForGenericFamilyChange(style, m_state.parentStyle());
</span><span class="cx"> checkForZoomChange(style, m_state.parentStyle());
</span><span class="cx"> checkForOrientationChange(style);
</span><del>- style->fontCascade().update(m_fontSelector);
</del><ins>+ style->fontCascade().update(&document().fontSelector());
</ins><span class="cx"> if (m_state.fontSizeHasViewportUnits())
</span><span class="cx"> style->setHasViewportUnits(true);
</span><span class="cx"> m_state.setFontDirty(false);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/css/StyleResolver.h 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CSSCursorImageValue;
</span><del>-class CSSFontSelector;
</del><span class="cx"> class CSSFontFace;
</span><span class="cx"> class CSSFontFaceRule;
</span><span class="cx"> class CSSFontValue;
</span><span class="lines">@@ -219,7 +218,6 @@
</span><span class="cx"> bool hasSelectorForClass(const AtomicString&) const;
</span><span class="cx"> bool hasSelectorForAttribute(const Element&, const AtomicString&) const;
</span><span class="cx">
</span><del>- CSSFontSelector* fontSelector() const { return m_fontSelector.get(); }
</del><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span><span class="cx"> ViewportStyleResolver* viewportStyleResolver() { return m_viewportStyleResolver.get(); }
</span><span class="cx"> #endif
</span><span class="lines">@@ -521,7 +519,6 @@
</span><span class="cx">
</span><span class="cx"> bool m_matchAuthorAndUserStyles;
</span><span class="cx">
</span><del>- RefPtr<CSSFontSelector> m_fontSelector;
</del><span class="cx"> Vector<std::unique_ptr<MediaQueryResult>> m_viewportDependentMediaQueryResults;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_DEVICE_ADAPTATION)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "Attr.h"
</span><span class="cx"> #include "AudioProducer.h"
</span><span class="cx"> #include "CDATASection.h"
</span><ins>+#include "CSSFontSelector.h"
</ins><span class="cx"> #include "CSSStyleDeclaration.h"
</span><span class="cx"> #include "CSSStyleSheet.h"
</span><span class="cx"> #include "CachedCSSStyleSheet.h"
</span><span class="lines">@@ -1941,9 +1942,22 @@
</span><span class="cx"> m_styleSheetCollection.combineCSSFeatureFlags();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CSSFontSelector& Document::fontSelector()
+{
+ if (!m_fontSelector)
+ m_fontSelector = CSSFontSelector::create(*this);
+ return *m_fontSelector;
+}
+
</ins><span class="cx"> void Document::clearStyleResolver()
</span><span class="cx"> {
</span><span class="cx"> m_styleResolver = nullptr;
</span><ins>+
+ // FIXME: It would be better if the FontSelector could survive this operation.
+ if (m_fontSelector) {
+ m_fontSelector->clearDocument();
+ m_fontSelector = nullptr;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::createRenderTree()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/dom/Document.h 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> class Attr;
</span><span class="cx"> class AudioProducer;
</span><span class="cx"> class CDATASection;
</span><ins>+class CSSFontSelector;
</ins><span class="cx"> class CSSStyleDeclaration;
</span><span class="cx"> class CSSStyleSheet;
</span><span class="cx"> class CachedCSSStyleSheet;
</span><span class="lines">@@ -544,6 +545,8 @@
</span><span class="cx"> return *m_styleResolver;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ CSSFontSelector& fontSelector();
+
</ins><span class="cx"> void notifyRemovePendingSheetIfNeeded();
</span><span class="cx">
</span><span class="cx"> bool haveStylesheetsLoaded() const;
</span><span class="lines">@@ -1691,6 +1694,8 @@
</span><span class="cx"> Document* m_templateDocumentHost; // Manually managed weakref (backpointer from m_templateDocument).
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ RefPtr<CSSFontSelector> m_fontSelector;
+
</ins><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span><span class="cx"> RefPtr<FontLoader> m_fontloader;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -2093,7 +2093,10 @@
</span><span class="cx"> // Map the <canvas> font into the text style. If the font uses keywords like larger/smaller, these will work
</span><span class="cx"> // relative to the canvas.
</span><span class="cx"> RefPtr<RenderStyle> newStyle = RenderStyle::create();
</span><del>- canvas()->document().updateStyleIfNeeded();
</del><ins>+
+ Document& document = canvas()->document();
+ document.updateStyleIfNeeded();
+
</ins><span class="cx"> if (RenderStyle* computedStyle = canvas()->computedStyle())
</span><span class="cx"> newStyle->setFontDescription(computedStyle->fontDescription());
</span><span class="cx"> else {
</span><span class="lines">@@ -2123,9 +2126,9 @@
</span><span class="cx"> styleResolver.applyPropertyToCurrentStyle(CSSPropertyLineHeight, parsedStyle->getPropertyCSSValue(CSSPropertyLineHeight).get());
</span><span class="cx">
</span><span class="cx"> modifiableState().m_font = newStyle->fontCascade();
</span><del>- modifiableState().m_font.update(styleResolver.fontSelector());
</del><ins>+ modifiableState().m_font.update(&document.fontSelector());
</ins><span class="cx"> modifiableState().m_realizedFont = true;
</span><del>- styleResolver.fontSelector()->registerForInvalidationCallbacks(&modifiableState());
</del><ins>+ document.fontSelector().registerForInvalidationCallbacks(&modifiableState());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String CanvasRenderingContext2D::textAlign() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> FontDescription d = itemFont.fontDescription();
</span><span class="cx"> d.setWeight(d.bolderWeight());
</span><span class="cx"> itemFont = FontCascade(d, itemFont.letterSpacing(), itemFont.wordSpacing());
</span><del>- itemFont.update(document().ensureStyleResolver().fontSelector());
</del><ins>+ itemFont.update(&document().fontSelector());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!text.isEmpty()) {
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx"> FontDescription d = itemFont.fontDescription();
</span><span class="cx"> d.setWeight(d.bolderWeight());
</span><span class="cx"> itemFont = FontCascade(d, itemFont.letterSpacing(), itemFont.wordSpacing());
</span><del>- itemFont.update(document().ensureStyleResolver().fontSelector());
</del><ins>+ itemFont.update(&document().fontSelector());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Draw the item text
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -662,7 +662,7 @@
</span><span class="cx">
</span><span class="cx"> FontSelector* RenderMenuList::fontSelector() const
</span><span class="cx"> {
</span><del>- return document().ensureStyleResolver().fontSelector();
</del><ins>+ return &document().fontSelector();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSearchFieldcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSearchField.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSearchField.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/rendering/RenderSearchField.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx">
</span><span class="cx"> FontSelector* RenderSearchField::fontSelector() const
</span><span class="cx"> {
</span><del>- return document().ensureStyleResolver().fontSelector();
</del><ins>+ return &document().fontSelector();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HostWindow* RenderSearchField::hostWindow() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeSafaricpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> style.setLineHeight(RenderStyle::initialLineHeight());
</span><span class="cx">
</span><span class="cx"> if (style.setFontDescription(fontDescription))
</span><del>- style.fontCascade().update(styleResolver.fontSelector());
</del><ins>+ style.fontCascade().update(&styleResolver.document().fontSelector());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSControlSize RenderThemeSafari::controlSizeForSystemFont(RenderStyle& style) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextAutoSizingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextAutoSizing.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> FontDescription fontDescription = style->fontDescription();
</span><span class="cx"> fontDescription.setComputedSize(averageSize);
</span><span class="cx"> style->setFontDescription(fontDescription);
</span><del>- style->fontCascade().update(autoSizingNode->document().ensureStyleResolver().fontSelector());
</del><ins>+ style->fontCascade().update(&autoSizingNode->document().fontSelector());
</ins><span class="cx"> text->parent()->setStyle(style.releaseNonNull());
</span><span class="cx">
</span><span class="cx"> RenderElement* parentRenderer = text->parent();
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> if (listMarkerRenderer->isListMarker()) {
</span><span class="cx"> RefPtr<RenderStyle> style = cloneRenderStyleWithState(listMarkerRenderer->style());
</span><span class="cx"> style->setFontDescription(fontDescription);
</span><del>- style->fontCascade().update(autoSizingNode->document().ensureStyleResolver().fontSelector());
</del><ins>+ style->fontCascade().update(&autoSizingNode->document().fontSelector());
</ins><span class="cx"> downcast<RenderListMarker>(*listMarkerRenderer).setStyle(style.releaseNonNull());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> newParentStyle->setLineHeight(Length(lineHeight, Fixed));
</span><span class="cx"> newParentStyle->setSpecifiedLineHeight(lineHeightLength);
</span><span class="cx"> newParentStyle->setFontDescription(fontDescription);
</span><del>- newParentStyle->fontCascade().update(autoSizingNode->document().ensureStyleResolver().fontSelector());
</del><ins>+ newParentStyle->fontCascade().update(&autoSizingNode->document().fontSelector());
</ins><span class="cx"> parentRenderer->setStyle(newParentStyle.releaseNonNull());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> fontDescription.setComputedSize(originalSize);
</span><span class="cx"> RefPtr<RenderStyle> style = cloneRenderStyleWithState(text->style());
</span><span class="cx"> style->setFontDescription(fontDescription);
</span><del>- style->fontCascade().update(autoSizingNode->document().ensureStyleResolver().fontSelector());
</del><ins>+ style->fontCascade().update(&autoSizingNode->document().fontSelector());
</ins><span class="cx"> text->parent()->setStyle(style.releaseNonNull());
</span><span class="cx"> }
</span><span class="cx"> // Reset the line height of the parent.
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> RefPtr<RenderStyle> newParentStyle = cloneRenderStyleWithState(parentStyle);
</span><span class="cx"> newParentStyle->setLineHeight(originalLineHeight);
</span><span class="cx"> newParentStyle->setFontDescription(fontDescription);
</span><del>- newParentStyle->fontCascade().update(autoSizingNode->document().ensureStyleResolver().fontSelector());
</del><ins>+ newParentStyle->fontCascade().update(&autoSizingNode->document().fontSelector());
</ins><span class="cx"> parentRenderer->setStyle(newParentStyle.releaseNonNull());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGInlineTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInlineText.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> fontDescription.setComputedSize(Style::computedFontSizeFromSpecifiedSizeForSVGInlineText(fontDescription.computedSize(), fontDescription.isAbsoluteSize(), scalingFactor, renderer.document()));
</span><span class="cx">
</span><span class="cx"> scaledFont = FontCascade(fontDescription, 0, 0);
</span><del>- scaledFont.update(renderer.document().ensureStyleResolver().fontSelector());
</del><ins>+ scaledFont.update(&renderer.document().fontSelector());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveForDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveForDocument.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveForDocument.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/style/StyleResolveForDocument.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -115,8 +115,7 @@
</span><span class="cx">
</span><span class="cx"> documentStyle.get().setFontDescription(fontDescription);
</span><span class="cx">
</span><del>- CSSFontSelector* fontSelector = document.styleResolverIfExists() ? document.styleResolverIfExists()->fontSelector() : nullptr;
- documentStyle.get().fontCascade().update(fontSelector);
</del><ins>+ documentStyle.get().fontCascade().update(&const_cast<Document&>(document).fontSelector());
</ins><span class="cx">
</span><span class="cx"> return documentStyle;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (179011 => 179012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-01-23 18:28:05 UTC (rev 179011)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-01-23 18:44:22 UTC (rev 179012)
</span><span class="lines">@@ -976,9 +976,8 @@
</span><span class="cx"> // Inserting the pictograph font at the end of the font fallback list is done by the
</span><span class="cx"> // font selector, so set a font selector if needed.
</span><span class="cx"> if (Settings* settings = document.settings()) {
</span><del>- StyleResolver* styleResolver = document.styleResolverIfExists();
- if (settings->fontFallbackPrefersPictographs() && styleResolver)
- documentStyle.get().fontCascade().update(styleResolver->fontSelector());
</del><ins>+ if (settings->fontFallbackPrefersPictographs())
+ documentStyle.get().fontCascade().update(&document.fontSelector());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Style::Change documentChange = determineChange(documentStyle.get(), document.renderView()->style());
</span></span></pre>
</div>
</div>
</body>
</html>