<!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>[175362] trunk/Source/JavaScriptCore</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/175362">175362</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-29 19:29:42 -0700 (Wed, 29 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Fix Type Dependency Issues
https://bugs.webkit.org/show_bug.cgi?id=125664

Patch by Joseph Pecoraro &lt;pecoraro@apple.com&gt; on 2014-10-29
Reviewed by Brian Burg.

Now that all JSON protocol files are processed together again
in <a href="http://trac.webkit.org/projects/webkit/changeset/174892">r174892</a>, we can remove the duplicated types which were only
needed when the domains were split.

* inspector/protocol/Console.json:
* inspector/protocol/Runtime.json:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolConsolejson">trunk/Source/JavaScriptCore/inspector/protocol/Console.json</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolRuntimejson">trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (175361 => 175362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-10-30 01:18:32 UTC (rev 175361)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-10-30 02:29:42 UTC (rev 175362)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-10-29  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
+
+        Web Inspector: Fix Type Dependency Issues
+        https://bugs.webkit.org/show_bug.cgi?id=125664
+
+        Reviewed by Brian Burg.
+
+        Now that all JSON protocol files are processed together again
+        in r174892, we can remove the duplicated types which were only
+        needed when the domains were split.
+
+        * inspector/protocol/Console.json:
+        * inspector/protocol/Runtime.json:
+
</ins><span class="cx"> 2014-10-28  Commit Queue  &lt;commit-queue@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r175249.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolConsolejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Console.json (175361 => 175362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Console.json        2014-10-30 01:18:32 UTC (rev 175361)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Console.json        2014-10-30 02:29:42 UTC (rev 175362)
</span><span class="lines">@@ -3,16 +3,6 @@
</span><span class="cx">     &quot;description&quot;: &quot;Console domain defines methods and events for interaction with the JavaScript console. Console collects messages created by means of the &lt;a href='http://getfirebug.com/wiki/index.php/Console_API'&gt;JavaScript Console API&lt;/a&gt;. One needs to enable this domain using &lt;code&gt;enable&lt;/code&gt; command in order to start receiving the console messages. Browser collects messages issued while console domain is not enabled as well and reports them using &lt;code&gt;messageAdded&lt;/code&gt; notification upon enabling.&quot;,
</span><span class="cx">     &quot;types&quot;: [
</span><span class="cx">         {
</span><del>-            &quot;id&quot;: &quot;ConsoleNetworkRequestId&quot;,
-            &quot;type&quot;: &quot;string&quot;,
-            &quot;description&quot;: &quot;Unique request identifier. FIXME: Duplicate of Network.RequestId &lt;https://webkit.org/b/125664&gt; Web Inspector: FIX Type Dependency Issues&quot;
-        },
-        {
-            &quot;id&quot;: &quot;ConsoleDOMNodeId&quot;,
-            &quot;type&quot;: &quot;integer&quot;,
-            &quot;description&quot;: &quot;Unique DOM node identifier. FIXME: Duplicate of DOM.NodeId &lt;https://webkit.org/b/125664&gt; Web Inspector: FIX Type Dependency Issues&quot;
-        },
-        {
</del><span class="cx">             &quot;id&quot;: &quot;ConsoleMessage&quot;,
</span><span class="cx">             &quot;type&quot;: &quot;object&quot;,
</span><span class="cx">             &quot;description&quot;: &quot;Console message.&quot;,
</span><span class="lines">@@ -27,7 +17,7 @@
</span><span class="cx">                 { &quot;name&quot;: &quot;repeatCount&quot;, &quot;type&quot;: &quot;integer&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Repeat count for repeated messages.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;parameters&quot;, &quot;type&quot;: &quot;array&quot;, &quot;items&quot;: { &quot;$ref&quot;: &quot;Runtime.RemoteObject&quot; }, &quot;optional&quot;: true, &quot;description&quot;: &quot;Message parameters in case of the formatted message.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;stackTrace&quot;, &quot;$ref&quot;: &quot;StackTrace&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;JavaScript stack trace for assertions and error messages.&quot; },
</span><del>-                { &quot;name&quot;: &quot;networkRequestId&quot;, &quot;$ref&quot;: &quot;ConsoleNetworkRequestId&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Identifier of the network request associated with this message.&quot; }
</del><ins>+                { &quot;name&quot;: &quot;networkRequestId&quot;, &quot;$ref&quot;: &quot;Network.RequestId&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Identifier of the network request associated with this message.&quot; }
</ins><span class="cx">             ]
</span><span class="cx">         },
</span><span class="cx">         {
</span><span class="lines">@@ -71,7 +61,7 @@
</span><span class="cx">         {
</span><span class="cx">             &quot;name&quot;: &quot;addInspectedNode&quot;,
</span><span class="cx">             &quot;parameters&quot;: [
</span><del>-                { &quot;name&quot;: &quot;nodeId&quot;, &quot;$ref&quot;: &quot;ConsoleDOMNodeId&quot;, &quot;description&quot;: &quot;DOM node id to be accessible by means of $x command line API.&quot; }
</del><ins>+                { &quot;name&quot;: &quot;nodeId&quot;, &quot;$ref&quot;: &quot;DOM.NodeId&quot;, &quot;description&quot;: &quot;DOM node id to be accessible by means of $x command line API.&quot; }
</ins><span class="cx">             ],
</span><span class="cx">             &quot;description&quot;: &quot;Enables console to refer to the node with given id via $x (see Command Line API for more details $x functions).&quot;
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolRuntimejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json (175361 => 175362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json        2014-10-30 01:18:32 UTC (rev 175361)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Runtime.json        2014-10-30 02:29:42 UTC (rev 175362)
</span><span class="lines">@@ -82,11 +82,6 @@
</span><span class="cx">             &quot;description&quot;: &quot;Id of an execution context.&quot;
</span><span class="cx">         },
</span><span class="cx">         {
</span><del>-            &quot;id&quot;: &quot;RuntimeFrameId&quot;,
-            &quot;type&quot;: &quot;string&quot;,
-            &quot;description&quot;: &quot;Unique frame identifier. FIXME: Duplicate of Network.FrameId &lt;https://webkit.org/b/125664&gt; Web Inspector: FIX Type Dependency Issues&quot;
-        },
-        {
</del><span class="cx">             &quot;id&quot;: &quot;ExecutionContextDescription&quot;,
</span><span class="cx">             &quot;type&quot;: &quot;object&quot;,
</span><span class="cx">             &quot;description&quot;: &quot;Description of an isolated world.&quot;,
</span><span class="lines">@@ -94,7 +89,7 @@
</span><span class="cx">                 { &quot;name&quot;: &quot;id&quot;, &quot;$ref&quot;: &quot;ExecutionContextId&quot;, &quot;description&quot;: &quot;Unique id of the execution context. It can be used to specify in which execution context script evaluation should be performed.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;isPageContext&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;description&quot;: &quot;True if this is a context where inpspected web page scripts run. False if it is a content script isolated context.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;name&quot;, &quot;type&quot;: &quot;string&quot;, &quot;description&quot;: &quot;Human readable name describing given context.&quot;},
</span><del>-                { &quot;name&quot;: &quot;frameId&quot;, &quot;$ref&quot;: &quot;RuntimeFrameId&quot;, &quot;description&quot;: &quot;Id of the owning frame.&quot; }
</del><ins>+                { &quot;name&quot;: &quot;frameId&quot;, &quot;$ref&quot;: &quot;Network.FrameId&quot;, &quot;description&quot;: &quot;Id of the owning frame.&quot; }
</ins><span class="cx">             ]
</span><span class="cx">         },
</span><span class="cx">         {
</span></span></pre>
</div>
</div>

</body>
</html>