Changeset 39060 in webkit

Timestamp:

Dec 5, 2008 6:27:15 PM (15 years ago)

Author:

brettw@chromium.org

Message:

Reviewed by Darin Adler.

Make the page group use the proper link hashing functions rather than
calling the string hash functions directly. Add Chromium-specfic ifdefs
in the visited link computation functions to allow integration.

• page/PageGroup.cpp:

(WebCore::PageGroup::isLinkVisited):
(WebCore::PageGroup::addVisitedLink):

• platform/LinkHash.cpp:

(WebCore::visitedLinkHash):

• platform/LinkHash.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/PageGroup.cpp (modified) (5 diffs)
• platform/LinkHash.cpp (modified) (5 diffs)
• platform/LinkHash.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-12-04  Brett Wilson  <brettw@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Make the page group use the proper link hashing functions rather than
+        calling the string hash functions directly. Add Chromium-specfic ifdefs
+        in the visited link computation functions to allow integration.
+
+        * page/PageGroup.cpp:
+        (WebCore::PageGroup::isLinkVisited):
+        (WebCore::PageGroup::addVisitedLink):
+        * platform/LinkHash.cpp:
+        (WebCore::visitedLinkHash):
+        * platform/LinkHash.h:
+
 2008-12-05  Chris Marrin  <cmarrin@apple.com>
 

trunk/WebCore/page/PageGroup.cpp

@@ -35 +35 @@
 #include "LocalStorage.h"
 #include "StorageArea.h"
+#endif
+
+#if PLATFORM(CHROMIUM)
+#include "ChromiumBridge.h"
 #endif
 
@@ -120 +124 @@
 bool PageGroup::isLinkVisited(LinkHash visitedLinkHash)
 {
+#if PLATFORM(CHROMIUM)
+    // Use Chromium's built-in visited link database.
+    return ChromiumBridge::isLinkVisited(visitedLinkHash);
+#else
     if (!m_visitedLinksPopulated) {
         m_visitedLinksPopulated = true;
@@ -126 +134 @@
     }
     return m_visitedLinkHashes.contains(visitedLinkHash);
+#endif
 }
 
-inline void PageGroup::addVisitedLink(LinkHash stringHash)
+inline void PageGroup::addVisitedLink(LinkHash hash)
 {
     ASSERT(shouldTrackVisitedLinks);
-    LinkHash visitedLinkHash = LinkHashHash::avoidDeletedValue(stringHash);
-    if (!m_visitedLinkHashes.add(visitedLinkHash).second)
+#if !PLATFORM(CHROMIUM)
+    if (!m_visitedLinkHashes.add(hash).second)
         return;
-    Page::visitedStateChanged(this, visitedLinkHash);
+#endif
+    Page::visitedStateChanged(this, hash);
 }
 
@@ -142 +152 @@
         return;
     ASSERT(!url.isEmpty());
-    addVisitedLink(url.string().impl()->hash());
+    addVisitedLink(visitedLinkHash(url.string().characters(), url.string().length()));
 }
 
@@ -149 +159 @@
     if (!shouldTrackVisitedLinks)
         return;
-    addVisitedLink(StringImpl::computeHash(characters, length));
+    addVisitedLink(visitedLinkHash(characters, length));
 }
 

trunk/WebCore/platform/LinkHash.cpp

@@ -28 +28 @@
 #include "PlatformString.h"
 #include "StringHash.h"
+#include "StringImpl.h"
 
 namespace WebCore {
@@ -147 +148 @@
 }
 
+LinkHash visitedLinkHash(const UChar* url, unsigned length)
+{
+  return AlreadyHashed::avoidDeletedValue(StringImpl::computeHash(url, length));
+}
+
 LinkHash visitedLinkHash(const KURL& base, const AtomicString& attributeURL)
 {
@@ -168 +174 @@
 
     if (hasColonSlashSlash && !needsTrailingSlash(characters, length))
-        return AlreadyHashed::avoidDeletedValue(attributeURL.string().impl()->hash());
+        return visitedLinkHash(attributeURL.characters(), attributeURL.length());
 
     Vector<UChar, 512> buffer;
@@ -177 +183 @@
         buffer.append(characters, length);
         buffer.append('/');
-        return AlreadyHashed::avoidDeletedValue(StringImpl::computeHash(buffer.data(), buffer.size()));
+        return visitedLinkHash(buffer.data(), buffer.size());
     }
 
@@ -199 +205 @@
     }
 
-    return AlreadyHashed::avoidDeletedValue(StringImpl::computeHash(buffer.data(), buffer.size()));
+    return visitedLinkHash(buffer.data(), buffer.size());
 }
 

trunk/WebCore/platform/LinkHash.h

@@ -54 +54 @@
 };
 
+// Returns the has of the string that will be used for visited link coloring.
+LinkHash visitedLinkHash(const UChar* url, unsigned length);
+
 // Resolves the potentially relative URL "attributeURL" relative to the given
 // base URL, and returns the hash of the string that will be used for visited