<!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>[176576] 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/176576">176576</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-11-29 14:11:08 -0800 (Sat, 29 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Populate visited links
https://bugs.webkit.org/show_bug.cgi?id=139101
Reviewed by Sam Weinig.
* History/WebHistory.mm:
(-[WebHistoryPrivate addVisitedLinksToVisitedLinkStore:]):
Helper function that adds all visited link to the given store.
(-[WebHistory _addVisitedLinksToVisitedLinkStore:]):
Call the private method.
* History/WebHistoryInternal.h:
* WebCoreSupport/WebVisitedLinkStore.h:
Add new members.
* WebCoreSupport/WebVisitedLinkStore.mm:
(WebVisitedLinkStore::addVisitedLink):
Get the characters from the URL string and hash them, then call addVisitedLinkHash.
(WebVisitedLinkStore::populateVisitedLinksIfNeeded):
Implement this. First try the delegate, then try the shared history.
(WebVisitedLinkStore::addVisitedLinkHash):
Factor code that adds the link to the hash table into a separate function.
* WebView/WebView.mm:
(-[WebView addVisitedLinks:]):
Add the visited links to the store.</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="#trunkSourceWebKitmacHistoryWebHistoryInternalh">trunk/Source/WebKit/mac/History/WebHistoryInternal.h</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>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.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 (176575 => 176576)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-29 21:49:40 UTC (rev 176575)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-29 22:11:08 UTC (rev 176576)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2014-11-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Populate visited links
+ https://bugs.webkit.org/show_bug.cgi?id=139101
+
+ Reviewed by Sam Weinig.
+
+ * History/WebHistory.mm:
+ (-[WebHistoryPrivate addVisitedLinksToVisitedLinkStore:]):
+ Helper function that adds all visited link to the given store.
+
+ (-[WebHistory _addVisitedLinksToVisitedLinkStore:]):
+ Call the private method.
+
+ * History/WebHistoryInternal.h:
+ * WebCoreSupport/WebVisitedLinkStore.h:
+ Add new members.
+
+ * WebCoreSupport/WebVisitedLinkStore.mm:
+ (WebVisitedLinkStore::addVisitedLink):
+ Get the characters from the URL string and hash them, then call addVisitedLinkHash.
+
+ (WebVisitedLinkStore::populateVisitedLinksIfNeeded):
+ Implement this. First try the delegate, then try the shared history.
+
+ (WebVisitedLinkStore::addVisitedLinkHash):
+ Factor code that adds the link to the hash table into a separate function.
+
+ * WebView/WebView.mm:
+ (-[WebView addVisitedLinks:]):
+ Add the visited links to the store.
+
+2014-11-29 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> More work on the legacy WebKit visited link store
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139100
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistorymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistory.mm (176575 => 176576)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistory.mm 2014-11-29 21:49:40 UTC (rev 176575)
+++ trunk/Source/WebKit/mac/History/WebHistory.mm 2014-11-29 22:11:08 UTC (rev 176576)
</span><span class="lines">@@ -711,6 +711,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)addVisitedLinksToVisitedLinkStore:(WebVisitedLinkStore&)visitedLinkStore
+{
+ for (NSString *urlString in _entriesByURL)
+ visitedLinkStore.addVisitedLink(urlString);
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebHistory
</span><span class="lines">@@ -945,6 +951,10 @@
</span><span class="cx"> [_historyPrivate addVisitedLinksToPageGroup:group];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_addVisitedLinksToVisitedLinkStore:(WebVisitedLinkStore &)visitedLinkStore
+{
+ [_historyPrivate addVisitedLinksToVisitedLinkStore:visitedLinkStore];
+}
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> WebHistoryWriter::WebHistoryWriter(DateToEntriesMap* entriesByDate)
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryInternal.h (176575 => 176576)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryInternal.h 2014-11-29 21:49:40 UTC (rev 176575)
+++ trunk/Source/WebKit/mac/History/WebHistoryInternal.h 2014-11-29 22:11:08 UTC (rev 176576)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #import "WebHistoryPrivate.h"
</span><span class="cx">
</span><ins>+class WebVisitedLinkStore;
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> class PageGroup;
</span><span class="cx"> }
</span><span class="lines">@@ -35,4 +37,5 @@
</span><span class="cx"> @interface WebHistory (WebInternal)
</span><span class="cx"> - (void)_visitedURL:(NSURL *)URL withTitle:(NSString *)title method:(NSString *)method wasFailure:(BOOL)wasFailure;
</span><span class="cx"> - (void)_addVisitedLinksToPageGroup:(WebCore::PageGroup&)group;
</span><ins>+- (void)_addVisitedLinksToVisitedLinkStore:(WebVisitedLinkStore&)visitedLinkStore;
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebVisitedLinkStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.h (176575 => 176576)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.h 2014-11-29 21:49:40 UTC (rev 176575)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.h 2014-11-29 22:11:08 UTC (rev 176576)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx"> static void setShouldTrackVisitedLinks(bool);
</span><span class="cx"> static void removeAllVisitedLinks();
</span><span class="cx">
</span><ins>+ void addVisitedLink(NSString *urlString);
+
</ins><span class="cx"> private:
</span><span class="cx"> WebVisitedLinkStore();
</span><span class="cx">
</span><span class="lines">@@ -45,6 +47,7 @@
</span><span class="cx"> virtual void addVisitedLink(WebCore::Page&, WebCore::LinkHash) override;
</span><span class="cx">
</span><span class="cx"> void populateVisitedLinksIfNeeded(WebCore::Page&);
</span><ins>+ void addVisitedLinkHash(WebCore::LinkHash);
</ins><span class="cx"> void removeVisitedLinkHashes();
</span><span class="cx">
</span><span class="cx"> HashSet<WebCore::LinkHash, WebCore::LinkHashHash> m_visitedLinkHashes;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebVisitedLinkStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm (176575 => 176576)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm 2014-11-29 21:49:40 UTC (rev 176575)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm 2014-11-29 22:11:08 UTC (rev 176576)
</span><span class="lines">@@ -25,6 +25,11 @@
</span><span class="cx">
</span><span class="cx"> #import "WebVisitedLinkStore.h"
</span><span class="cx">
</span><ins>+#import "WebDelegateImplementationCaching.h"
+#import "WebFrameInternal.h"
+#import "WebHistoryInternal.h"
+#import "WebViewInternal.h"
+#import <WebCore/BlockExceptions.h>
</ins><span class="cx"> #import <WebCore/PageCache.h>
</span><span class="cx"> #import <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -72,6 +77,24 @@
</span><span class="cx"> pageCache()->markPagesForVistedLinkStyleRecalc();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebVisitedLinkStore::addVisitedLink(NSString *urlString)
+{
+ if (!s_shouldTrackVisitedLinks)
+ return;
+
+ size_t length = urlString.length;
+
+ if (const UChar* characters = CFStringGetCharactersPtr((__bridge CFStringRef)urlString)) {
+ addVisitedLinkHash(visitedLinkHash(characters, length));
+ return;
+ }
+
+ Vector<UChar, 512> buffer(length);
+ [urlString getCharacters:buffer.data()];
+
+ addVisitedLinkHash(visitedLinkHash(buffer.data(), length));
+}
+
</ins><span class="cx"> bool WebVisitedLinkStore::isLinkVisited(Page& page, LinkHash linkHash, const URL& baseURL, const AtomicString& attributeURL)
</span><span class="cx"> {
</span><span class="cx"> return m_visitedLinkHashes.contains(linkHash);
</span><span class="lines">@@ -79,24 +102,46 @@
</span><span class="cx">
</span><span class="cx"> void WebVisitedLinkStore::addVisitedLink(Page& sourcePage, LinkHash linkHash)
</span><span class="cx"> {
</span><del>- ASSERT(s_shouldTrackVisitedLinks);
</del><ins>+ if (!s_shouldTrackVisitedLinks)
+ return;
</ins><span class="cx">
</span><del>- m_visitedLinkHashes.add(linkHash);
-
- invalidateStylesForLink(linkHash);
- pageCache()->markPagesForVistedLinkStyleRecalc();
</del><ins>+ addVisitedLinkHash(linkHash);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebVisitedLinkStore::populateVisitedLinksIfNeeded(Page&)
</del><ins>+void WebVisitedLinkStore::populateVisitedLinksIfNeeded(Page& page)
</ins><span class="cx"> {
</span><span class="cx"> if (m_visitedLinksPopulated)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_visitedLinksPopulated = true;
</span><span class="cx">
</span><del>- // FIXME: Populate visited links.
</del><ins>+ WebView *webView = kit(&page);
+ ASSERT(webView);
+
+ if (webView.historyDelegate) {
+ WebHistoryDelegateImplementationCache* implementations = WebViewGetHistoryDelegateImplementations(webView);
+
+ if (implementations->populateVisitedLinksFunc)
+ CallHistoryDelegate(implementations->populateVisitedLinksFunc, webView, @selector(populateVisitedLinksForWebView:));
+
+ return;
+ }
+
+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
+ [[WebHistory optionalSharedHistory] _addVisitedLinksToVisitedLinkStore:*this];
+ END_BLOCK_OBJC_EXCEPTIONS;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebVisitedLinkStore::addVisitedLinkHash(LinkHash linkHash)
+{
+ ASSERT(s_shouldTrackVisitedLinks);
+
+ m_visitedLinkHashes.add(linkHash);
+
+ invalidateStylesForLink(linkHash);
+ pageCache()->markPagesForVistedLinkStyleRecalc();
+}
+
</ins><span class="cx"> void WebVisitedLinkStore::removeVisitedLinkHashes()
</span><span class="cx"> {
</span><span class="cx"> m_visitedLinksPopulated = false;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (176575 => 176576)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-29 21:49:40 UTC (rev 176575)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-29 22:11:08 UTC (rev 176576)
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx"> #import "WebUIDelegatePrivate.h"
</span><span class="cx"> #import "WebUserMediaClient.h"
</span><span class="cx"> #import "WebViewGroup.h"
</span><ins>+#import "WebVisitedLinkStore.h"
</ins><span class="cx"> #import <CoreFoundation/CFSet.h>
</span><span class="cx"> #import <Foundation/NSURLConnection.h>
</span><span class="cx"> #import <JavaScriptCore/APICast.h>
</span><span class="lines">@@ -6993,8 +6994,12 @@
</span><span class="cx">
</span><span class="cx"> - (void)addVisitedLinks:(NSArray *)visitedLinks
</span><span class="cx"> {
</span><ins>+ WebVisitedLinkStore& visitedLinkStore = _private->group->visitedLinkStore();
+ for (NSString *urlString in visitedLinks)
+ visitedLinkStore.addVisitedLink(urlString);
+
</ins><span class="cx"> PageGroup& group = core(self)->group();
</span><del>-
</del><ins>+
</ins><span class="cx"> NSEnumerator *enumerator = [visitedLinks objectEnumerator];
</span><span class="cx"> while (NSString *url = [enumerator nextObject]) {
</span><span class="cx"> size_t length = [url length];
</span></span></pre>
</div>
</div>
</body>
</html>