Changeset 270746 in webkit

Timestamp:

Dec 12, 2020 9:43:50 PM (3 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, reverting r270661.

Caused layout test failures and timeouts

Reverted changeset:

"Unreviewed, re-landing r270132."
​https://bugs.webkit.org/show_bug.cgi?id=202874
​https://trac.webkit.org/changeset/270661

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (2 diffs)
• Source/WTF/wtf/RunLoop.h (modified) (1 diff)
• Source/WTF/wtf/cf/RunLoopCF.cpp (modified) (5 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/cocoa/UtilitiesCocoa.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-12-12  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, reverting r270661.
+
+        Caused layout test failures and timeouts
+
+        Reverted changeset:
+
+        "Unreviewed, re-landing r270132."
+        https://bugs.webkit.org/show_bug.cgi?id=202874
+        https://trac.webkit.org/changeset/270661
+
 2020-12-12  Jiewen Tan  <jiewen_tan@apple.com>
 
@@ -4904 +4916 @@
         Reviewed by Carlos Garcia Campos.
 
-        As of https://bugs.webkit.org/show_bug.cgi?id=213063, Darwin platforms
-        use the RunLoop. Let's match them for consistency, and to delete some
+             use the RunLoop. Let's match them for consistency, and to delete some
         code.
 

trunk/Source/WTF/wtf/RunLoop.h

@@ -228 +228 @@
     Lock m_loopLock;
 #elif USE(COCOA_EVENT_LOOP)
-    static void performWork(CFMachPortRef, void* msg, CFIndex size, void* info);
+    static void performWork(void*);
     RetainPtr<CFRunLoopRef> m_runLoop;
     RetainPtr<CFRunLoopSourceRef> m_runLoopSource;
-    RetainPtr<CFMachPortRef> m_port;
 #elif USE(GLIB_EVENT_LOOP)
     void notify(Event, const char*);

trunk/Source/WTF/wtf/cf/RunLoopCF.cpp

@@ -29 +29 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <dispatch/dispatch.h>
-#include <mach/mach.h>
 #include <wtf/AutodrainedPool.h>
 #include <wtf/SchedulePair.h>
@@ -42 +41 @@
 }
 
-void RunLoop::performWork(CFMachPortRef, void*, CFIndex, void* info)
+void RunLoop::performWork(void* context)
 {
     AutodrainedPool pool;
-    static_cast<RunLoop*>(info)->performWork();
+    static_cast<RunLoop*>(context)->performWork();
 }
 
@@ -51 +50 @@
     : m_runLoop(CFRunLoopGetCurrent())
 {
-    CFMachPortContext context = { 0, this, nullptr, nullptr, nullptr };
-    m_port = adoptCF(CFMachPortCreate(kCFAllocatorDefault, performWork, &context, nullptr));
-    m_runLoopSource = adoptCF(CFMachPortCreateRunLoopSource(kCFAllocatorDefault, m_port.get(), 0));
+    CFRunLoopSourceContext context = { 0, this, 0, 0, 0, 0, 0, 0, 0, performWork };
+    m_runLoopSource = adoptCF(CFRunLoopSourceCreate(kCFAllocatorDefault, 0, &context));
     CFRunLoopAddSource(m_runLoop.get(), m_runLoopSource.get(), kCFRunLoopCommonModes);
 }
@@ -59 +57 @@
 RunLoop::~RunLoop()
 {
-    CFMachPortInvalidate(m_port.get());
     CFRunLoopSourceInvalidate(m_runLoopSource.get());
 }
@@ -65 +62 @@
 void RunLoop::wakeUp()
 {
-    mach_msg_header_t header;
-    header.msgh_bits = MACH_MSGH_BITS(MACH_MSG_TYPE_COPY_SEND, 0);
-    header.msgh_size = sizeof(mach_msg_header_t);
-    header.msgh_remote_port = CFMachPortGetPort(m_port.get());
-    header.msgh_local_port = MACH_PORT_NULL;
-    header.msgh_id = 0;
-    mach_msg_return_t result = mach_msg(&header, MACH_SEND_MSG | MACH_SEND_TIMEOUT, header.msgh_size, 0, MACH_PORT_NULL, 0, MACH_PORT_NULL);
-    RELEASE_ASSERT(result == MACH_MSG_SUCCESS || result == MACH_SEND_TIMED_OUT);
-    if (result == MACH_SEND_TIMED_OUT)
-        mach_msg_destroy(&header);
+    CFRunLoopSourceSignal(m_runLoopSource.get());
+    CFRunLoopWakeUp(m_runLoop.get());
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2020-12-12  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, reverting r270661.
+
+        Caused layout test failures and timeouts
+
+        Reverted changeset:
+
+        "Unreviewed, re-landing r270132."
+        https://bugs.webkit.org/show_bug.cgi?id=202874
+        https://trac.webkit.org/changeset/270661
+
 2020-12-12  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Tools/TestWebKitAPI/cocoa/UtilitiesCocoa.mm

@@ -39 +39 @@
 {
     for (uint64_t i = 0; i < count; ++i)
-        while (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, true) == kCFRunLoopRunHandledSource) { }
+        [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantPast]];
 }