Changeset 176575 in webkit

Timestamp:

Nov 29, 2014, 1:49:40 PM (12 years ago)

Author:

andersca@apple.com

Message:

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.

Location:

trunk/Source/WebKit/mac

Files:

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

trunk/Source/WebKit/mac/ChangeLog

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

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

@@ -34 +34 @@
 #import "WebNSURLExtras.h"
 #import "WebTypesInternal.h"
+#import "WebVisitedLinkStore.h"
 #import <WebCore/HistoryItem.h>
 #import <WebCore/NSCalendarDateSPI.h>
@@ -728 +729 @@
     [_sharedHistory release];
     _sharedHistory = [history retain];
+
     PageGroup::setShouldTrackVisitedLinks(history);
     PageGroup::removeAllVisitedLinks();
+    WebVisitedLinkStore::setShouldTrackVisitedLinks(history);
+    WebVisitedLinkStore::removeAllVisitedLinks();
 }
 

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

@@ -27 +27 @@
 #define WebVisitedLinkStore_h
 
+#import <WebCore/LinkHash.h>
 #import <WebCore/VisitedLinkStore.h>
 #import <wtf/PassRef.h>
@@ -35 +36 @@
     virtual ~WebVisitedLinkStore();
 
+    static void setShouldTrackVisitedLinks(bool);
+    static void removeAllVisitedLinks();
+
 private:
     WebVisitedLinkStore();
@@ -40 +44 @@
     virtual bool isLinkVisited(WebCore::Page&, WebCore::LinkHash, const WebCore::URL& baseURL, const AtomicString& attributeURL) override;
     virtual void addVisitedLink(WebCore::Page&, WebCore::LinkHash) override;
+
+    void populateVisitedLinksIfNeeded(WebCore::Page&);
+    void removeVisitedLinkHashes();
+
+    HashSet<WebCore::LinkHash, WebCore::LinkHashHash> m_visitedLinkHashes;
+    bool m_visitedLinksPopulated;
 };
 

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

@@ -26 +26 @@
 #import "WebVisitedLinkStore.h"
 
+#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;
+}
+
+
 PassRef<WebVisitedLinkStore> WebVisitedLinkStore::create()
 {
@@ -32 +47 @@
 
 WebVisitedLinkStore::WebVisitedLinkStore()
+    : m_visitedLinksPopulated(false)
 {
+    visitedLinkStores().add(this);
 }
 
 WebVisitedLinkStore::~WebVisitedLinkStore()
 {
+    visitedLinkStores().remove(this);
 }
 
-bool WebVisitedLinkStore::isLinkVisited(WebCore::Page&, WebCore::LinkHash, const WebCore::URL& baseURL, const AtomicString& attributeURL)
+void WebVisitedLinkStore::setShouldTrackVisitedLinks(bool shouldTrackVisitedLinks)
 {
-    // FIXME: Implement.
-    return false;
+    if (s_shouldTrackVisitedLinks == shouldTrackVisitedLinks)
+        return;
+    s_shouldTrackVisitedLinks = shouldTrackVisitedLinks;
+    if (!s_shouldTrackVisitedLinks)
+        removeAllVisitedLinks();
 }
 
-void WebVisitedLinkStore::addVisitedLink(WebCore::Page&, WebCore::LinkHash)
+void WebVisitedLinkStore::removeAllVisitedLinks()
 {
-    // FIXME: Implement.
+    for (auto& visitedLinkStore : visitedLinkStores())
+        visitedLinkStore->removeVisitedLinkHashes();
+    pageCache()->markPagesForVistedLinkStyleRecalc();
 }
+
+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();
+}