<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[259931] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/259931">259931</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2020-04-11 11:36:40 -0700 (Sat, 11 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (Safari 13.1?): Web Inspector: Debugger hang at breakpoint when using Keyboard Maestro
https://bugs.webkit.org/show_bug.cgi?id=210177
<rdar://problem/61485723>

Reviewed by Joseph Pecoraro.

Partial revert of <a href="http://trac.webkit.org/projects/webkit/changeset/251036">r251036</a> <https://webkit.org/b/202716> to go back to using AppKit APIs
instead of `CFRunLoopRunInMode`. Only seems to affect WebKitLegacy.

* inspector/PageScriptDebugServer.h:
* inspector/PageScriptDebugServer.cpp:
(WebCore::PageScriptDebugServer::runEventLoopWhilePausedInternal):
(WebCore::PageScriptDebugServer::platformShouldContinueRunningEventLoopWhilePaused):
* inspector/mac/PageScriptDebugServerMac.mm: Added.
(WebCore::PageScriptDebugServer::platformShouldContinueRunningEventLoopWhilePaused):

* SourcesCocoa.txt:
* WebCore.xcodeproj/project.pbxproj:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreSourcesCocoatxt">trunk/Source/WebCore/SourcesCocoa.txt</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageScriptDebugServercpp">trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageScriptDebugServerh">trunk/Source/WebCore/inspector/PageScriptDebugServer.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebCore/inspector/mac/</li>
<li><a href="#trunkSourceWebCoreinspectormacPageScriptDebugServerMacmm">trunk/Source/WebCore/inspector/mac/PageScriptDebugServerMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (259930 => 259931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-04-11 15:35:04 UTC (rev 259930)
+++ trunk/Source/WebCore/ChangeLog      2020-04-11 18:36:40 UTC (rev 259931)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2020-04-11  Devin Rousso  <drousso@apple.com>
+
+        REGRESSION (Safari 13.1?): Web Inspector: Debugger hang at breakpoint when using Keyboard Maestro
+        https://bugs.webkit.org/show_bug.cgi?id=210177
+        <rdar://problem/61485723>
+
+        Reviewed by Joseph Pecoraro.
+
+        Partial revert of r251036 <https://webkit.org/b/202716> to go back to using AppKit APIs
+        instead of `CFRunLoopRunInMode`. Only seems to affect WebKitLegacy.
+
+        * inspector/PageScriptDebugServer.h:
+        * inspector/PageScriptDebugServer.cpp:
+        (WebCore::PageScriptDebugServer::runEventLoopWhilePausedInternal):
+        (WebCore::PageScriptDebugServer::platformShouldContinueRunningEventLoopWhilePaused):
+        * inspector/mac/PageScriptDebugServerMac.mm: Added.
+        (WebCore::PageScriptDebugServer::platformShouldContinueRunningEventLoopWhilePaused):
+
+        * SourcesCocoa.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2020-04-08  Darin Adler  <darin@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Use Node::length to replace Node::maxCharacterOffset and lastOffsetInNode; switch more offsets from int to unsigned
</span></span></pre></div>
<a id="trunkSourceWebCoreSourcesCocoatxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/SourcesCocoa.txt (259930 => 259931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/SourcesCocoa.txt    2020-04-11 15:35:04 UTC (rev 259930)
+++ trunk/Source/WebCore/SourcesCocoa.txt       2020-04-11 18:36:40 UTC (rev 259931)
</span><span class="lines">@@ -112,6 +112,8 @@
</span><span class="cx"> 
</span><span class="cx"> history/mac/HistoryItemMac.mm
</span><span class="cx"> 
</span><ins>+inspector/mac/PageScriptDebugServerMac.mm
+
</ins><span class="cx"> loader/archive/cf/LegacyWebArchive.cpp
</span><span class="cx"> loader/archive/cf/LegacyWebArchiveMac.mm
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (259930 => 259931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj   2020-04-11 15:35:04 UTC (rev 259930)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj      2020-04-11 18:36:40 UTC (rev 259931)
</span><span class="lines">@@ -10681,6 +10681,7 @@
</span><span class="cx">          91278D6021DEDAF000B57184 /* WorkerAuditAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerAuditAgent.h; sourceTree = "<group>"; };
</span><span class="cx">          913FE5982362799900F9446A /* InspectorAnimationAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InspectorAnimationAgent.cpp; path = inspector/agents/InspectorAnimationAgent.cpp; sourceTree = SOURCE_ROOT; };
</span><span class="cx">          913FE59A2362799900F9446A /* InspectorAnimationAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InspectorAnimationAgent.h; path = inspector/agents/InspectorAnimationAgent.h; sourceTree = SOURCE_ROOT; };
</span><ins>+               9174EA5D2440F9A50008349C /* PageScriptDebugServerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageScriptDebugServerMac.mm; sourceTree = "<group>"; };
</ins><span class="cx">           9175CE5721E281EB00DF2C27 /* InspectorAuditDOMObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorAuditDOMObject.cpp; sourceTree = "<group>"; };
</span><span class="cx">          9175CE5721E281EB00DF2C28 /* JSInspectorAuditDOMObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorAuditDOMObject.cpp; sourceTree = "<group>"; };
</span><span class="cx">          9175CE5821E281EC00DF2C27 /* InspectorAuditDOMObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorAuditDOMObject.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -17629,6 +17630,7 @@
</span><span class="cx">                  isa = PBXGroup;
</span><span class="cx">                  children = (
</span><span class="cx">                          A5B81C831FAA44060037D1E6 /* agents */,
</span><ins>+                               9174EA5C2440F98A0008349C /* mac */,
</ins><span class="cx">                           A584FE311864D5AF00843B10 /* CommandLineAPIHost.cpp */,
</span><span class="cx">                          A584FE321864D5AF00843B10 /* CommandLineAPIHost.h */,
</span><span class="cx">                          A584FE331864D5AF00843B10 /* CommandLineAPIHost.idl */,
</span><span class="lines">@@ -21755,6 +21757,14 @@
</span><span class="cx">                  name = Quota;
</span><span class="cx">                  sourceTree = "<group>";
</span><span class="cx">          };
</span><ins>+               9174EA5C2440F98A0008349C /* mac */ = {
+                       isa = PBXGroup;
+                       children = (
+                               9174EA5D2440F9A50008349C /* PageScriptDebugServerMac.mm */,
+                       );
+                       path = mac;
+                       sourceTree = "<group>";
+               };
</ins><span class="cx">           93309D86099E64910056E581 /* editing */ = {
</span><span class="cx">                  isa = PBXGroup;
</span><span class="cx">                  children = (
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp (259930 => 259931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp 2020-04-11 15:35:04 UTC (rev 259930)
+++ trunk/Source/WebCore/inspector/PageScriptDebugServer.cpp    2020-04-11 18:36:40 UTC (rev 259931)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">     m_page.incrementNestedRunLoopCount();
</span><span class="cx"> 
</span><span class="cx">     while (!m_doneProcessingDebuggerEvents) {
</span><del>-        if (RunLoop::cycle() == RunLoop::CycleResult::Stop)
</del><ins>+        if (!platformShouldContinueRunningEventLoopWhilePaused())
</ins><span class="cx">             break;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -176,4 +176,11 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if !PLATFORM(MAC)
+bool PageScriptDebugServer::platformShouldContinueRunningEventLoopWhilePaused()
+{
+    return RunLoop::cycle() != RunLoop::CycleResult::Stop;
+}
+#endif // !PLATFORM(MAC)
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageScriptDebugServer.h (259930 => 259931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageScriptDebugServer.h   2020-04-11 15:35:04 UTC (rev 259930)
+++ trunk/Source/WebCore/inspector/PageScriptDebugServer.h      2020-04-11 18:36:40 UTC (rev 259931)
</span><span class="lines">@@ -58,6 +58,8 @@
</span><span class="cx">     void setJavaScriptPaused(const PageGroup&, bool paused);
</span><span class="cx">     void setJavaScriptPaused(Frame&, bool paused);
</span><span class="cx"> 
</span><ins>+    bool platformShouldContinueRunningEventLoopWhilePaused();
+
</ins><span class="cx">     Page& m_page;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectormacPageScriptDebugServerMacmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/inspector/mac/PageScriptDebugServerMac.mm (0 => 259931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/mac/PageScriptDebugServerMac.mm                           (rev 0)
+++ trunk/Source/WebCore/inspector/mac/PageScriptDebugServerMac.mm      2020-04-11 18:36:40 UTC (rev 259931)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+/*
+ * Copyright (C) 2008-2018 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "PageScriptDebugServer.h"
+
+#if PLATFORM(MAC)
+
+#import <wtf/ProcessPrivilege.h>
+
+namespace WebCore {
+
+bool PageScriptDebugServer::platformShouldContinueRunningEventLoopWhilePaused()
+{
+    // Be very careful before removing this code. It has been tried multiple times, always ending up
+    // breaking inspection of WebKitLegacy (in MiniBrowser, in 3rd party apps, or sometimes both).
+    //  - <https://webkit.org/b/117596> <rdar://problem/14133001>
+    //  - <https://webkit.org/b/210177> <rdar://problem/61485723>
+
+#if ENABLE(WEBPROCESS_NSRUNLOOP)
+    if (![NSApp isRunning]) {
+        [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.05]];
+        return true;
+    }
+
+    ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
+#endif
+
+    [NSApp setWindowsNeedUpdate:YES];
+
+    if (NSEvent *event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate dateWithTimeIntervalSinceNow:0.05] inMode:NSDefaultRunLoopMode dequeue:YES])
+        [NSApp sendEvent:event];
+
+    return true;
+}
+
+} // namespace WebCore
+
+#endif // PLATFORM(MAC)
</ins></span></pre>
</div>
</div>

</body>
</html>