Changeset 176582 in webkit

Timestamp:

Nov 29, 2014, 3:40:30 PM (12 years ago)

Author:

andersca@apple.com

Message:

Switch over to using WebVisitedLinkStore on Windows
​https://bugs.webkit.org/show_bug.cgi?id=139103

Reviewed by Antti Koivisto.

• WebCoreSupport/WebChromeClient.cpp:

(WebChromeClient::populateVisitedLinks):

• WebHistory.cpp:

(WebHistory::setOptionalSharedHistory):
(WebHistory::removeAllItems):
(WebHistory::setVisitedLinkTrackingEnabled):
(WebHistory::removeAllVisitedLinks):
(WebHistory::removeItemForURLString):
(WebHistory::addVisitedLinksToVisitedLinkStore):
(WebHistory::addVisitedLinksToPageGroup): Deleted.

• WebHistory.h:
• WebView.cpp:

(WebView::initWithFrame):

Location:

trunk/Source/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)
• WebHistory.cpp (modified) (6 diffs)
• WebHistory.h (modified) (1 diff)
• WebView.cpp (modified) (1 diff)

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2014-11-29  Anders Carlsson  <andersca@apple.com>
+
+        Switch over to using WebVisitedLinkStore on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=139103
+
+        Reviewed by Antti Koivisto.
+
+        * WebCoreSupport/WebChromeClient.cpp:
+        (WebChromeClient::populateVisitedLinks):
+        * WebHistory.cpp:
+        (WebHistory::setOptionalSharedHistory):
+        (WebHistory::removeAllItems):
+        (WebHistory::setVisitedLinkTrackingEnabled):
+        (WebHistory::removeAllVisitedLinks):
+        (WebHistory::removeItemForURLString):
+        (WebHistory::addVisitedLinksToVisitedLinkStore):
+        (WebHistory::addVisitedLinksToPageGroup): Deleted.
+        * WebHistory.h:
+        * WebView.cpp:
+        (WebView::initWithFrame):
+
 2014-11-29  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp

@@ -638 +638 @@
 void WebChromeClient::populateVisitedLinks()
 {
-    COMPtr<IWebHistoryDelegate> historyDelegate;
-    m_webView->historyDelegate(&historyDelegate);
-    if (historyDelegate) {
-        historyDelegate->populateVisitedLinksForWebView(m_webView);
-        return;
-    }
-
-    WebHistory* history = WebHistory::sharedHistory();
-    if (!history)
-        return;
-    history->addVisitedLinksToPageGroup(m_webView->page()->group());
 }
 

trunk/Source/WebKit/win/WebHistory.cpp

@@ -264 +264 @@
         return S_OK;
     sharedHistoryStorage().query(history);
-    PageGroup::setShouldTrackVisitedLinks(sharedHistoryStorage());
-    PageGroup::removeAllVisitedLinks();
+    WebVisitedLinkStore::setShouldTrackVisitedLinks(sharedHistoryStorage());
+    WebVisitedLinkStore::removeAllVisitedLinks();
     return S_OK;
 }
@@ -325 +325 @@
     m_entriesByURL.clear();
 
-    PageGroup::removeAllVisitedLinks();
+    WebVisitedLinkStore::removeAllVisitedLinks();
 
     return postNotification(kWebHistoryAllItemsRemovedNotification, userInfo.get());
@@ -375 +375 @@
 HRESULT WebHistory::setVisitedLinkTrackingEnabled(BOOL visitedLinkTrackingEnabled)
 {
-    PageGroup::setShouldTrackVisitedLinks(visitedLinkTrackingEnabled);
+    WebVisitedLinkStore::setShouldTrackVisitedLinks(visitedLinkTrackingEnabled);
     return S_OK;
 }
@@ -381 +381 @@
 HRESULT WebHistory::removeAllVisitedLinks()
 {
-    PageGroup::removeAllVisitedLinks();
+    WebVisitedLinkStore::removeAllVisitedLinks();
     return S_OK;
 }
@@ -568 +568 @@
 
     if (!m_entriesByURL.size())
-        PageGroup::removeAllVisitedLinks();
+        WebVisitedLinkStore::removeAllVisitedLinks();
 
     return S_OK;
@@ -585 +585 @@
         visitedLinkStore.addVisitedLink(url);
 }
-
-void WebHistory::addVisitedLinksToPageGroup(PageGroup& group)
-{
-    for (auto& url : m_entriesByURL.keys())
-        group.addVisitedLinkHash(visitedLinkHash(url));
-}

trunk/Source/WebKit/win/WebHistory.h

@@ -113 +113 @@
     static WebHistory* sharedHistory();
     void visitedURL(const WebCore::URL&, const WTF::String& title, const WTF::String& httpMethod, bool wasFailure, bool increaseVisitCount);
-    void addVisitedLinksToPageGroup(WebCore::PageGroup&);
     void addVisitedLinksToVisitedLinkStore(WebVisitedLinkStore&);
 

trunk/Source/WebKit/win/WebView.cpp

@@ -2804 +2804 @@
     configuration.loaderClientForMainFrame = new WebFrameLoaderClient;
     configuration.progressTrackerClient = static_cast<WebFrameLoaderClient*>(configuration.loaderClientForMainFrame);
+    configuration.visitedLinkStore = &WebVisitedLinkStore::shared();
 
     m_page = new Page(configuration);