[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mrobinson at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 5770d9c236658a066115595b60aa2c738f6617bb
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 01:31:28 2011 +0000

    2011-01-25  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] Two tests crash after r76555
            https://bugs.webkit.org/show_bug.cgi?id=53057
    
            * platform/gtk/Skipped: Unskip tests which are no longer crashing.
    2011-01-25  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] Two tests crash after r76555
            https://bugs.webkit.org/show_bug.cgi?id=53057
    
            Instead of creating synchronous ResourceHandles manually, use the ::create factory.
            This ensures that ::start() is not called when there is a scheduled failure and also
            reduces code duplication.
    
            * platform/network/soup/ResourceHandleSoup.cpp:
            (WebCore::ResourceHandle::loadResourceSynchronously): Use the ::create factory method.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77343 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fbca721..edf1e3d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-25  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Two tests crash after r76555
+        https://bugs.webkit.org/show_bug.cgi?id=53057
+
+        * platform/gtk/Skipped: Unskip tests which are no longer crashing.
+
 2011-02-01  chris reiss  <christopher.reiss at nokia.com>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 7f154d0..309162c 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5086,12 +5086,6 @@ http/tests/security/local-user-CSS-from-remote.html
 # See https://bugs.webkit.org/show_bug.cgi?id=53056
 media/unsupported-rtsp.html
 
-# These two crash after r76555.
-# https://bugs.webkit.org/show_bug.cgi?id=53057
-http/tests/xmlhttprequest/simple-cross-origin-denied-events-sync.html
-http/tests/xmlhttprequest/simple-cross-origin-denied-events.html
-http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-sync.html
-
 # This media test fails; possibly because the AAC codec is not installed on the test bots:
 # https://bugs.webkit.org/show_bug.cgi?id=53125
 media/audio-mpeg4-supported.html
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 19268e3..5015aa7 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-25  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Two tests crash after r76555
+        https://bugs.webkit.org/show_bug.cgi?id=53057
+
+        Instead of creating synchronous ResourceHandles manually, use the ::create factory.
+        This ensures that ::start() is not called when there is a scheduled failure and also
+        reduces code duplication.
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::ResourceHandle::loadResourceSynchronously): Use the ::create factory method.
+
 2011-02-01  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Eric Seidel.
diff --git a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index 843cf07..ee18382 100644
--- a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -789,11 +789,9 @@ bool ResourceHandle::willLoadFromCache(ResourceRequest&, Frame*)
 void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const ResourceRequest& request, StoredCredentials /*storedCredentials*/, ResourceError& error, ResourceResponse& response, Vector<char>& data)
 {
     WebCoreSynchronousLoader syncLoader(error, response, data);
-    // FIXME: we should use the ResourceHandle::create method here,
-    // but it makes us timeout in a couple of tests. See
-    // https://bugs.webkit.org/show_bug.cgi?id=41823
-    RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(request, &syncLoader, false /*defersLoading*/, false /*shouldContentSniff*/));
-    handle->start(context);
+    RefPtr<ResourceHandle> handle = create(context, request, &syncLoader, false /*defersLoading*/, false /*shouldContentSniff*/);
+    if (!handle)
+        return;
 
     // If the request has already failed, do not run the main loop, or else we'll block indefinitely.
     if (handle->d->m_scheduledFailureType != NoFailure)

-- 
WebKit Debian packaging