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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5fa5b49d637f8c8dea1b1cc355fa60b496f5c49f
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 21:18:47 2010 +0000

    2010-09-23  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Adam Roben.
    
            Set synchronous handle in ResourceHandleWin
            https://bugs.webkit.org/show_bug.cgi?id=46395
    
            When loading synchronous network resources, we need to use a synchronous internet handle.
    
            * platform/network/ResourceHandle.h:
            * platform/network/win/ResourceHandleWin.cpp:
            (WebCore::ResourceHandle::loadResourceSynchronously):
            (WebCore::ResourceHandle::setSynchronousInternetHandle):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68196 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1604ab1..c6392c4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-23  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Set synchronous handle in ResourceHandleWin
+        https://bugs.webkit.org/show_bug.cgi?id=46395
+
+        When loading synchronous network resources, we need to use a synchronous internet handle.
+
+        * platform/network/ResourceHandle.h:
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::ResourceHandle::loadResourceSynchronously):
+        (WebCore::ResourceHandle::setSynchronousInternetHandle):
+
 2010-09-23  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/network/ResourceHandle.h b/WebCore/platform/network/ResourceHandle.h
index d6c7ceb..ebb1ddb 100644
--- a/WebCore/platform/network/ResourceHandle.h
+++ b/WebCore/platform/network/ResourceHandle.h
@@ -168,6 +168,7 @@ public:
     static void forceContentSniffing();
 
 #if USE(WININET)
+    void setSynchronousInternetHandle(HINTERNET);
     void fileLoadTimer(Timer<ResourceHandle>*);
     void onHandleCreated(LPARAM);
     void onRedirect();
diff --git a/WebCore/platform/network/win/ResourceHandleWin.cpp b/WebCore/platform/network/win/ResourceHandleWin.cpp
index 1608813..b908672 100644
--- a/WebCore/platform/network/win/ResourceHandleWin.cpp
+++ b/WebCore/platform/network/win/ResourceHandleWin.cpp
@@ -601,9 +601,16 @@ void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const
     WebCoreSynchronousLoader syncLoader(error, response, data, request.httpUserAgent());
     ResourceHandle handle(request, &syncLoader, true, false);
 
+    handle.setSynchronousInternetHandle(syncLoader.internetHandle());
     handle.start(context);
 }
 
+void ResourceHandle::setSynchronousInternetHandle(HINTERNET internetHandle)
+{
+    d->m_internetHandle = internetHandle;
+    d->m_loadSynchronously = true;
+}
+
 bool ResourceHandle::willLoadFromCache(ResourceRequest&, Frame*)
 {
     notImplemented();

-- 
WebKit Debian packaging