Changeset 200209 in webkit

Timestamp:

Apr 28, 2016, 2:28:10 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Tweak auto attach initialization on some platforms
​https://bugs.webkit.org/show_bug.cgi?id=157150
<rdar://problem/21222045>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-04-28
Reviewed by Timothy Hatcher.

• inspector/EventLoop.cpp:

(Inspector::EventLoop::cycle):

• inspector/remote/RemoteInspector.mm:

(Inspector::RemoteInspector::updateAutomaticInspectionCandidate):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/EventLoop.cpp (modified) (1 diff)
• inspector/remote/RemoteInspector.mm (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-04-28  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Tweak auto attach initialization on some platforms
+        https://bugs.webkit.org/show_bug.cgi?id=157150
+        <rdar://problem/21222045>
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/EventLoop.cpp:
+        (Inspector::EventLoop::cycle):
+        * inspector/remote/RemoteInspector.mm:
+        (Inspector::RemoteInspector::updateAutomaticInspectionCandidate):
+
 2016-04-28  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/JavaScriptCore/inspector/EventLoop.cpp

@@ -54 +54 @@
     TranslateMessage(&msg);
     DispatchMessage(&msg);
+#elif PLATFORM(WATCHOS)
+    // FIXME: <rdar://problem/25972777>. In order for auto-attach to work, we need to
+    // run in the default run loop mode otherwise we do not receive the XPC messages
+    // necessary to setup the relay connection and negotiate an auto-attach debugger.
+    CFTimeInterval timeInterval = 0.05;
+    CFRunLoopRunInMode(kCFRunLoopDefaultMode, timeInterval, true);
 #elif USE(CF)
     // Run the RunLoop in a custom run loop mode to prevent default observers

trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm

@@ -226 +226 @@
 
         // In case debuggers fail to respond, or we cannot connect to webinspectord, automatically continue after a short period of time.
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.8 * NSEC_PER_SEC), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+#if PLATFORM(WATCHOS)
+        int64_t debuggerTimeoutDelay = 5;
+#else
+        int64_t debuggerTimeoutDelay = 1;
+#endif
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, debuggerTimeoutDelay * NSEC_PER_SEC), dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             std::lock_guard<Lock> lock(m_mutex);
             if (m_automaticInspectionCandidateTargetIdentifier == targetIdentifier) {