From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 2 Jun 2011 12:07:03 +0100
Subject: Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
---
 Source/WebCore/platform/KURLHash.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'Source/WebCore/platform/KURLHash.h')

diff --git a/Source/WebCore/platform/KURLHash.h b/Source/WebCore/platform/KURLHash.h
index 44a4624..a236508 100644
--- a/Source/WebCore/platform/KURLHash.h
+++ b/Source/WebCore/platform/KURLHash.h
@@ -50,11 +50,7 @@ namespace WebCore {
 
 namespace WTF {
 
-    template<> struct HashTraits<WebCore::KURL> : GenericHashTraits<WebCore::KURL> {
-        static const bool emptyValueIsZero = true;
-        static void constructDeletedValue(WebCore::KURL& slot) { new (&slot) WebCore::KURL(WebCore::ParsedURLString, WTF::String(HashTableDeletedValue)); }
-        static bool isDeletedValue(const WebCore::KURL& slot) { return slot.string().isHashTableDeletedValue(); }
-    };
+    template<> struct HashTraits<WebCore::KURL> : SimpleClassHashTraits<WebCore::KURL> { };
 
 } // namespace WTF
 
-- 
cgit v1.1