Changeset 112579 in webkit

Timestamp:

Mar 29, 2012 2:44:28 PM (12 years ago)

Author:

abarth@webkit.org

Message:

[Chromium] Move ResourceHandle to WebCore/platform/network/chromium
​https://bugs.webkit.org/show_bug.cgi?id=82657

Reviewed by James Robinson.

Source/WebCore:

We finally arive at our destination. This patch actually moves
WebCore::ResourceHandle from Source/WebKit/chromium/src to
Source/WebCore/network/chromium, matching its location in other ports.
To make this happen, we also need to move WrappedResourceRequest and
WrappedResourceResponse.

This patch is the last patch from
​https://github.com/abarth/webkit/compare/master...webcore-platform

• WebCore.gypi:
• platform/chromium/support/WrappedResourceRequest.h: Copied from Source/WebKit/chromium/src/WrappedResourceRequest.h.
• platform/chromium/support/WrappedResourceResponse.h: Copied from Source/WebKit/chromium/src/WrappedResourceResponse.h.
• platform/network/chromium/ResourceHandle.cpp: Copied from Source/WebKit/chromium/src/ResourceHandle.cpp.

(WebCore::ResourceHandleInternal::ResourceHandleInternal):
(WebCore::ResourceHandleInternal::start):
(WebCore::ResourceHandle::loadResourceSynchronously):
(WebCore::ResourceHandle::cacheMetadata):

• platform/network/chromium/ResourceHandleInternal.h: Copied from Source/WebKit/chromium/src/ResourceHandleInternal.h.

Source/WebKit/chromium:

• WebKit.gyp:
• src/ResourceHandle.cpp: Removed.
• src/ResourceHandleInternal.h: Removed.
• src/WrappedResourceRequest.h: Removed.
• src/WrappedResourceResponse.h: Removed.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (2 diffs)
• WebCore/platform/chromium/support/WrappedResourceRequest.h (moved) (moved from trunk/Source/WebKit/chromium/src/WrappedResourceRequest.h) (1 diff)
• WebCore/platform/chromium/support/WrappedResourceResponse.h (moved) (moved from trunk/Source/WebKit/chromium/src/WrappedResourceResponse.h) (1 diff)
• WebCore/platform/network/chromium/ResourceHandle.cpp (moved) (moved from trunk/Source/WebKit/chromium/src/ResourceHandle.cpp) (7 diffs)
• WebCore/platform/network/chromium/ResourceHandleInternal.h (moved) (moved from trunk/Source/WebKit/chromium/src/ResourceHandleInternal.h) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/WebKit.gyp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-29  Adam Barth  <abarth@webkit.org>
+
+        [Chromium] Move ResourceHandle to WebCore/platform/network/chromium
+        https://bugs.webkit.org/show_bug.cgi?id=82657
+
+        Reviewed by James Robinson.
+
+        We finally arive at our destination. This patch actually moves
+        WebCore::ResourceHandle from Source/WebKit/chromium/src to
+        Source/WebCore/network/chromium, matching its location in other ports.
+        To make this happen, we also need to move WrappedResourceRequest and
+        WrappedResourceResponse.
+
+        This patch is the last patch from
+        https://github.com/abarth/webkit/compare/master...webcore-platform
+
+        * WebCore.gypi:
+        * platform/chromium/support/WrappedResourceRequest.h: Copied from Source/WebKit/chromium/src/WrappedResourceRequest.h.
+        * platform/chromium/support/WrappedResourceResponse.h: Copied from Source/WebKit/chromium/src/WrappedResourceResponse.h.
+        * platform/network/chromium/ResourceHandle.cpp: Copied from Source/WebKit/chromium/src/ResourceHandle.cpp.
+        (WebCore::ResourceHandleInternal::ResourceHandleInternal):
+        (WebCore::ResourceHandleInternal::start):
+        (WebCore::ResourceHandle::loadResourceSynchronously):
+        (WebCore::ResourceHandle::cacheMetadata):
+        * platform/network/chromium/ResourceHandleInternal.h: Copied from Source/WebKit/chromium/src/ResourceHandleInternal.h.
+
 2012-03-29  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -3281 +3281 @@
             'platform/chromium/support/WebURLResponse.cpp',
             'platform/chromium/support/WebURLResponsePrivate.h',
+            'platform/chromium/support/WrappedResourceRequest.h',
+            'platform/chromium/support/WrappedResourceResponse.h',
             'platform/cocoa/KeyEventCocoa.h',
             'platform/cocoa/KeyEventCocoa.mm',
@@ -4267 +4269 @@
             'platform/network/chromium/DNSChromium.cpp',
             'platform/network/chromium/ResourceError.h',
+            'platform/network/chromium/ResourceHandle.cpp',
+            'platform/network/chromium/ResourceHandleInternal.h',
             'platform/network/chromium/ResourceRequest.cpp',
             'platform/network/chromium/ResourceRequest.h',

trunk/Source/WebCore/platform/chromium/support/WrappedResourceRequest.h

@@ -32 +32 @@
 #define WrappedResourceRequest_h
 
-#include "platform/WebURLRequest.h"
 #include "WebURLRequestPrivate.h"
+#include <public/WebURLRequest.h>
 
 namespace WebKit {

trunk/Source/WebCore/platform/chromium/support/WrappedResourceResponse.h

@@ -32 +32 @@
 #define WrappedResourceResponse_h
 
-#include "platform/WebURLResponse.h"
 #include "WebURLResponsePrivate.h"
+#include <public/WebURLResponse.h>
 
 namespace WebKit {

trunk/Source/WebCore/platform/network/chromium/ResourceHandle.cpp

@@ -37 +37 @@
 #include "ResourceRequest.h"
 #include "SharedBuffer.h"
-
-#include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
-#include "platform/WebURLError.h"
-#include "platform/WebURLLoader.h"
-#include "platform/WebURLLoaderClient.h"
-#include "platform/WebURLRequest.h"
-#include "platform/WebURLResponse.h"
 #include "WrappedResourceRequest.h"
 #include "WrappedResourceResponse.h"
+#include <public/Platform.h>
+#include <public/WebURLError.h>
+#include <public/WebURLLoader.h>
+#include <public/WebURLLoaderClient.h>
+#include <public/WebURLRequest.h>
+#include <public/WebURLResponse.h>
 
 using namespace WebKit;
@@ -58 +56 @@
     , m_client(client)
     , m_state(ConnectionStateNew)
-{ }
+{
+}
 
 void ResourceHandleInternal::start()
@@ -66 +65 @@
     m_state = ConnectionStateStarted;
 
-    m_loader = adoptPtr(webKitPlatformSupport()->createURLLoader());
+    m_loader = adoptPtr(Platform::current()->createURLLoader());
     ASSERT(m_loader);
 
@@ -246 +245 @@
 bool ResourceHandle::loadsBlocked()
 {
-    return false;  // This seems to be related to sync XMLHttpRequest...
+    return false; // This seems to be related to sync XMLHttpRequest...
 }
 
@@ -257 +256 @@
                                                Vector<char>& data)
 {
-    OwnPtr<WebURLLoader> loader = adoptPtr(webKitPlatformSupport()->createURLLoader());
+    OwnPtr<WebURLLoader> loader = adoptPtr(Platform::current()->createURLLoader());
     ASSERT(loader);
 
@@ -278 +277 @@
     // This method is used to determine if a POST request can be repeated from
     // cache, but you cannot really know until you actually try to read from the
-    // cache.  Even if we checked now, something else could come along and wipe
+    // cache. Even if we checked now, something else could come along and wipe
     // out the cache entry by the time we fetch it.
     //
     // So, we always say yes here, to prevent the FrameLoader from initiating a
-    // reload.  Then in FrameLoaderClientImpl::dispatchWillSendRequest, we
+    // reload. Then in FrameLoaderClientImpl::dispatchWillSendRequest, we
     // fix-up the cache policy of the request to force a load from the cache.
     //
@@ -292 +291 @@
 void ResourceHandle::cacheMetadata(const ResourceResponse& response, const Vector<char>& data)
 {
+    // FIXME: This should use Platform::current() directly.
     PlatformSupport::cacheMetadata(response.url(), response.responseTime(), data);
 }

trunk/Source/WebCore/platform/network/chromium/ResourceHandleInternal.h

@@ -33 +33 @@
 
 #include "ResourceRequest.h"
-#include "platform/WebCommon.h"
-#include "platform/WebURLLoader.h"
-#include "platform/WebURLLoaderClient.h"
+#include <public/WebCommon.h>
+#include <public/WebURLLoader.h>
+#include <public/WebURLLoaderClient.h>
 
 namespace WebCore {

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-03-29  Adam Barth  <abarth@webkit.org>
+
+        [Chromium] Move ResourceHandle to WebCore/platform/network/chromium
+        https://bugs.webkit.org/show_bug.cgi?id=82657
+
+        Reviewed by James Robinson.
+
+        * WebKit.gyp:
+        * src/ResourceHandle.cpp: Removed.
+        * src/ResourceHandleInternal.h: Removed.
+        * src/WrappedResourceRequest.h: Removed.
+        * src/WrappedResourceResponse.h: Removed.
+
 2012-03-29  Dmitry Lomov  <dslomov@google.com>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -471 +471 @@
                 'src/PlatformMessagePortChannel.h',
                 'src/PlatformSupport.cpp',
-                'src/ResourceHandle.cpp',
                 'src/ScrollbarGroup.cpp',
                 'src/ScrollbarGroup.h',
@@ -694 +693 @@
                 'src/WorkerFileWriterCallbacksBridge.cpp',
                 'src/WorkerFileWriterCallbacksBridge.h',
-                'src/WrappedResourceRequest.h',
-                'src/WrappedResourceResponse.h',
                 'src/win/WebInputEventFactory.cpp',
                 'src/win/WebScreenInfoFactory.cpp',