<!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>[176575] trunk/Source/WebKit/mac</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/176575">176575</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-11-29 13:49:40 -0800 (Sat, 29 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More work on the legacy WebKit visited link store
https://bugs.webkit.org/show_bug.cgi?id=139100
Reviewed by Sam Weinig.
* History/WebHistory.mm:
(+[WebHistory setOptionalSharedHistory:]):
Call WebVisitedLinkStore::setShouldTrackVisitedLinks and WebVisitedLinkStore::removeAllVisitedLinks.
* WebCoreSupport/WebVisitedLinkStore.h:
* WebCoreSupport/WebVisitedLinkStore.mm:
(visitedLinkStores):
(WebVisitedLinkStore::WebVisitedLinkStore):
(WebVisitedLinkStore::~WebVisitedLinkStore):
Keep track of live visited link stores.
(WebVisitedLinkStore::setShouldTrackVisitedLinks):
Update s_shouldTrackVisitedLinks and call removeAllVisitedLinks if necessary.
(WebVisitedLinkStore::removeAllVisitedLinks):
Iterate over all live link stores and remove their links.
(WebVisitedLinkStore::isLinkVisited):
Populate visited links and check if our hash table contains the link.
(WebVisitedLinkStore::addVisitedLink):
Add the link hash to the table.
(WebVisitedLinkStore::populateVisitedLinksIfNeeded):
Add stub.
(WebVisitedLinkStore::removeVisitedLinkHashes):
Clear out the hash table.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistorymm">trunk/Source/WebKit/mac/History/WebHistory.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebVisitedLinkStoreh">trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebVisitedLinkStoremm">trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (176574 => 176575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-29 21:12:55 UTC (rev 176574)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-29 21:49:40 UTC (rev 176575)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-11-29 Anders Carlsson <andersca@apple.com>
+
+ More work on the legacy WebKit visited link store
+ https://bugs.webkit.org/show_bug.cgi?id=139100
+
+ Reviewed by Sam Weinig.
+
+ * History/WebHistory.mm:
+ (+[WebHistory setOptionalSharedHistory:]):
+ Call WebVisitedLinkStore::setShouldTrackVisitedLinks and WebVisitedLinkStore::removeAllVisitedLinks.
+
+ * WebCoreSupport/WebVisitedLinkStore.h:
+ * WebCoreSupport/WebVisitedLinkStore.mm:
+ (visitedLinkStores):
+ (WebVisitedLinkStore::WebVisitedLinkStore):
+ (WebVisitedLinkStore::~WebVisitedLinkStore):
+ Keep track of live visited link stores.
+
+ (WebVisitedLinkStore::setShouldTrackVisitedLinks):
+ Update s_shouldTrackVisitedLinks and call removeAllVisitedLinks if necessary.
+
+ (WebVisitedLinkStore::removeAllVisitedLinks):
+ Iterate over all live link stores and remove their links.
+
+ (WebVisitedLinkStore::isLinkVisited):
+ Populate visited links and check if our hash table contains the link.
+
+ (WebVisitedLinkStore::addVisitedLink):
+ Add the link hash to the table.
+
+ (WebVisitedLinkStore::populateVisitedLinksIfNeeded):
+ Add stub.
+
+ (WebVisitedLinkStore::removeVisitedLinkHashes):
+ Clear out the hash table.
+
</ins><span class="cx"> 2014-11-27 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a stubbed out WebVisitedLinkStore to WebViewGroup
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistorymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistory.mm (176574 => 176575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistory.mm 2014-11-29 21:12:55 UTC (rev 176574)
+++ trunk/Source/WebKit/mac/History/WebHistory.mm 2014-11-29 21:49:40 UTC (rev 176575)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "WebKitLogging.h"
</span><span class="cx"> #import "WebNSURLExtras.h"
</span><span class="cx"> #import "WebTypesInternal.h"
</span><ins>+#import "WebVisitedLinkStore.h"
</ins><span class="cx"> #import <WebCore/HistoryItem.h>
</span><span class="cx"> #import <WebCore/NSCalendarDateSPI.h>
</span><span class="cx"> #import <WebCore/PageGroup.h>
</span><span class="lines">@@ -727,8 +728,11 @@
</span><span class="cx"> // and correct synchronization of history file between applications.
</span><span class="cx"> [_sharedHistory release];
</span><span class="cx"> _sharedHistory = [history retain];
</span><ins>+
</ins><span class="cx"> PageGroup::setShouldTrackVisitedLinks(history);
</span><span class="cx"> PageGroup::removeAllVisitedLinks();
</span><ins>+ WebVisitedLinkStore::setShouldTrackVisitedLinks(history);
+ WebVisitedLinkStore::removeAllVisitedLinks();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)timeZoneChanged:(NSNotification *)notification
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebVisitedLinkStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.h (176574 => 176575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.h 2014-11-29 21:12:55 UTC (rev 176574)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.h 2014-11-29 21:49:40 UTC (rev 176575)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef WebVisitedLinkStore_h
</span><span class="cx"> #define WebVisitedLinkStore_h
</span><span class="cx">
</span><ins>+#import <WebCore/LinkHash.h>
</ins><span class="cx"> #import <WebCore/VisitedLinkStore.h>
</span><span class="cx"> #import <wtf/PassRef.h>
</span><span class="cx">
</span><span class="lines">@@ -34,11 +35,20 @@
</span><span class="cx"> static PassRef<WebVisitedLinkStore> create();
</span><span class="cx"> virtual ~WebVisitedLinkStore();
</span><span class="cx">
</span><ins>+ static void setShouldTrackVisitedLinks(bool);
+ static void removeAllVisitedLinks();
+
</ins><span class="cx"> private:
</span><span class="cx"> WebVisitedLinkStore();
</span><span class="cx">
</span><span class="cx"> virtual bool isLinkVisited(WebCore::Page&, WebCore::LinkHash, const WebCore::URL& baseURL, const AtomicString& attributeURL) override;
</span><span class="cx"> virtual void addVisitedLink(WebCore::Page&, WebCore::LinkHash) override;
</span><ins>+
+ void populateVisitedLinksIfNeeded(WebCore::Page&);
+ void removeVisitedLinkHashes();
+
+ HashSet<WebCore::LinkHash, WebCore::LinkHashHash> m_visitedLinkHashes;
+ bool m_visitedLinksPopulated;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // WebVisitedLinkStore_h
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebVisitedLinkStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm (176574 => 176575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm 2014-11-29 21:12:55 UTC (rev 176574)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm 2014-11-29 21:49:40 UTC (rev 176575)
</span><span class="lines">@@ -25,26 +25,84 @@
</span><span class="cx">
</span><span class="cx"> #import "WebVisitedLinkStore.h"
</span><span class="cx">
</span><ins>+#import <WebCore/PageCache.h>
+#import <wtf/NeverDestroyed.h>
+
+using namespace WebCore;
+
+static bool s_shouldTrackVisitedLinks;
+
+static HashSet<WebVisitedLinkStore*>& visitedLinkStores()
+{
+ static NeverDestroyed<HashSet<WebVisitedLinkStore*>> visitedLinkStores;
+
+ return visitedLinkStores;
+}
+
+
</ins><span class="cx"> PassRef<WebVisitedLinkStore> WebVisitedLinkStore::create()
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebVisitedLinkStore);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebVisitedLinkStore::WebVisitedLinkStore()
</span><ins>+ : m_visitedLinksPopulated(false)
</ins><span class="cx"> {
</span><ins>+ visitedLinkStores().add(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebVisitedLinkStore::~WebVisitedLinkStore()
</span><span class="cx"> {
</span><ins>+ visitedLinkStores().remove(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebVisitedLinkStore::isLinkVisited(WebCore::Page&, WebCore::LinkHash, const WebCore::URL& baseURL, const AtomicString& attributeURL)
</del><ins>+void WebVisitedLinkStore::setShouldTrackVisitedLinks(bool shouldTrackVisitedLinks)
</ins><span class="cx"> {
</span><del>- // FIXME: Implement.
- return false;
</del><ins>+ if (s_shouldTrackVisitedLinks == shouldTrackVisitedLinks)
+ return;
+ s_shouldTrackVisitedLinks = shouldTrackVisitedLinks;
+ if (!s_shouldTrackVisitedLinks)
+ removeAllVisitedLinks();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebVisitedLinkStore::addVisitedLink(WebCore::Page&, WebCore::LinkHash)
</del><ins>+void WebVisitedLinkStore::removeAllVisitedLinks()
</ins><span class="cx"> {
</span><del>- // FIXME: Implement.
</del><ins>+ for (auto& visitedLinkStore : visitedLinkStores())
+ visitedLinkStore->removeVisitedLinkHashes();
+ pageCache()->markPagesForVistedLinkStyleRecalc();
</ins><span class="cx"> }
</span><ins>+
+bool WebVisitedLinkStore::isLinkVisited(Page& page, LinkHash linkHash, const URL& baseURL, const AtomicString& attributeURL)
+{
+ return m_visitedLinkHashes.contains(linkHash);
+}
+
+void WebVisitedLinkStore::addVisitedLink(Page& sourcePage, LinkHash linkHash)
+{
+ ASSERT(s_shouldTrackVisitedLinks);
+
+ m_visitedLinkHashes.add(linkHash);
+
+ invalidateStylesForLink(linkHash);
+ pageCache()->markPagesForVistedLinkStyleRecalc();
+}
+
+void WebVisitedLinkStore::populateVisitedLinksIfNeeded(Page&)
+{
+ if (m_visitedLinksPopulated)
+ return;
+
+ m_visitedLinksPopulated = true;
+
+ // FIXME: Populate visited links.
+}
+
+void WebVisitedLinkStore::removeVisitedLinkHashes()
+{
+ m_visitedLinksPopulated = false;
+ if (m_visitedLinkHashes.isEmpty())
+ return;
+ m_visitedLinkHashes.clear();
+
+ invalidateStylesForAllLinks();
+}
</ins></span></pre>
</div>
</div>
</body>
</html>