[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aestes at apple.com
aestes at apple.com
Wed Dec 22 14:53:27 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6eef71c5163e5bd824b5339ec9c369b59c21edab
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 23 00:59:24 2010 +0000
Fix the Windows build.
* WebCookieManagerCFNet.cpp: Rename CookieStorageWin.h to CookieStorageCFNet.h.
* WebView.cpp: Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70377 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 5262369..e927d15 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-22 Andy Estes <aestes at apple.com>
+
+ Fix the Windows build.
+
+ * WebCookieManagerCFNet.cpp: Rename CookieStorageWin.h to CookieStorageCFNet.h.
+ * WebView.cpp: Ditto.
+
2010-10-22 Jenn Braithwaite <jennb at chromium.org>
Reviewed by Adam Roben.
diff --git a/WebKit/win/WebCookieManagerCFNet.cpp b/WebKit/win/WebCookieManagerCFNet.cpp
index 415a679..c2ef493 100644
--- a/WebKit/win/WebCookieManagerCFNet.cpp
+++ b/WebKit/win/WebCookieManagerCFNet.cpp
@@ -28,7 +28,7 @@
#include "WebCookieManager.h"
#include <CFNetwork/CFHTTPCookiesPriv.h>
-#include <WebCore/CookieStorageWin.h>
+#include <WebCore/CookieStorageCFNet.h>
using namespace WebCore;
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index b57e06a..a6c3cb4 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -73,7 +73,7 @@
#include <WebCore/Chrome.h>
#include <WebCore/ContextMenu.h>
#include <WebCore/ContextMenuController.h>
-#include <WebCore/CookieStorageWin.h>
+#include <WebCore/CookieStorageCFNet.h>
#include <WebCore/Cursor.h>
#include <WebCore/Document.h>
#include <WebCore/DragController.h>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list