[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 fcc10568b9c0a9d1274531720ca548ada47ff183
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 20:53:04 2010 +0000

    2010-09-23  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Adam Roben.
    
            Add synchronous loading for local files to ResourceHandleWin
            https://bugs.webkit.org/show_bug.cgi?id=46392
    
            * platform/network/win/ResourceHandleWin.cpp:
            (WebCore::ResourceHandle::start):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68192 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 150e6fd..3866165 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Adam Roben.
 
+        Add synchronous loading for local files to ResourceHandleWin
+        https://bugs.webkit.org/show_bug.cgi?id=46392
+
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::ResourceHandle::start):
+
+2010-09-23  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Adam Roben.
+
         Remove (has|set)ReceivedResponse() from public ResourceHandleWin API
         https://bugs.webkit.org/show_bug.cgi?id=46391
 
diff --git a/WebCore/platform/network/win/ResourceHandleWin.cpp b/WebCore/platform/network/win/ResourceHandleWin.cpp
index fc74471..1608813 100644
--- a/WebCore/platform/network/win/ResourceHandleWin.cpp
+++ b/WebCore/platform/network/win/ResourceHandleWin.cpp
@@ -459,7 +459,10 @@ bool ResourceHandle::start(NetworkingContext* context)
 {
     if (request().url().isLocalFile()) {
         ref(); // balanced by deref in fileLoadTimer
-        d->m_fileLoadTimer.startOneShot(0.0);
+        if (d->m_loadSynchronously)
+            fileLoadTimer(0);
+        else
+            d->m_fileLoadTimer.startOneShot(0.0);
         return true;
     }
 

-- 
WebKit Debian packaging