Title: [151426] trunk/Source/WebCore
Revision
151426
Author
commit-qu...@webkit.org
Date
2013-06-11 00:57:49 -0700 (Tue, 11 Jun 2013)

Log Message

[BlackBerry] Test editing/execCommand/indent-paragraphs.html times out
https://bugs.webkit.org/show_bug.cgi?id=117235

Patch by Carlos Garcia Campos <cgar...@igalia.com> on 2013-06-11
Reviewed by Rob Buis.

PR 346414.

After r150224 ResourceHandle::start() can fail returning false so
that the ResourceHandle is destroyed and the error not
handled. Handle the errors by scheduling a InvalidURLFailure and
returning true when startJob fails to make sure the ResourceHandle
is not destroyed and the error is handled and notified to the
client.

Fixes timeout in editing/execCommand/indent-paragraphs.html.

* platform/network/blackberry/ResourceHandleBlackBerry.cpp:
(WebCore::ResourceHandle::start):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (151425 => 151426)


--- trunk/Source/WebCore/ChangeLog	2013-06-11 07:34:42 UTC (rev 151425)
+++ trunk/Source/WebCore/ChangeLog	2013-06-11 07:57:49 UTC (rev 151426)
@@ -1,3 +1,24 @@
+2013-06-11  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [BlackBerry] Test editing/execCommand/indent-paragraphs.html times out
+        https://bugs.webkit.org/show_bug.cgi?id=117235
+
+        Reviewed by Rob Buis.
+
+        PR 346414.
+
+        After r150224 ResourceHandle::start() can fail returning false so
+        that the ResourceHandle is destroyed and the error not
+        handled. Handle the errors by scheduling a InvalidURLFailure and
+        returning true when startJob fails to make sure the ResourceHandle
+        is not destroyed and the error is handled and notified to the
+        client.
+
+        Fixes timeout in editing/execCommand/indent-paragraphs.html.
+
+        * platform/network/blackberry/ResourceHandleBlackBerry.cpp:
+        (WebCore::ResourceHandle::start):
+
 2013-06-11  Ryosuke Niwa  <rn...@webkit.org>
 
         Remove IntRect::pixelSnapped* and its enclosingRect since they are no longer used

Modified: trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp (151425 => 151426)


--- trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp	2013-06-11 07:34:42 UTC (rev 151425)
+++ trunk/Source/WebCore/platform/network/blackberry/ResourceHandleBlackBerry.cpp	2013-06-11 07:57:49 UTC (rev 151426)
@@ -117,7 +117,9 @@
     if (!frame || !frame->loader() || !frame->loader()->client() || !client())
         return false;
     int playerId = static_cast<FrameLoaderClientBlackBerry*>(frame->loader()->client())->playerId();
-    return NetworkManager::instance()->startJob(playerId, this, frame, d->m_defersLoading) == BlackBerry::Platform::FilterStream::StatusSuccess;
+    if (NetworkManager::instance()->startJob(playerId, this, frame, d->m_defersLoading) != BlackBerry::Platform::FilterStream::StatusSuccess)
+        scheduleFailure(InvalidURLFailure);
+    return true;
 }
 
 void ResourceHandle::pauseLoad(bool pause)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to