Attachment 343141 Details for Bug 182352 – Patch

[patch] Patch

bug-182352-20180620013604.patch (text/plain), 4.20 KB, created by Fujii Hironori on 2018-06-20 01:36:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-06-20 01:36:35 PDT

Size: 4.20 KB

patch

obsolete

>Subversion Revision: 233001
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 74119bb35a3e3a958c84e7635300330e49d65bbf..83b27fc712c1e56078c060f7f129769d44b23c02 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,30 @@
>+2018-06-20  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [GTK] http/tests/misc/bubble-drag-events.html crashes
>+        https://bugs.webkit.org/show_bug.cgi?id=182352
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        PingLoad::didFinish was called twice if it is used with
>+        NetworkDataTaskSoup. PingLoad is not a ref-counted object. It is
>+        destructed when PingLoad::didFinish is called.
>+
>+        PingLoad::didReceiveChallenge calls the ChallengeCompletionHandler
>+        with AuthenticationChallengeDisposition::Cancel to cancel the
>+        challenge and calls PingLoad::didFinish.
>+
>+        NetworkDataTaskSoup::continueAuthenticate calls
>+        didReceiveChallenge with a ChallengeCompletionHandler which calls
>+        didCompleteWithError. PingLoad::didCompleteWithError calls
>+        PingLoad::didFinish.
>+
>+        didCompleteWithError callback should not be called in
>+        ChallengeCompletionHandler.
>+
>+        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
>+        (WebKit::NetworkDataTaskSoup::continueAuthenticate): Deferred the calling didFail.
>+        (WebKit::NetworkDataTaskSoup::didFail): Return early if m_client is null.
>+
> 2018-06-19  Dean Jackson  <dino@apple.com>
> 
>         Blank viewer comes up and then auto-dismisses when device is not connected to Internet
>diff --git a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
>index 348181ca8914e472bad9c16bd95e898634673d31..5a0b026a656c45c8959e243d0603f3e8db0a8f89 100644
>--- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
>+++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
>@@ -529,7 +529,9 @@ void NetworkDataTaskSoup::continueAuthenticate(AuthenticationChallenge&& challen
> 
>         if (disposition == AuthenticationChallengeDisposition::Cancel) {
>             cancel();
>-            didFail(cancelledError(m_soupRequest.get()));
>+            RunLoop::main().dispatch([this, protectedThis = makeRef(*this)] {
>+                didFail(cancelledError(m_soupRequest.get()));
>+            });
>             return;
>         }
> 
>@@ -1042,7 +1044,8 @@ void NetworkDataTaskSoup::didFail(const ResourceError& error)
>     }
> 
>     clearRequest();
>-    ASSERT(m_client);
>+    if (!m_client)
>+        return;
>     dispatchDidCompleteWithError(error);
> }
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 5e064113bb7bf6b97da9162e70f1d8fa789f61e5..eff2d6262fccee5496f4a0bb4dd270c1e9a13a95 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-06-20  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [GTK] http/tests/misc/bubble-drag-events.html crashes
>+        https://bugs.webkit.org/show_bug.cgi?id=182352
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/gtk/TestExpectations:
>+        Marked http/tests/misc/bubble-drag-events.html as [ Failure ] not
>+        [ Failure Timeout Crash ].
>+
> 2018-06-19  Per Arne Vollan  <pvollan@apple.com>
> 
>         Layout Test imported/mozilla/css-animations/test_animation-playstate.html is failing.
>diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
>index 65ef419f2418c115d1bf805cfd7b183853a7d95d..79b933dd09839c6428d7b8f8f38f251a2d08e730 100644
>--- a/LayoutTests/platform/gtk/TestExpectations
>+++ b/LayoutTests/platform/gtk/TestExpectations
>@@ -2656,7 +2656,7 @@ Bug(GTK) canvas/philip/tests/2d.text.measure.width.space.html [ Failure ]
> Bug(GTK) http/tests/local/drag-over-remote-content.html [ Failure ]
> Bug(GTK) http/tests/security/drag-over-remote-content-iframe.html [ Failure ]
> Bug(GTK) fast/events/drag-in-frames.html [ Failure Timeout ]
>-webkit.org/b/182352 http/tests/misc/bubble-drag-events.html [ Failure Timeout Crash ]
>+webkit.org/b/182352 http/tests/misc/bubble-drag-events.html [ Failure ]
> 
> # Dragging images and links results in a DataTransfer object containing a non-empty files array
> webkit.org/b/52094 editing/pasteboard/files-during-page-drags.html [ Failure ]

Actions: View | Formatted Diff | Diff

Attachments on bug 182352: 343132 | 343135 | 343141 | 343144 | 343206 | 344406 | 344408 | 344411 | 344414 | 344416 | 344419 | 344568 | 344929 | 345033