<!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>[213338] trunk/Source</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/213338">213338</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2017-03-02 18:42:52 -0800 (Thu, 02 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add WebKit2 hooks to notify the VM that the user has requested a debugger break.
https://bugs.webkit.org/show_bug.cgi?id=169089
Reviewed by Tim Horton and Joseph Pecoraro.
Source/JavaScriptCore:
* runtime/VM.cpp:
(JSC::VM::handleTraps):
* runtime/VM.h:
(JSC::VM::notifyNeedDebuggerBreak):
Source/WebKit2:
* CMakeLists.txt:
* DerivedSources.make:
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::connect):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/WebInspectorInterruptDispatcher.cpp: Added.
(WebKit::WebInspectorInterruptDispatcher::create):
(WebKit::WebInspectorInterruptDispatcher::WebInspectorInterruptDispatcher):
(WebKit::WebInspectorInterruptDispatcher::~WebInspectorInterruptDispatcher):
(WebKit::WebInspectorInterruptDispatcher::initializeConnection):
(WebKit::WebInspectorInterruptDispatcher::notifyNeedDebuggerBreak):
* WebProcess/WebPage/WebInspectorInterruptDispatcher.h: Added.
* WebProcess/WebPage/WebInspectorInterruptDispatcher.messages.in: Added.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::initializeConnection):
* WebProcess/WebProcess.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DerivedSourcesmake">trunk/Source/WebKit2/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorInterruptDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorInterruptDispatcherh">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorInterruptDispatchermessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (213337 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-03 02:05:32 UTC (rev 213337)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-02 Mark Lam <mark.lam@apple.com>
+
+ Add WebKit2 hooks to notify the VM that the user has requested a debugger break.
+ https://bugs.webkit.org/show_bug.cgi?id=169089
+
+ Reviewed by Tim Horton and Joseph Pecoraro.
+
+ * runtime/VM.cpp:
+ (JSC::VM::handleTraps):
+ * runtime/VM.h:
+ (JSC::VM::notifyNeedDebuggerBreak):
+
</ins><span class="cx"> 2017-03-02 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Add JSC identity when code signing to allow debugging on iOS
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (213337 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2017-03-03 02:05:32 UTC (rev 213337)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -957,7 +957,9 @@
</span><span class="cx"> auto trapEventType = m_traps.takeTopPriorityTrap(mask);
</span><span class="cx"> switch (trapEventType) {
</span><span class="cx"> case VMTraps::NeedDebuggerBreak:
</span><del>- RELEASE_ASSERT_NOT_REACHED();
</del><ins>+ if (Options::alwaysCheckTraps())
+ dataLog("VM ", RawPointer(this), " on pid ", getCurrentProcessID(), " received NeedDebuggerBreak trap\n");
+ return;
</ins><span class="cx">
</span><span class="cx"> case VMTraps::NeedWatchdogCheck:
</span><span class="cx"> ASSERT(m_watchdog);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (213337 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2017-03-03 02:05:32 UTC (rev 213337)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -676,6 +676,7 @@
</span><span class="cx"> bool needTrapHandling(VMTraps::Mask mask = VMTraps::Mask::allEventTypes()) { return m_traps.needTrapHandling(mask); }
</span><span class="cx"> void* needTrapHandlingAddress() { return m_traps.needTrapHandlingAddress(); }
</span><span class="cx">
</span><ins>+ void notifyNeedDebuggerBreak() { m_traps.fireTrap(VMTraps::NeedDebuggerBreak); }
</ins><span class="cx"> void notifyNeedTermination() { m_traps.fireTrap(VMTraps::NeedTermination); }
</span><span class="cx"> void notifyNeedWatchdogCheck() { m_traps.fireTrap(VMTraps::NeedWatchdogCheck); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (213337 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2017-03-03 02:05:32 UTC (rev 213337)
+++ trunk/Source/WebKit2/CMakeLists.txt 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -572,6 +572,7 @@
</span><span class="cx"> WebProcess/WebPage/WebDocumentLoader.cpp
</span><span class="cx"> WebProcess/WebPage/WebFrame.cpp
</span><span class="cx"> WebProcess/WebPage/WebInspector.cpp
</span><ins>+ WebProcess/WebPage/WebInspectorInterruptDispatcher.cpp
</ins><span class="cx"> WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.cpp
</span><span class="cx"> WebProcess/WebPage/WebInspectorUI.cpp
</span><span class="cx"> WebProcess/WebPage/WebOpenPanelResultListener.cpp
</span><span class="lines">@@ -679,6 +680,7 @@
</span><span class="cx"> WebProcess/WebPage/RemoteWebInspectorUI.messages.in
</span><span class="cx"> WebProcess/WebPage/VisitedLinkTableController.messages.in
</span><span class="cx"> WebProcess/WebPage/WebInspector.messages.in
</span><ins>+ WebProcess/WebPage/WebInspectorInterruptDispatcher.messages.in
</ins><span class="cx"> WebProcess/WebPage/WebInspectorUI.messages.in
</span><span class="cx"> WebProcess/WebPage/WebPage.messages.in
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213337 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-03 02:05:32 UTC (rev 213337)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-03-02 Mark Lam <mark.lam@apple.com>
+
+ Add WebKit2 hooks to notify the VM that the user has requested a debugger break.
+ https://bugs.webkit.org/show_bug.cgi?id=169089
+
+ Reviewed by Tim Horton and Joseph Pecoraro.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::connect):
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/WebInspectorInterruptDispatcher.cpp: Added.
+ (WebKit::WebInspectorInterruptDispatcher::create):
+ (WebKit::WebInspectorInterruptDispatcher::WebInspectorInterruptDispatcher):
+ (WebKit::WebInspectorInterruptDispatcher::~WebInspectorInterruptDispatcher):
+ (WebKit::WebInspectorInterruptDispatcher::initializeConnection):
+ (WebKit::WebInspectorInterruptDispatcher::notifyNeedDebuggerBreak):
+ * WebProcess/WebPage/WebInspectorInterruptDispatcher.h: Added.
+ * WebProcess/WebPage/WebInspectorInterruptDispatcher.messages.in: Added.
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+ (WebKit::WebProcess::initializeConnection):
+ * WebProcess/WebProcess.h:
+
</ins><span class="cx"> 2017-03-02 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Update WKWebsiteDatastoreConfiguration SPI.
</span></span></pre></div>
<a id="trunkSourceWebKit2DerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DerivedSources.make (213337 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DerivedSources.make 2017-03-03 02:05:32 UTC (rev 213337)
+++ trunk/Source/WebKit2/DerivedSources.make 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Copyright (C) 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2010-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx"> WebIconDatabase \
</span><span class="cx"> WebIconDatabaseProxy \
</span><span class="cx"> WebInspector \
</span><ins>+ WebInspectorInterruptDispatcher \
</ins><span class="cx"> WebInspectorProxy \
</span><span class="cx"> WebInspectorUI \
</span><span class="cx"> WebNotificationManager \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (213337 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2017-03-03 02:05:32 UTC (rev 213337)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, 2014, 2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Portions Copyright (c) 2011 Motorola Mobility, Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "WebAutomationSession.h"
</span><span class="cx"> #include "WebFramePolicyListenerProxy.h"
</span><span class="cx"> #include "WebFrameProxy.h"
</span><ins>+#include "WebInspectorInterruptDispatcherMessages.h"
</ins><span class="cx"> #include "WebInspectorMessages.h"
</span><span class="cx"> #include "WebInspectorProxyMessages.h"
</span><span class="cx"> #include "WebInspectorUIMessages.h"
</span><span class="lines">@@ -121,6 +122,7 @@
</span><span class="cx">
</span><span class="cx"> eagerlyCreateInspectorPage();
</span><span class="cx">
</span><ins>+ m_inspectedPage->process().send(Messages::WebInspectorInterruptDispatcher::NotifyNeedDebuggerBreak(), 0);
</ins><span class="cx"> m_inspectedPage->process().send(Messages::WebInspector::Show(), m_inspectedPage->pageID());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (213337 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-03-03 02:05:32 UTC (rev 213337)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -1970,6 +1970,10 @@
</span><span class="cx"> F6A90813133C20510082C3F4 /* WebCookieManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6A90811133C1F3D0082C3F4 /* WebCookieManagerMac.mm */; };
</span><span class="cx"> F6D632BC133D198200743D77 /* WebCookieManagerProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6D632BA133D181B00743D77 /* WebCookieManagerProxyMac.mm */; };
</span><span class="cx"> FED3C1DC1B447EAC00E0EB7F /* APISerializedScriptValueCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */; };
</span><ins>+ FEDBDCD61E68D20000A59F8F /* WebInspectorInterruptDispatcherMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEDBDCD41E68D19C00A59F8F /* WebInspectorInterruptDispatcherMessageReceiver.cpp */; };
+ FEDBDCD71E68D20500A59F8F /* WebInspectorInterruptDispatcherMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = FEDBDCD51E68D19C00A59F8F /* WebInspectorInterruptDispatcherMessages.h */; };
+ FEE43FD31E67B0180077D6D1 /* WebInspectorInterruptDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = FEE43FD11E67AFC60077D6D1 /* WebInspectorInterruptDispatcher.h */; };
+ FEE43FD41E67B0210077D6D1 /* WebInspectorInterruptDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE43FD01E67AFC60077D6D1 /* WebInspectorInterruptDispatcher.cpp */; };
</ins><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXContainerItemProxy section */
</span><span class="lines">@@ -4237,6 +4241,11 @@
</span><span class="cx"> F6A90811133C1F3D0082C3F4 /* WebCookieManagerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCookieManagerMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> F6D632BA133D181B00743D77 /* WebCookieManagerProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCookieManagerProxyMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APISerializedScriptValueCocoa.mm; sourceTree = "<group>"; };
</span><ins>+ FEDBDCD41E68D19C00A59F8F /* WebInspectorInterruptDispatcherMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorInterruptDispatcherMessageReceiver.cpp; sourceTree = "<group>"; };
+ FEDBDCD51E68D19C00A59F8F /* WebInspectorInterruptDispatcherMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorInterruptDispatcherMessages.h; sourceTree = "<group>"; };
+ FEE43FD01E67AFC60077D6D1 /* WebInspectorInterruptDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInspectorInterruptDispatcher.cpp; sourceTree = "<group>"; };
+ FEE43FD11E67AFC60077D6D1 /* WebInspectorInterruptDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInspectorInterruptDispatcher.h; sourceTree = "<group>"; };
+ FEE43FD21E67AFC60077D6D1 /* WebInspectorInterruptDispatcher.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebInspectorInterruptDispatcher.messages.in; sourceTree = "<group>"; };
</ins><span class="cx"> /* End PBXFileReference section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXFrameworksBuildPhase section */
</span><span class="lines">@@ -6446,6 +6455,9 @@
</span><span class="cx"> 1C8E2A1C1277833F00BC7BD0 /* WebInspector.messages.in */,
</span><span class="cx"> A55BA8321BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.cpp */,
</span><span class="cx"> A55BA8331BA3E6FA007CD33D /* WebInspectorFrontendAPIDispatcher.h */,
</span><ins>+ FEE43FD01E67AFC60077D6D1 /* WebInspectorInterruptDispatcher.cpp */,
+ FEE43FD11E67AFC60077D6D1 /* WebInspectorInterruptDispatcher.h */,
+ FEE43FD21E67AFC60077D6D1 /* WebInspectorInterruptDispatcher.messages.in */,
</ins><span class="cx"> 1C891D6219B124FF00BA79DD /* WebInspectorUI.cpp */,
</span><span class="cx"> 1C891D6319B124FF00BA79DD /* WebInspectorUI.h */,
</span><span class="cx"> 1C891D6419B124FF00BA79DD /* WebInspectorUI.messages.in */,
</span><span class="lines">@@ -7616,6 +7628,8 @@
</span><span class="cx"> 510523781C73DA70007993CB /* WebIDBConnectionToClientMessages.h */,
</span><span class="cx"> 510523721C73D37B007993CB /* WebIDBConnectionToServerMessageReceiver.cpp */,
</span><span class="cx"> 510523731C73D37B007993CB /* WebIDBConnectionToServerMessages.h */,
</span><ins>+ FEDBDCD41E68D19C00A59F8F /* WebInspectorInterruptDispatcherMessageReceiver.cpp */,
+ FEDBDCD51E68D19C00A59F8F /* WebInspectorInterruptDispatcherMessages.h */,
</ins><span class="cx"> 1C8E2A311277852400BC7BD0 /* WebInspectorMessageReceiver.cpp */,
</span><span class="cx"> 1C8E2A321277852400BC7BD0 /* WebInspectorMessages.h */,
</span><span class="cx"> 1CA8B943127C882A00576C2B /* WebInspectorProxyMessageReceiver.cpp */,
</span><span class="lines">@@ -8562,6 +8576,7 @@
</span><span class="cx"> BC204EEF11C83EC8008F3375 /* WKBundle.h in Headers */,
</span><span class="cx"> BC204EF011C83EC8008F3375 /* WKBundleAPICast.h in Headers */,
</span><span class="cx"> 935EEB9F127761AC003322B8 /* WKBundleBackForwardList.h in Headers */,
</span><ins>+ FEDBDCD71E68D20500A59F8F /* WebInspectorInterruptDispatcherMessages.h in Headers */,
</ins><span class="cx"> 935EEB9B1277617C003322B8 /* WKBundleBackForwardListItem.h in Headers */,
</span><span class="cx"> 51EFC1CF1524E62500C9A938 /* WKBundleDOMWindowExtension.h in Headers */,
</span><span class="cx"> 7CBB81211AA0F970006B1942 /* WKBundleFileHandleRef.h in Headers */,
</span><span class="lines">@@ -8776,6 +8791,7 @@
</span><span class="cx"> 1A7E377518E4A33A003D0FFF /* WKScriptMessageHandler.h in Headers */,
</span><span class="cx"> 7CC99A3618EF7CBC0048C8B4 /* WKScriptMessageInternal.h in Headers */,
</span><span class="cx"> 0FCB4E5418BBE044000FCFC9 /* WKScrollView.h in Headers */,
</span><ins>+ FEE43FD31E67B0180077D6D1 /* WebInspectorInterruptDispatcher.h in Headers */,
</ins><span class="cx"> 51CD1C651B34B9D400142CA5 /* WKSecurityOrigin.h in Headers */,
</span><span class="cx"> 51CD1C671B34B9DF00142CA5 /* WKSecurityOriginInternal.h in Headers */,
</span><span class="cx"> 51CD1C5E1B3493B400142CA5 /* WKSecurityOriginRef.h in Headers */,
</span><span class="lines">@@ -9730,6 +9746,7 @@
</span><span class="cx"> 1A2D82A6127F4EAB001EB962 /* NPObjectProxy.cpp in Sources */,
</span><span class="cx"> 1A2D82A8127F4EAB001EB962 /* NPRemoteObjectMap.cpp in Sources */,
</span><span class="cx"> 1A2161B111F37664008AD0F5 /* NPRuntimeObjectMap.cpp in Sources */,
</span><ins>+ FEE43FD41E67B0210077D6D1 /* WebInspectorInterruptDispatcher.cpp in Sources */,
</ins><span class="cx"> 1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */,
</span><span class="cx"> 1A2D84A4127F6AD1001EB962 /* NPVariantData.cpp in Sources */,
</span><span class="cx"> BC8ACA1416670D89004C1941 /* ObjCObjectGraph.mm in Sources */,
</span><span class="lines">@@ -10213,6 +10230,7 @@
</span><span class="cx"> 5110AE0C133C16CB0072717A /* WKIconDatabase.cpp in Sources */,
</span><span class="cx"> 5123CF1B133D260A0056F800 /* WKIconDatabaseCG.cpp in Sources */,
</span><span class="cx"> BCCF6AC212C91F34008F9C35 /* WKImage.cpp in Sources */,
</span><ins>+ FEDBDCD61E68D20000A59F8F /* WebInspectorInterruptDispatcherMessageReceiver.cpp in Sources */,
</ins><span class="cx"> BCCF6AC912C91F59008F9C35 /* WKImageCG.cpp in Sources */,
</span><span class="cx"> 933DF8301B3BC0B400AEA9E3 /* WKImagePreviewViewController.mm in Sources */,
</span><span class="cx"> 9321D5881A38EE74008052BE /* WKImmediateActionController.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorInterruptDispatchercpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.cpp (0 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.cpp 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+/*
+ * Copyright (C) 2017 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.
+ */
+
+#include "config.h"
+#include "WebInspectorInterruptDispatcher.h"
+
+#include "WebInspectorInterruptDispatcherMessages.h"
+#include <JavaScriptCore/VM.h>
+#include <WebCore/CommonVM.h>
+#include <wtf/WorkQueue.h>
+
+namespace WebKit {
+
+Ref<WebInspectorInterruptDispatcher> WebInspectorInterruptDispatcher::create()
+{
+ return adoptRef(*new WebInspectorInterruptDispatcher);
+}
+
+WebInspectorInterruptDispatcher::WebInspectorInterruptDispatcher()
+ : m_queue(WorkQueue::create("com.apple.WebKit.WebInspectorInterruptDispatcher"))
+{
+}
+
+WebInspectorInterruptDispatcher::~WebInspectorInterruptDispatcher()
+{
+}
+
+void WebInspectorInterruptDispatcher::initializeConnection(IPC::Connection* connection)
+{
+ connection->addWorkQueueMessageReceiver(Messages::WebInspectorInterruptDispatcher::messageReceiverName(), m_queue.get(), this);
+}
+
+void WebInspectorInterruptDispatcher::notifyNeedDebuggerBreak()
+{
+ JSC::VM& vm = WebCore::commonVM();
+ vm.notifyNeedDebuggerBreak();
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorInterruptDispatcherh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.h (0 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.h 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+/*
+ * Copyright (C) 2017 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.
+ */
+
+#pragma once
+
+#include "Connection.h"
+
+namespace WebKit {
+
+class WebInspectorInterruptDispatcher : public IPC::Connection::WorkQueueMessageReceiver {
+public:
+ static Ref<WebInspectorInterruptDispatcher> create();
+ ~WebInspectorInterruptDispatcher();
+
+ void initializeConnection(IPC::Connection*);
+
+private:
+ WebInspectorInterruptDispatcher();
+ // IPC::Connection::WorkQueueMessageReceiver.
+ void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
+
+ void notifyNeedDebuggerBreak();
+
+ Ref<WorkQueue> m_queue;
+};
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorInterruptDispatchermessagesin"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.messages.in (0 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.messages.in (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorInterruptDispatcher.messages.in 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+# Copyright (C) 2017 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.
+
+messages -> WebInspectorInterruptDispatcher {
+ NotifyNeedDebuggerBreak()
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (213337 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2017-03-03 02:05:32 UTC (rev 213337)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -157,6 +157,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_viewUpdateDispatcher(ViewUpdateDispatcher::create())
</span><span class="cx"> #endif
</span><ins>+ , m_webInspectorInterruptDispatcher(WebInspectorInterruptDispatcher::create())
</ins><span class="cx"> , m_iconDatabaseProxy(*new WebIconDatabaseProxy(*this))
</span><span class="cx"> , m_webLoaderStrategy(*new WebLoaderStrategy)
</span><span class="cx"> , m_dnsPrefetchHystereris([this](HysteresisState state) { if (state == HysteresisState::Stopped) m_dnsPrefetchedHosts.clear(); })
</span><span class="lines">@@ -221,6 +222,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_viewUpdateDispatcher->initializeConnection(connection);
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><ins>+ m_webInspectorInterruptDispatcher->initializeConnection(connection);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> m_pluginProcessConnectionManager->initializeConnection(connection);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (213337 => 213338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2017-03-03 02:05:32 UTC (rev 213337)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2017-03-03 02:42:52 UTC (rev 213338)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "TextCheckerState.h"
</span><span class="cx"> #include "ViewUpdateDispatcher.h"
</span><span class="cx"> #include "VisitedLinkTable.h"
</span><ins>+#include "WebInspectorInterruptDispatcher.h"
</ins><span class="cx"> #include <WebCore/HysteresisActivity.h>
</span><span class="cx"> #include <WebCore/ResourceLoadStatisticsStore.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="lines">@@ -351,6 +352,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> RefPtr<ViewUpdateDispatcher> m_viewUpdateDispatcher;
</span><span class="cx"> #endif
</span><ins>+ RefPtr<WebInspectorInterruptDispatcher> m_webInspectorInterruptDispatcher;
</ins><span class="cx">
</span><span class="cx"> HashMap<WebCore::SessionID, HashMap<unsigned, double>> m_plugInAutoStartOriginHashes;
</span><span class="cx"> HashSet<String> m_plugInAutoStartOrigins;
</span></span></pre>
</div>
</div>
</body>
</html>