[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d778ab0ba29c6e73ee48fa0c7b9991dfc9c4de73
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 00:39:01 2010 +0000

    2010-08-24  Patrick Gansterer  <paroga at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65957 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6dac665..f097f8e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-24  Patrick Gansterer  <paroga at 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 at webkit.org>
 
         Unreviewed.
diff --git a/WebCore/platform/network/win/ResourceHandleWin.cpp b/WebCore/platform/network/win/ResourceHandleWin.cpp
index a81abd7..425fe80 100644
--- a/WebCore/platform/network/win/ResourceHandleWin.cpp
+++ b/WebCore/platform/network/win/ResourceHandleWin.cpp
@@ -137,6 +137,49 @@ static void initializeOffScreenResourceHandleWindow()
         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()
 {
     if (m_fileHandle != INVALID_HANDLE_VALUE)
@@ -486,6 +529,16 @@ void ResourceHandle::cancel()
         client()->didFail(this, ResourceError());
 }
 
+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)
 {
     d->m_hasReceivedResponse = b;

-- 
WebKit Debian packaging