<!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>[179025] 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/179025">179025</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-01-23 13:39:28 -0800 (Fri, 23 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Document should be a FontSelectorClient.
<https://webkit.org/b/140833>
Reviewed by Antti Koivisto.
Make Document a FontSelectorClient so it can listen to the invalidation
callbacks from FontSelector instead of having code in FontSelector that
calls out to Document on invalidation.
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::dispatchInvalidationCallbacks):
* dom/Document.cpp:
(WebCore::Document::fontsNeedUpdate):
(WebCore::Document::fontSelector):
(WebCore::Document::clearStyleResolver):
* dom/Document.h:</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="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179024 => 179025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-23 21:31:34 UTC (rev 179024)
+++ trunk/Source/WebCore/ChangeLog 2015-01-23 21:39:28 UTC (rev 179025)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-23 Andreas Kling <akling@apple.com>
+
+ Document should be a FontSelectorClient.
+ <https://webkit.org/b/140833>
+
+ Reviewed by Antti Koivisto.
+
+ Make Document a FontSelectorClient so it can listen to the invalidation
+ callbacks from FontSelector instead of having code in FontSelector that
+ calls out to Document on invalidation.
+
+ * css/CSSFontSelector.cpp:
+ (WebCore::CSSFontSelector::dispatchInvalidationCallbacks):
+ * dom/Document.cpp:
+ (WebCore::Document::fontsNeedUpdate):
+ (WebCore::Document::fontSelector):
+ (WebCore::Document::clearStyleResolver):
+ * dom/Document.h:
+
</ins><span class="cx"> 2015-01-23 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Leverage CSSValuePool's font family cache in CSSComputedStyleDeclaration
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (179024 => 179025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-01-23 21:31:34 UTC (rev 179024)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2015-01-23 21:39:28 UTC (rev 179025)
</span><span class="lines">@@ -338,15 +338,6 @@
</span><span class="cx"> copyToVector(m_clients, clients);
</span><span class="cx"> for (size_t i = 0; i < clients.size(); ++i)
</span><span class="cx"> clients[i]->fontsNeedUpdate(this);
</span><del>-
- // FIXME: Make Document a FontSelectorClient so that it can simply register for invalidation callbacks.
- if (!m_document)
- return;
- if (StyleResolver* styleResolver = m_document->styleResolverIfExists())
- styleResolver->invalidateMatchedPropertiesCache();
- if (m_document->inPageCache() || !m_document->renderView())
- return;
- m_document->scheduleForcedStyleRecalc();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSSFontSelector::fontLoaded()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (179024 => 179025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-01-23 21:31:34 UTC (rev 179024)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-01-23 21:39:28 UTC (rev 179025)
</span><span class="lines">@@ -1942,10 +1942,21 @@
</span><span class="cx"> m_styleSheetCollection.combineCSSFeatureFlags();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Document::fontsNeedUpdate(FontSelector*)
+{
+ if (m_styleResolver)
+ m_styleResolver->invalidateMatchedPropertiesCache();
+ if (inPageCache() || !renderView())
+ return;
+ scheduleForcedStyleRecalc();
+}
+
</ins><span class="cx"> CSSFontSelector& Document::fontSelector()
</span><span class="cx"> {
</span><del>- if (!m_fontSelector)
</del><ins>+ if (!m_fontSelector) {
</ins><span class="cx"> m_fontSelector = CSSFontSelector::create(*this);
</span><ins>+ m_fontSelector->registerForInvalidationCallbacks(this);
+ }
</ins><span class="cx"> return *m_fontSelector;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1956,6 +1967,7 @@
</span><span class="cx"> // FIXME: It would be better if the FontSelector could survive this operation.
</span><span class="cx"> if (m_fontSelector) {
</span><span class="cx"> m_fontSelector->clearDocument();
</span><ins>+ m_fontSelector->unregisterForInvalidationCallbacks(this);
</ins><span class="cx"> m_fontSelector = nullptr;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (179024 => 179025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-01-23 21:31:34 UTC (rev 179024)
+++ trunk/Source/WebCore/dom/Document.h 2015-01-23 21:39:28 UTC (rev 179025)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "DocumentStyleSheetCollection.h"
</span><span class="cx"> #include "DocumentTiming.h"
</span><span class="cx"> #include "FocusDirection.h"
</span><ins>+#include "FontSelector.h"
</ins><span class="cx"> #include "IconURL.h"
</span><span class="cx"> #include "MutationObserver.h"
</span><span class="cx"> #include "PageVisibilityState.h"
</span><span class="lines">@@ -256,7 +257,7 @@
</span><span class="cx"> LimitedQuirksMode = 1 << 2
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class Document : public ContainerNode, public TreeScope, public ScriptExecutionContext {
</del><ins>+class Document : public ContainerNode, public TreeScope, public ScriptExecutionContext, public FontSelectorClient {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<Document> create(Frame* frame, const URL& url)
</span><span class="cx"> {
</span><span class="lines">@@ -1307,6 +1308,9 @@
</span><span class="cx"> typedef void (*ArgumentsCallback)(const String& keyString, const String& valueString, Document*, void* data);
</span><span class="cx"> void processArguments(const String& features, void* data, ArgumentsCallback);
</span><span class="cx">
</span><ins>+ // FontSelectorClient
+ virtual void fontsNeedUpdate(FontSelector*) override final;
+
</ins><span class="cx"> virtual bool isDocument() const override final { return true; }
</span><span class="cx">
</span><span class="cx"> virtual void childrenChanged(const ChildChange&) override final;
</span></span></pre>
</div>
</div>
</body>
</html>