[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[barraclough at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 141b1cd47f59b7f6ae898cde23ba5ee089bef3e3
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 02:13:20 2010 +0000

    Build fix (update more includes)
    
    WebKit/mac:
    
    * Plugins/Hosted/NetscapePluginHostManager.h:
    
    WebKit/win:
    
    * WebKitDLL.h:
    * WebLocalizableStrings.cpp:
    * WebNotificationCenter.cpp:
    * WebPreferences.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65111 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 1f4a767..f4ef5c3 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-10  Gavin Barraclough  <barraclough at apple.com>
+
+        Build fix (update more includes)
+
+        * Plugins/Hosted/NetscapePluginHostManager.h:
+
 2010-08-10  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h b/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h
index b88f1a4..2645c55 100644
--- a/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h
+++ b/WebKit/mac/Plugins/Hosted/NetscapePluginHostManager.h
@@ -29,9 +29,9 @@
 #define NetscapePluginHostManager_h
 
 #import <WebCore/PlatformString.h>
-#import <WebCore/StringHash.h>
 #import <wtf/HashMap.h>
 #import <wtf/PassRefPtr.h>
+#import <wtf/text/StringHash.h>
 
 @class WebHostedNetscapePluginView;
 
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 9ceed26..9e8872d 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-10  Gavin Barraclough  <barraclough at apple.com>
+
+        Build fix (update more includes)
+
+        * WebKitDLL.h:
+        * WebLocalizableStrings.cpp:
+        * WebNotificationCenter.cpp:
+        * WebPreferences.cpp:
+
 2010-08-10  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebKit/win/WebKitDLL.h b/WebKit/win/WebKitDLL.h
index c31bc2d..8ba5b8e 100644
--- a/WebKit/win/WebKitDLL.h
+++ b/WebKit/win/WebKitDLL.h
@@ -33,8 +33,8 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <wtf/HashCountedSet.h>
+#include <wtf/text/StringHash.h>
 #include <WebCore/PlatformString.h>
-#include <WebCore/StringHash.h>
 
 #ifdef WEBKIT_EXPORTS
 #define WEBKIT_API __declspec(dllexport)
diff --git a/WebKit/win/WebLocalizableStrings.cpp b/WebKit/win/WebLocalizableStrings.cpp
index ab2db5d..da6b221 100644
--- a/WebKit/win/WebLocalizableStrings.cpp
+++ b/WebKit/win/WebLocalizableStrings.cpp
@@ -30,8 +30,8 @@
 
 #pragma warning(push, 0)
 #include <WebCore/PlatformString.h>
-#include <WebCore/StringHash.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
 #pragma warning(pop)
 
 #include <wtf/Assertions.h>
diff --git a/WebKit/win/WebNotificationCenter.cpp b/WebKit/win/WebNotificationCenter.cpp
index 919f499..6c22224 100644
--- a/WebKit/win/WebNotificationCenter.cpp
+++ b/WebKit/win/WebNotificationCenter.cpp
@@ -31,10 +31,10 @@
 #pragma warning(push, 0)
 #include <WebCore/COMPtr.h>
 #include <WebCore/PlatformString.h>
-#include <WebCore/StringHash.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashTraits.h>
 #include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
 #pragma warning(pop)
 #include <tchar.h>
 #include <utility>
diff --git a/WebKit/win/WebPreferences.cpp b/WebKit/win/WebPreferences.cpp
index 25cfbda..255b68e 100644
--- a/WebKit/win/WebPreferences.cpp
+++ b/WebKit/win/WebPreferences.cpp
@@ -32,10 +32,10 @@
 #include "WebNotificationCenter.h"
 #include "WebPreferenceKeysPrivate.h"
 
+#include <wtf/text/StringHash.h>
 #include <WebCore/FileSystem.h>
 #include <WebCore/Font.h>
 #include <WebCore/PlatformString.h>
-#include <WebCore/StringHash.h>
 #include <WebCore/WKCACFLayerRenderer.h>
 #include "WebLocalizableStrings.h"
 

-- 
WebKit Debian packaging