Redo r144538 (after r144530).

* WebCoreSupport/WebFrameNetworkingContext.cpp:
* WebCoreSupport/WebFrameNetworkingContext.h:
* WebCoreSupport/WebPlatformStrategies.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144540 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index 67dfc63..8bbf106 100644 (file)
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,5 +1,13 @@
 2013-03-02  Ryosuke Niwa  <rniwa@webkit.org>
 
+        Redo r144538 (after r144530).
+
+        * WebCoreSupport/WebFrameNetworkingContext.cpp:
+        * WebCoreSupport/WebFrameNetworkingContext.h:
+        * WebCoreSupport/WebPlatformStrategies.cpp:
+
+2013-03-02  Ryosuke Niwa  <rniwa@webkit.org>
+
         Yet another build fix attempt after r144530.
 
         * WebCoreSupport/WebFrameNetworkingContext.cpp:

diff --git a/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp b/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp
index 87fb558..cb860f8 100644 (file)
--- a/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp
+++ b/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp
@@ -24,7 +24,6 @@
 #include "FrameLoaderClient.h"
 #if USE(CFNETWORK)
 #include <CFNetwork/CFHTTPCookiesPriv.h>
-#include <WebCore/ResourceHandle.h>
 #endif
 #include <WebCore/Settings.h>
 #if USE(CFNETWORK)

diff --git a/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h b/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h
index 488feb3..8466cc6 100644 (file)
--- a/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h
+++ b/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h
@@ -24,6 +24,10 @@
 #include <WebCore/FrameNetworkingContext.h>
 #include <WebCore/ResourceError.h>
 
+#if USE(CFNETWORK)
+#include <WebCore/ResourceHandle.h>
+#endif
+
 class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
 public:
     static PassRefPtr<WebFrameNetworkingContext> create(WebCore::Frame*, const WTF::String& userAgent);

diff --git a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp
index a3b0b31..01bb8b0 100644 (file)
--- a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp
+++ b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp
@@ -33,7 +33,6 @@
 #include <WebCore/PlatformCookieJar.h>
 #include <WebCore/PluginDatabase.h>
 #if USE(CFNETWORK)
-#include <WebCore/ResourceHandle.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #endif