Changeset 65957 in webkit

Timestamp:

Aug 24, 2010 5:39:01 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-24 Patrick Gansterer <​paroga@paroga.com>

Reviewed by Adam Roben.

Add SynchronousLoader for ResourceHandleWin
​https://bugs.webkit.org/show_bug.cgi?id=44452

• platform/network/win/ResourceHandleWin.cpp: (WebCore::WebCoreSynchronousLoader::WebCoreSynchronousLoader): (WebCore::WebCoreSynchronousLoader::didReceiveResponse): (WebCore::WebCoreSynchronousLoader::didReceiveData): (WebCore::WebCoreSynchronousLoader::didFinishLoading): (WebCore::WebCoreSynchronousLoader::didFail): (WebCore::ResourceHandle::loadResourceSynchronously):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/win/ResourceHandleWin.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-24  Patrick Gansterer  <paroga@paroga.com>
+
+        Reviewed by Adam Roben.
+
+        Add SynchronousLoader for ResourceHandleWin
+        https://bugs.webkit.org/show_bug.cgi?id=44452
+
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::WebCoreSynchronousLoader::WebCoreSynchronousLoader):
+        (WebCore::WebCoreSynchronousLoader::didReceiveResponse):
+        (WebCore::WebCoreSynchronousLoader::didReceiveData):
+        (WebCore::WebCoreSynchronousLoader::didFinishLoading):
+        (WebCore::WebCoreSynchronousLoader::didFail):
+        (WebCore::ResourceHandle::loadResourceSynchronously):
+
 2010-08-24  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/WebCore/platform/network/win/ResourceHandleWin.cpp

@@ -137 +137 @@
         HWND_MESSAGE, 0, WebCore::instanceHandle(), 0);
 }
+
+
+class WebCoreSynchronousLoader : public ResourceHandleClient, public Noncopyable {
+public:
+    WebCoreSynchronousLoader(ResourceError&, ResourceResponse&, Vector<char>&, const String& userAgent);
+
+    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
+    virtual void didReceiveData(ResourceHandle*, const char*, int, int lengthReceived);
+    virtual void didFinishLoading(ResourceHandle*);
+    virtual void didFail(ResourceHandle*, const ResourceError&);
+
+private:
+    ResourceError& m_error;
+    ResourceResponse& m_response;
+    Vector<char>& m_data;
+};
+
+WebCoreSynchronousLoader::WebCoreSynchronousLoader(ResourceError& error, ResourceResponse& response, Vector<char>& data, const String& userAgent)
+    : m_error(error)
+    , m_response(response)
+    , m_data(data)
+{
+}
+
+void WebCoreSynchronousLoader::didReceiveResponse(ResourceHandle*, const ResourceResponse& response)
+{
+    m_response = response;
+}
+
+void WebCoreSynchronousLoader::didReceiveData(ResourceHandle*, const char* data, int length, int)
+{
+    m_data.append(data, length);
+}
+
+void WebCoreSynchronousLoader::didFinishLoading(ResourceHandle*)
+{
+}
+
+void WebCoreSynchronousLoader::didFail(ResourceHandle*, const ResourceError& error)
+{
+    m_error = error;
+}
+
 
 ResourceHandleInternal::~ResourceHandleInternal()
@@ -487 +530 @@
 }
 
+void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, StoredCredentials storedCredentials, ResourceError& error, ResourceResponse& response, Vector<char>& data, Frame* frame)
+{
+    UNUSED_PARAM(storedCredentials);
+
+    WebCoreSynchronousLoader syncLoader(error, response, data, request.httpUserAgent());
+    ResourceHandle handle(request, &syncLoader, true, false);
+
+    handle.start(frame);
+}
+
 void ResourceHandle::setHasReceivedResponse(bool b)
 {