[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 20042ea6ff6c7004cf69c53adad69009fd2b5e35
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 00:47:18 2011 +0000

    2011-01-24  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Eric Seidel.
    
            [GTK] Many DOM XHTML tests time out
            https://bugs.webkit.org/show_bug.cgi?id=52553
    
            * platform/gtk/Skipped: Unskip tests which are no longer timing out.
    2011-01-24  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Eric Seidel.
    
            [GTK] Many DOM XHTML tests time out
            https://bugs.webkit.org/show_bug.cgi?id=52553
    
            Properly handle the situation where a synchronous load fails before the inner
            event loop has started. In this case, we simply do not run the inner event loop,
            or else it will block indefinitely (since no GIO or libsoup callbacks will fire).
    
            * platform/network/soup/ResourceHandleSoup.cpp:
            (WebCore::ResourceHandle::loadResourceSynchronously): Bail out of a synchronous
            load if it fails up front.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76555 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5cb52be..5cae277 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-24  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Many DOM XHTML tests time out
+        https://bugs.webkit.org/show_bug.cgi?id=52553
+
+        * platform/gtk/Skipped: Unskip tests which are no longer timing out.
+
 2011-01-24  Ryosuke Niwa  <rniwa at webkit.org>
 
         Unreviewed Chromium test expectation update for r76548.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index b38cada..75a7826 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -30,23 +30,7 @@
 
 # The group of tests below are timing out. As we go through them
 # and get more detailed information, we should attach bugs to them.
-dom/xhtml/level3/core/entitygetinputencoding03.xhtml
-dom/xhtml/level3/core/entitygetinputencoding04.xhtml
-dom/xhtml/level3/core/entitygetxmlencoding02.xhtml
-dom/xhtml/level3/core/entitygetxmlencoding03.xhtml
-dom/xhtml/level3/core/entitygetxmlencoding04.xhtml
-dom/xhtml/level3/core/entitygetxmlversion03.xhtml
-dom/xhtml/level3/core/entitygetxmlversion04.xhtml
-dom/xhtml/level3/core/nodegetbaseuri16.xhtml
-dom/xhtml/level3/core/nodegetbaseuri19.xhtml
-dom/xhtml/level3/core/nodegetbaseuri20.xhtml
-http/tests/xmlhttprequest/XMLHttpRequestException.html
-http/tests/xmlhttprequest/connection-error-sync.html
 fast/xmlhttprequest/null-document-xmlhttprequest-open.html
-http/tests/misc/favicon-as-image.html
-media/unsupported-rtsp.html
-security/autocomplete-cleared-on-back.html
-http/tests/security/frameNavigation/cross-origin-opener.html
 
 # Intermittently timing out on Gtk Debug Bot:
 # https://bugs.webkit.org/show_bug.cgi?id=33445
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 77a69a8..2a1704c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-24  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Many DOM XHTML tests time out
+        https://bugs.webkit.org/show_bug.cgi?id=52553
+
+        Properly handle the situation where a synchronous load fails before the inner
+        event loop has started. In this case, we simply do not run the inner event loop,
+        or else it will block indefinitely (since no GIO or libsoup callbacks will fire).
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::ResourceHandle::loadResourceSynchronously): Bail out of a synchronous
+        load if it fails up front.
+
 2011-01-24  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Darin Adler.
diff --git a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index 4ee9ef6..47a7c58 100644
--- a/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -801,6 +801,10 @@ void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const
     RefPtr<ResourceHandle> handle = adoptRef(new ResourceHandle(request, &syncLoader, false /*defersLoading*/, false /*shouldContentSniff*/));
     handle->start(context);
 
+    // If the request has already failed, do not run the main loop, or else we'll block indefinitely.
+    if (handle->d->m_scheduledFailureType != NoFailure)
+        return;
+
     syncLoader.run();
 }
 

-- 
WebKit Debian packaging