<!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>[160887] 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/160887">160887</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-19 17:59:19 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add InspectorFrontendHost.debuggableType to let the frontend know it's backend is JavaScript or Web
https://bugs.webkit.org/show_bug.cgi?id=126016
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2013-12-19
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/remote/RemoteInspector.mm:
(Inspector::RemoteInspector::listingForDebuggable):
* inspector/remote/RemoteInspectorConstants.h:
Include a debuggable type identifier in the debuggable listing,
so the remote frontend can know if it is debugging a Web Page
or JS Context.
Source/WebCore:
* inspector/InspectorFrontendHost.cpp:
(WebCore::InspectorFrontendHost::debuggableType):
* inspector/InspectorFrontendHost.h:
* inspector/InspectorFrontendHost.idl:
Expose the debuggableType to the frontend. In WebCore it is always a "web" type.
Source/WebInspectorUI:
* UserInterface/LoadInspectorBackendCommands.js:
If the debuggable target is "web" load both JS and Web backend commands.
Otherwise, we only load the default, js backend commands.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorConstantsh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostcpp">trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHosth">trunk/Source/WebCore/inspector/InspectorFrontendHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostidl">trunk/Source/WebCore/inspector/InspectorFrontendHost.idl</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceLoadInspectorBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/LoadInspectorBackendCommands.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160886 => 160887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-20 01:55:01 UTC (rev 160886)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-20 01:59:19 UTC (rev 160887)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add InspectorFrontendHost.debuggableType to let the frontend know it's backend is JavaScript or Web
+ https://bugs.webkit.org/show_bug.cgi?id=126016
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/remote/RemoteInspector.mm:
+ (Inspector::RemoteInspector::listingForDebuggable):
+ * inspector/remote/RemoteInspectorConstants.h:
+ Include a debuggable type identifier in the debuggable listing,
+ so the remote frontend can know if it is debugging a Web Page
+ or JS Context.
+
</ins><span class="cx"> 2013-12-19 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add an utility class to simplify generating function calls
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm (160886 => 160887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2013-12-20 01:55:01 UTC (rev 160886)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2013-12-20 01:59:19 UTC (rev 160887)
</span><span class="lines">@@ -276,6 +276,7 @@
</span><span class="cx"> case RemoteInspectorDebuggable::JavaScript: {
</span><span class="cx"> NSString *name = debuggableInfo.name;
</span><span class="cx"> [debuggableDetails setObject:name forKey:WIRTitleKey];
</span><ins>+ [debuggableDetails setObject:WIRTypeJavaScript forKey:WIRTypeKey];
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case RemoteInspectorDebuggable::Web: {
</span><span class="lines">@@ -283,6 +284,7 @@
</span><span class="cx"> NSString *title = debuggableInfo.name;
</span><span class="cx"> [debuggableDetails setObject:url forKey:WIRURLKey];
</span><span class="cx"> [debuggableDetails setObject:title forKey:WIRTitleKey];
</span><ins>+ [debuggableDetails setObject:WIRTypeWeb forKey:WIRTypeKey];
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h (160886 => 160887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h 2013-12-20 01:55:01 UTC (rev 160886)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h 2013-12-20 01:59:19 UTC (rev 160887)
</span><span class="lines">@@ -66,6 +66,9 @@
</span><span class="cx"> #define WIRListingKey @"WIRListingKey"
</span><span class="cx"> #define WIRDestinationKey @"WIRDestinationKey"
</span><span class="cx"> #define WIRConnectionDiedMessage @"WIRConnectionDiedMessage"
</span><ins>+#define WIRTypeKey @"WIRTypeKey"
+#define WIRTypeJavaScript @"WIRTypeJavaScript"
+#define WIRTypeWeb @"WIRTypeWeb"
</ins><span class="cx">
</span><span class="cx"> // These definitions are shared with a Simulator webinspectord and
</span><span class="cx"> // OS X process communicating with it.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160886 => 160887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-20 01:55:01 UTC (rev 160886)
+++ trunk/Source/WebCore/ChangeLog 2013-12-20 01:59:19 UTC (rev 160887)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add InspectorFrontendHost.debuggableType to let the frontend know it's backend is JavaScript or Web
+ https://bugs.webkit.org/show_bug.cgi?id=126016
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorFrontendHost.cpp:
+ (WebCore::InspectorFrontendHost::debuggableType):
+ * inspector/InspectorFrontendHost.h:
+ * inspector/InspectorFrontendHost.idl:
+ Expose the debuggableType to the frontend. In WebCore it is always a "web" type.
+
</ins><span class="cx"> 2013-12-19 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add an utility class to simplify generating function calls
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (160886 => 160887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2013-12-20 01:55:01 UTC (rev 160886)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2013-12-20 01:59:19 UTC (rev 160887)
</span><span class="lines">@@ -221,6 +221,11 @@
</span><span class="cx"> return m_client ? m_client->localizedStringsURL() : "";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String InspectorFrontendHost::debuggableType()
+{
+ return ASCIILiteral("web");
+}
+
</ins><span class="cx"> void InspectorFrontendHost::copyText(const String& text)
</span><span class="cx"> {
</span><span class="cx"> Pasteboard::createForCopyAndPaste()->writePlainText(text, Pasteboard::CannotSmartReplace);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.h (160886 => 160887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2013-12-20 01:55:01 UTC (rev 160886)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2013-12-20 01:59:19 UTC (rev 160887)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> void moveWindowBy(float x, float y) const;
</span><span class="cx">
</span><span class="cx"> String localizedStringsURL();
</span><ins>+ String debuggableType();
</ins><span class="cx">
</span><span class="cx"> void copyText(const String& text);
</span><span class="cx"> void openInNewTab(const String& url);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.idl (160886 => 160887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.idl 2013-12-20 01:55:01 UTC (rev 160886)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.idl 2013-12-20 01:59:19 UTC (rev 160887)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> void moveWindowBy(float x, float y);
</span><span class="cx">
</span><span class="cx"> DOMString localizedStringsURL();
</span><ins>+ DOMString debuggableType();
</ins><span class="cx">
</span><span class="cx"> void copyText(DOMString text);
</span><span class="cx"> void openInNewTab(DOMString url);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (160886 => 160887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2013-12-20 01:55:01 UTC (rev 160886)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-12-20 01:59:19 UTC (rev 160887)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-19 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add InspectorFrontendHost.debuggableType to let the frontend know it's backend is JavaScript or Web
+ https://bugs.webkit.org/show_bug.cgi?id=126016
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/LoadInspectorBackendCommands.js:
+ If the debuggable target is "web" load both JS and Web backend commands.
+ Otherwise, we only load the default, js backend commands.
+
</ins><span class="cx"> 2013-12-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fixed Win64 build on VS2013.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceLoadInspectorBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/LoadInspectorBackendCommands.js (160886 => 160887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/LoadInspectorBackendCommands.js 2013-12-20 01:55:01 UTC (rev 160886)
+++ trunk/Source/WebInspectorUI/UserInterface/LoadInspectorBackendCommands.js 2013-12-20 01:59:19 UTC (rev 160887)
</span><span class="lines">@@ -32,10 +32,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!backendURLs) {
</span><del>- // FIXME: When we can inspect just a JSContext, we should not load InspectorWebBackendCommands.js.
- backendURLs = [];
- backendURLs.push("InspectorJSBackendCommands.js");
- backendURLs.push("InspectorWebBackendCommands.js");
</del><ins>+ backendURLs = ["InspectorJSBackendCommands.js"];
+ if (InspectorFrontendHost.debuggableType() === "web")
+ backendURLs.push("InspectorWebBackendCommands.js");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> console.assert(backendURLs.length);
</span></span></pre>
</div>
</div>
</body>
</html>