Attachment 265081 Details for Bug 150577 – Patch

[patch] Patch

bug-150577-20151109123544.patch (text/plain), 3.79 KB, created by Alex Christensen on 2015-11-09 12:35:32 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2015-11-09 12:35:32 PST

Size: 3.79 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 192172)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2015-11-09  Alex Christensen  <achristensen@webkit.org>
>+
>+        XHR timeouts should not fire if there is an immediate network error.
>+        https://bugs.webkit.org/show_bug.cgi?id=150577
>+
>+        Reviewed by Darin Adler.
>+
>+        This fixes flakiness of http/tests/contentextensions/async-xhr-onerror.html since r191077.
>+
>+        * xml/XMLHttpRequest.cpp:
>+        (WebCore::XMLHttpRequest::createRequest):
>+        (WebCore::XMLHttpRequest::internalAbort):
>+        (WebCore::XMLHttpRequest::didFinishLoading):
>+        If the timeout timer has been started and we are going to immediately report a network error, then stop the timeout timer.
>+        The timeout timer sometimes fired before the network error timer if it was a very short timeout (such as 1ms).
>+        Also checks to isActive before calling stop on a timer are not necessary.
>+
> 2015-11-09  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         Null dereference loading Blink layout test editing/inserting/insert-html-crash-01.html
>Index: Source/WebCore/xml/XMLHttpRequest.cpp
>===================================================================
>--- Source/WebCore/xml/XMLHttpRequest.cpp	(revision 192169)
>+++ Source/WebCore/xml/XMLHttpRequest.cpp	(working copy)
>@@ -781,8 +781,10 @@ void XMLHttpRequest::createRequest(Excep
>         // a request is in progress because we need to keep the listeners alive,
>         // and they are referenced by the JavaScript wrapper.
>         setPendingActivity(this);
>-        if (!m_loader)
>+        if (!m_loader) {
>+            m_timeoutTimer.stop();
>             m_networkErrorTimer.startOneShot(0);
>+        }
>     } else {
>         InspectorInstrumentation::willLoadXHRSynchronously(scriptExecutionContext());
>         ThreadableLoader::loadResourceSynchronously(scriptExecutionContext(), request, *this, options);
>@@ -829,8 +831,7 @@ bool XMLHttpRequest::internalAbort()
> 
>     m_decoder = nullptr;
> 
>-    if (m_timeoutTimer.isActive())
>-        m_timeoutTimer.stop();
>+    m_timeoutTimer.stop();
> 
>     if (!m_loader)
>         return true;
>@@ -1121,8 +1122,7 @@ void XMLHttpRequest::didFinishLoading(un
>     m_responseEncoding = String();
>     m_decoder = nullptr;
> 
>-    if (m_timeoutTimer.isActive())
>-        m_timeoutTimer.stop();
>+    m_timeoutTimer.stop();
> 
>     if (hadLoader)
>         dropProtection();
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 192172)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2015-11-09  Alex Christensen  <achristensen@webkit.org>
>+
>+        XHR timeouts should not fire if there is an immediate network error.
>+        https://bugs.webkit.org/show_bug.cgi?id=150577
>+
>+        Reviewed by Darin Adler.
>+
>+        * platform/mac-wk2/TestExpectations:
>+        http/tests/contentextensions/async-xhr-onerror.html shouldn't be flaky any more.
>+
> 2015-11-09  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         Null dereference loading Blink layout test editing/inserting/insert-html-crash-01.html
>Index: LayoutTests/platform/mac-wk2/TestExpectations
>===================================================================
>--- LayoutTests/platform/mac-wk2/TestExpectations	(revision 192169)
>+++ LayoutTests/platform/mac-wk2/TestExpectations	(working copy)
>@@ -283,8 +283,6 @@ webkit.org/b/150378 http/tests/xmlhttpre
> 
> webkit.org/b/150736 http/tests/notifications/legacy/events.html [ Pass Crash ]
> 
>-webkit.org/b/150577 http/tests/contentextensions/async-xhr-onerror.html [ Pass Failure ]
>-
> webkit.org/b/150942 animations/multiple-backgrounds.html [ Pass ImageOnlyFailure ]
> 
> ### END OF (1) Classified failures with bug reports

Actions: View | Formatted Diff | Diff

Attachments on bug 150577: 264954 | 265081