Attachment 339316 Details for Bug 185073 – Patch

[patch] Patch

bug-185073-20180502104313.patch (text/plain), 2.39 KB, created by Chris Dumez on 2018-05-02 10:43:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-05-02 10:43:13 PDT

Size: 2.39 KB

patch

obsolete

>Subversion Revision: 231206
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2377b858aba971aa56b076807eaca35e9458bede..c11a9dcc767ec2a6418d33d3ac0cb755ea47e9ab 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-02  Chris Dumez  <cdumez@apple.com>
>+
>+        REGRESSION(iOS 11.3): Crashes in TimerBase::~TimerBase() in Tencent x5gamehelper
>+        https://bugs.webkit.org/show_bug.cgi?id=185073
>+        <rdar://problem/39821223>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make sure WebSocket's read / write handlers are scheduled on the WebThread
>+        on iOS WebKitLegacy. This is similar to what is already done in
>+        MainThreadSharedTimer::setFireInterval() in MainThreadSharedTimerCF.cpp.
>+
>+        * platform/network/cf/SocketStreamHandleImplCFNet.cpp:
>+        (WebCore::SocketStreamHandleImpl::scheduleStreams):
>+
> 2018-05-02  Chris Dumez  <cdumez@apple.com>
> 
>         document.open() event listener removal is not immediate
>diff --git a/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp b/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp
>index f1861517f83885d8b434c327b7b450816e9ab1af..f7380e5c1d7da4c99c63bb1bdb25599cd42dbd2e 100644
>--- a/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp
>+++ b/Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp
>@@ -53,6 +53,10 @@
> #include <WebKitSystemInterface/WebKitSystemInterface.h>
> #endif
> 
>+#if PLATFORM(IOS)
>+#include "WebCoreThreadInternal.h"
>+#endif
>+
> #if PLATFORM(IOS) || PLATFORM(MAC)
> extern "C" const CFStringRef kCFStreamPropertySourceApplication;
> extern "C" const CFStringRef _kCFStreamSocketSetNoDelay;
>@@ -122,6 +126,9 @@ void SocketStreamHandleImpl::scheduleStreams()
> #if PLATFORM(WIN)
>     CFReadStreamScheduleWithRunLoop(m_readStream.get(), loaderRunLoop(), kCFRunLoopDefaultMode);
>     CFWriteStreamScheduleWithRunLoop(m_writeStream.get(), loaderRunLoop(), kCFRunLoopDefaultMode);
>+#elif PLATFORM(IOS)
>+    CFReadStreamScheduleWithRunLoop(m_readStream.get(), WebThreadRunLoop(), kCFRunLoopCommonModes);
>+    CFWriteStreamScheduleWithRunLoop(m_writeStream.get(), WebThreadRunLoop(), kCFRunLoopCommonModes);
> #else
>     CFReadStreamScheduleWithRunLoop(m_readStream.get(), CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
>     CFWriteStreamScheduleWithRunLoop(m_writeStream.get(), CFRunLoopGetCurrent(), kCFRunLoopCommonModes);

Actions: View | Formatted Diff | Diff

Attachments on bug 185073: 339315 | 339316 | 339324 | 339409