<!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>[164678] trunk/Source</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/164678">164678</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-25 15:28:36 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify visited link style invalidation
https://bugs.webkit.org/show_bug.cgi?id=129340
Reviewed by Dan Bernstein.
Source/WebCore:
Get rid of the static Page::allVisitedStateChanged and Page::visitedStateChanged
member functions and add functions to invalidate all styles on a single page or the style
for a single link hash on a single page.
* WebCore.exp.in:
* page/Page.cpp:
(WebCore::Page::invalidateStylesForAllLinks):
(WebCore::Page::invalidateStylesForLink):
* page/Page.h:
* page/PageGroup.cpp:
(WebCore::PageGroup::addVisitedLink):
(WebCore::PageGroup::removeVisitedLink):
(WebCore::PageGroup::removeVisitedLinks):
Source/WebKit2:
* UIProcess/VisitedLinkProvider.cpp:
(WebKit::VisitedLinkProvider::addVisitedLink):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::visitedLinkStateChanged):
(WebKit::WebProcess::allVisitedLinkStateChanged):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepagePageGroupcpp">trunk/Source/WebCore/page/PageGroup.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164677 => 164678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-25 23:17:08 UTC (rev 164677)
+++ trunk/Source/WebCore/ChangeLog 2014-02-25 23:28:36 UTC (rev 164678)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-02-25 Anders Carlsson <andersca@apple.com>
+
+ Simplify visited link style invalidation
+ https://bugs.webkit.org/show_bug.cgi?id=129340
+
+ Reviewed by Dan Bernstein.
+
+ Get rid of the static Page::allVisitedStateChanged and Page::visitedStateChanged
+ member functions and add functions to invalidate all styles on a single page or the style
+ for a single link hash on a single page.
+
+ * WebCore.exp.in:
+ * page/Page.cpp:
+ (WebCore::Page::invalidateStylesForAllLinks):
+ (WebCore::Page::invalidateStylesForLink):
+ * page/Page.h:
+ * page/PageGroup.cpp:
+ (WebCore::PageGroup::addVisitedLink):
+ (WebCore::PageGroup::removeVisitedLink):
+ (WebCore::PageGroup::removeVisitedLinks):
+
</ins><span class="cx"> 2014-02-25 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused ThreadSpecificInspectorCounters.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (164677 => 164678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-02-25 23:17:08 UTC (rev 164677)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-02-25 23:28:36 UTC (rev 164678)
</span><span class="lines">@@ -1021,19 +1021,19 @@
</span><span class="cx"> __ZN7WebCore4Page19addHeaderWithHeightEi
</span><span class="cx"> #endif
</span><span class="cx"> __ZN7WebCore4Page19addLayoutMilestonesEj
</span><del>-__ZN7WebCore4Page19visitedStateChangedEPNS_9PageGroupEy
</del><span class="cx"> __ZN7WebCore4Page20setDeviceScaleFactorEf
</span><span class="cx"> __ZN7WebCore4Page20unmarkAllTextMatchesEv
</span><span class="cx"> __ZN7WebCore4Page21markAllMatchesForTextERKN3WTF6StringEjbj
</span><span class="cx"> __ZN7WebCore4Page21resumeAnimatingImagesEv
</span><del>-__ZN7WebCore4Page22allVisitedStateChangedEPNS_9PageGroupE
</del><span class="cx"> __ZN7WebCore4Page22nonFastScrollableRectsEPKNS_5FrameE
</span><span class="cx"> __ZN7WebCore4Page22removeLayoutMilestonesEj
</span><span class="cx"> __ZN7WebCore4Page23clearUndoRedoOperationsEv
</span><ins>+__ZN7WebCore4Page23invalidateStylesForLinkEy
</ins><span class="cx"> __ZN7WebCore4Page24findStringMatchingRangesERKN3WTF6StringEjiPNS1_6VectorINS1_6RefPtrINS_5RangeEEELm0ENS1_15CrashOnOverflowEEERi
</span><span class="cx"> __ZN7WebCore4Page24resumeScriptedAnimationsEv
</span><span class="cx"> __ZN7WebCore4Page24scrollingStateTreeAsTextEv
</span><span class="cx"> __ZN7WebCore4Page25suspendScriptedAnimationsEv
</span><ins>+__ZN7WebCore4Page27invalidateStylesForAllLinksEv
</ins><span class="cx"> __ZN7WebCore4Page33synchronousScrollingReasonsAsTextEv
</span><span class="cx"> __ZN7WebCore4Page32setMemoryCacheClientCallsEnabledEb
</span><span class="cx"> __ZN7WebCore4Page35resumeActiveDOMObjectsAndAnimationsEv
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (164677 => 164678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-02-25 23:17:08 UTC (rev 164677)
+++ trunk/Source/WebCore/page/Page.cpp 2014-02-25 23:28:36 UTC (rev 164678)
</span><span class="lines">@@ -932,36 +932,16 @@
</span><span class="cx"> (*it)->removeVisitedLinks();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::allVisitedStateChanged(PageGroup* group)
</del><ins>+void Page::invalidateStylesForAllLinks()
</ins><span class="cx"> {
</span><del>- ASSERT(group);
- if (!allPages)
- return;
-
- HashSet<Page*>::iterator pagesEnd = allPages->end();
- for (HashSet<Page*>::iterator it = allPages->begin(); it != pagesEnd; ++it) {
- Page* page = *it;
- if (page->m_group != group)
- continue;
- for (Frame* frame = page->m_mainFrame.get(); frame; frame = frame->tree().traverseNext())
- frame->document()->visitedLinkState().invalidateStyleForAllLinks();
- }
</del><ins>+ for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext())
+ frame->document()->visitedLinkState().invalidateStyleForAllLinks();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::visitedStateChanged(PageGroup* group, LinkHash linkHash)
</del><ins>+void Page::invalidateStylesForLink(LinkHash linkHash)
</ins><span class="cx"> {
</span><del>- ASSERT(group);
- if (!allPages)
- return;
-
- HashSet<Page*>::iterator pagesEnd = allPages->end();
- for (HashSet<Page*>::iterator it = allPages->begin(); it != pagesEnd; ++it) {
- Page* page = *it;
- if (page->m_group != group)
- continue;
- for (Frame* frame = page->m_mainFrame.get(); frame; frame = frame->tree().traverseNext())
- frame->document()->visitedLinkState().invalidateStyleForLink(linkHash);
- }
</del><ins>+ for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext())
+ frame->document()->visitedLinkState().invalidateStyleForLink(linkHash);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setDebugger(JSC::Debugger* debugger)
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (164677 => 164678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-02-25 23:17:08 UTC (rev 164677)
+++ trunk/Source/WebCore/page/Page.h 2014-02-25 23:28:36 UTC (rev 164678)
</span><span class="lines">@@ -317,8 +317,8 @@
</span><span class="cx">
</span><span class="cx"> static void removeAllVisitedLinks();
</span><span class="cx">
</span><del>- static void allVisitedStateChanged(PageGroup*);
- static void visitedStateChanged(PageGroup*, LinkHash visitedHash);
</del><ins>+ void invalidateStylesForAllLinks();
+ void invalidateStylesForLink(LinkHash);
</ins><span class="cx">
</span><span class="cx"> StorageNamespace* sessionStorage(bool optionalCreate = true);
</span><span class="cx"> void setSessionStorage(PassRefPtr<StorageNamespace>);
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.cpp (164677 => 164678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.cpp 2014-02-25 23:17:08 UTC (rev 164677)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2014-02-25 23:28:36 UTC (rev 164678)
</span><span class="lines">@@ -207,7 +207,8 @@
</span><span class="cx"> ASSERT(shouldTrackVisitedLinks);
</span><span class="cx"> if (!m_visitedLinkHashes.add(hash).isNewEntry)
</span><span class="cx"> return;
</span><del>- Page::visitedStateChanged(this, hash);
</del><ins>+ for (auto& page : m_pages)
+ page->invalidateStylesForLink(hash);
</ins><span class="cx"> pageCache()->markPagesForVistedLinkStyleRecalc();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -232,7 +233,9 @@
</span><span class="cx"> ASSERT(m_visitedLinkHashes.contains(hash));
</span><span class="cx"> m_visitedLinkHashes.remove(hash);
</span><span class="cx">
</span><del>- Page::allVisitedStateChanged(this);
</del><ins>+ // FIXME: Why can't we just invalidate the single visited link hash here?
+ for (auto& page : m_pages)
+ page->invalidateStylesForAllLinks();
</ins><span class="cx"> pageCache()->markPagesForVistedLinkStyleRecalc();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -242,7 +245,9 @@
</span><span class="cx"> if (m_visitedLinkHashes.isEmpty())
</span><span class="cx"> return;
</span><span class="cx"> m_visitedLinkHashes.clear();
</span><del>- Page::allVisitedStateChanged(this);
</del><ins>+
+ for (auto& page : m_pages)
+ page->invalidateStylesForAllLinks();
</ins><span class="cx"> pageCache()->markPagesForVistedLinkStyleRecalc();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164677 => 164678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-25 23:17:08 UTC (rev 164677)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-25 23:28:36 UTC (rev 164678)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-02-25 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Simplify visited link style invalidation
+ https://bugs.webkit.org/show_bug.cgi?id=129340
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/VisitedLinkProvider.cpp:
+ (WebKit::VisitedLinkProvider::addVisitedLink):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::visitedLinkStateChanged):
+ (WebKit::WebProcess::allVisitedLinkStateChanged):
+
+2014-02-25 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Fix build.
</span><span class="cx">
</span><span class="cx"> Remove VisitedLinkStrategy.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (164677 => 164678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-02-25 23:17:08 UTC (rev 164677)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-02-25 23:28:36 UTC (rev 164678)
</span><span class="lines">@@ -506,11 +506,11 @@
</span><span class="cx"> void WebProcess::visitedLinkStateChanged(const Vector<WebCore::LinkHash>& linkHashes)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: We may want to track visited links per WebPageGroup rather than per WebContext.
</span><del>- for (size_t i = 0; i < linkHashes.size(); ++i) {
- HashMap<uint64_t, RefPtr<WebPageGroupProxy>>::const_iterator it = m_pageGroupMap.begin();
- HashMap<uint64_t, RefPtr<WebPageGroupProxy>>::const_iterator end = m_pageGroupMap.end();
- for (; it != end; ++it)
- Page::visitedStateChanged(PageGroup::pageGroup(it->value->identifier()), linkHashes[i]);
</del><ins>+ for (const auto& webPage : m_pageMap.values()) {
+ if (Page* page = webPage->corePage()) {
+ for (auto linkHash : linkHashes)
+ page->invalidateStylesForLink(linkHash);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pageCache()->markPagesForVistedLinkStyleRecalc();
</span><span class="lines">@@ -518,11 +518,10 @@
</span><span class="cx">
</span><span class="cx"> void WebProcess::allVisitedLinkStateChanged()
</span><span class="cx"> {
</span><del>- // FIXME: We may want to track visited links per WebPageGroup rather than per WebContext.
- HashMap<uint64_t, RefPtr<WebPageGroupProxy>>::const_iterator it = m_pageGroupMap.begin();
- HashMap<uint64_t, RefPtr<WebPageGroupProxy>>::const_iterator end = m_pageGroupMap.end();
- for (; it != end; ++it)
- Page::allVisitedStateChanged(PageGroup::pageGroup(it->value->identifier()));
</del><ins>+ for (const auto& webPage : m_pageMap.values()) {
+ if (Page* page = webPage->corePage())
+ page->invalidateStylesForAllLinks();
+ }
</ins><span class="cx">
</span><span class="cx"> pageCache()->markPagesForVistedLinkStyleRecalc();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>