Title: [200209] trunk/Source/_javascript_Core
- Revision
- 200209
- Author
- [email protected]
- Date
- 2016-04-28 14:28:10 -0700 (Thu, 28 Apr 2016)
Log 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 <[email protected]> on 2016-04-28
Reviewed by Timothy Hatcher.
* inspector/EventLoop.cpp:
(Inspector::EventLoop::cycle):
* inspector/remote/RemoteInspector.mm:
(Inspector::RemoteInspector::updateAutomaticInspectionCandidate):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (200208 => 200209)
--- trunk/Source/_javascript_Core/ChangeLog 2016-04-28 20:50:08 UTC (rev 200208)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-04-28 21:28:10 UTC (rev 200209)
@@ -1,3 +1,16 @@
+2016-04-28 Joseph Pecoraro <[email protected]>
+
+ 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 <[email protected]>
[JSC] Unify Math.pow() accross all tiers
Modified: trunk/Source/_javascript_Core/inspector/EventLoop.cpp (200208 => 200209)
--- trunk/Source/_javascript_Core/inspector/EventLoop.cpp 2016-04-28 20:50:08 UTC (rev 200208)
+++ trunk/Source/_javascript_Core/inspector/EventLoop.cpp 2016-04-28 21:28:10 UTC (rev 200209)
@@ -53,6 +53,12 @@
}
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
// to run and potentially evaluate _javascript_ in this context while we are
Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.mm (200208 => 200209)
--- trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2016-04-28 20:50:08 UTC (rev 200208)
+++ trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2016-04-28 21:28:10 UTC (rev 200209)
@@ -225,7 +225,12 @@
}
// 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) {
LOG_ERROR("Skipping Automatic Inspection Candidate with pageId(%u) because we failed to receive a response in time.", m_automaticInspectionCandidateTargetIdentifier);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
