[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrowe at apple.com
mrowe at apple.com
Wed Dec 22 11:55:07 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1d42db00d4090096e25b3d039cb8914fcb7b8db9
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 11 09:20:05 2010 +0000
Build fix. Update references to StringHash.h.
* Shared/CommandLine.h:
* UIProcess/WebContext.h:
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
* WebProcess/win/WebProcessMainWin.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65142 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4ba3363..e9b1dcf 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-11 Mark Rowe <mrowe at apple.com>
+
+ Build fix. Update references to StringHash.h.
+
+ * Shared/CommandLine.h:
+ * UIProcess/WebContext.h:
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/win/WebProcessMainWin.cpp:
+
2010-08-10 Darin Adler <darin at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/Shared/CommandLine.h b/WebKit2/Shared/CommandLine.h
index 217112e..cdb03c5 100644
--- a/WebKit2/Shared/CommandLine.h
+++ b/WebKit2/Shared/CommandLine.h
@@ -27,8 +27,8 @@
#define CommandLine_h
#include <WebCore/PlatformString.h>
-#include <WebCore/StringHash.h>
#include <wtf/HashMap.h>
+#include <wtf/text/StringHash.h>
namespace WebKit {
diff --git a/WebKit2/UIProcess/WebContext.h b/WebKit2/UIProcess/WebContext.h
index 7400800..429dd1c 100644
--- a/WebKit2/UIProcess/WebContext.h
+++ b/WebKit2/UIProcess/WebContext.h
@@ -35,11 +35,11 @@
#include "WebProcessProxy.h"
#include <WebCore/LinkHash.h>
#include <WebCore/PlatformString.h>
-#include <WebCore/StringHash.h>
#include <wtf/Forward.h>
#include <wtf/HashSet.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
+#include <wtf/text/StringHash.h>
struct WKContextStatistics;
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
index 3f25721..eece77d 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
@@ -30,7 +30,7 @@
#include "Plugin.h"
#include <WebCore/GraphicsLayer.h>
#include <WebCore/IntRect.h>
-#include <WebCore/StringHash.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
class HTTPHeaderMap;
diff --git a/WebKit2/WebProcess/win/WebProcessMainWin.cpp b/WebKit2/WebProcess/win/WebProcessMainWin.cpp
index 2bad204..09dcfc2 100644
--- a/WebKit2/WebProcess/win/WebProcessMainWin.cpp
+++ b/WebKit2/WebProcess/win/WebProcessMainWin.cpp
@@ -28,10 +28,10 @@
#include "CommandLine.h"
#include "RunLoop.h"
#include "WebProcess.h"
-#include <runtime/InitializeThreading.h>
#include <WebCore/PlatformString.h>
-#include <WebCore/StringHash.h>
+#include <runtime/InitializeThreading.h>
#include <wtf/Threading.h>
+#include <wtf/text/StringHash.h>
using namespace WebCore;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list