Changeset 176576 in webkit

Timestamp:

Nov 29, 2014, 2:11:08 PM (12 years ago)

Author:

andersca@apple.com

Message:

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.

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• History/WebHistory.mm (modified) (2 diffs)
• History/WebHistoryInternal.h (modified) (2 diffs)
• WebCoreSupport/WebVisitedLinkStore.h (modified) (2 diffs)
• WebCoreSupport/WebVisitedLinkStore.mm (modified) (4 diffs)
• WebView/WebView.mm (modified) (2 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-11-29  Anders Carlsson  <andersca@apple.com>
+
+        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>
 

trunk/Source/WebKit/mac/History/WebHistory.mm

@@ -712 +712 @@
 }
 
+- (void)addVisitedLinksToVisitedLinkStore:(WebVisitedLinkStore&)visitedLinkStore
+{
+    for (NSString *urlString in _entriesByURL)
+        visitedLinkStore.addVisitedLink(urlString);
+}
+
 @end
 
@@ -946 +952 @@
 }
 
+- (void)_addVisitedLinksToVisitedLinkStore:(WebVisitedLinkStore &)visitedLinkStore
+{
+    [_historyPrivate addVisitedLinksToVisitedLinkStore:visitedLinkStore];
+}
 @end
 

trunk/Source/WebKit/mac/History/WebHistoryInternal.h

@@ -29 +29 @@
 #import "WebHistoryPrivate.h"
 
+class WebVisitedLinkStore;
+
 namespace WebCore {
     class PageGroup;
@@ -36 +38 @@
 - (void)_visitedURL:(NSURL *)URL withTitle:(NSString *)title method:(NSString *)method wasFailure:(BOOL)wasFailure;
 - (void)_addVisitedLinksToPageGroup:(WebCore::PageGroup&)group;
+- (void)_addVisitedLinksToVisitedLinkStore:(WebVisitedLinkStore&)visitedLinkStore;
 @end

trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.h

@@ -39 +39 @@
     static void removeAllVisitedLinks();
 
+    void addVisitedLink(NSString *urlString);
+
 private:
     WebVisitedLinkStore();
@@ -46 +48 @@
 
     void populateVisitedLinksIfNeeded(WebCore::Page&);
+    void addVisitedLinkHash(WebCore::LinkHash);
     void removeVisitedLinkHashes();
 

trunk/Source/WebKit/mac/WebCoreSupport/WebVisitedLinkStore.mm

@@ -26 +26 @@
 #import "WebVisitedLinkStore.h"
 
+#import "WebDelegateImplementationCaching.h"
+#import "WebFrameInternal.h"
+#import "WebHistoryInternal.h"
+#import "WebViewInternal.h"
+#import <WebCore/BlockExceptions.h>
 #import <WebCore/PageCache.h>
 #import <wtf/NeverDestroyed.h>
@@ -73 +78 @@
 }
 
+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));
+}
+
 bool WebVisitedLinkStore::isLinkVisited(Page& page, LinkHash linkHash, const URL& baseURL, const AtomicString& attributeURL)
 {
@@ -80 +103 @@
 void WebVisitedLinkStore::addVisitedLink(Page& sourcePage, LinkHash linkHash)
 {
+    if (!s_shouldTrackVisitedLinks)
+        return;
+
+    addVisitedLinkHash(linkHash);
+}
+
+void WebVisitedLinkStore::populateVisitedLinksIfNeeded(Page& page)
+{
+    if (m_visitedLinksPopulated)
+        return;
+
+    m_visitedLinksPopulated = true;
+
+    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;
+}
+
+void WebVisitedLinkStore::addVisitedLinkHash(LinkHash linkHash)
+{
     ASSERT(s_shouldTrackVisitedLinks);
 
@@ -86 +141 @@
     invalidateStylesForLink(linkHash);
     pageCache()->markPagesForVistedLinkStyleRecalc();
-}
-
-void WebVisitedLinkStore::populateVisitedLinksIfNeeded(Page&)
-{
-    if (m_visitedLinksPopulated)
-        return;
-
-    m_visitedLinksPopulated = true;
-
-    // FIXME: Populate visited links.
 }
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -107 +107 @@
 #import "WebUserMediaClient.h"
 #import "WebViewGroup.h"
+#import "WebVisitedLinkStore.h"
 #import <CoreFoundation/CFSet.h>
 #import <Foundation/NSURLConnection.h>
@@ -6994 +6995 @@
 - (void)addVisitedLinks:(NSArray *)visitedLinks
 {
+    WebVisitedLinkStore& visitedLinkStore = _private->group->visitedLinkStore();
+    for (NSString *urlString in visitedLinks)
+        visitedLinkStore.addVisitedLink(urlString);
+
     PageGroup& group = core(self)->group();
-    
+
     NSEnumerator *enumerator = [visitedLinks objectEnumerator];
     while (NSString *url = [enumerator nextObject]) {