<!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>[174893] 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/174893">174893</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-20 10:59:28 -0700 (Mon, 20 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Rename generated Inspector.json to CombinedDomains.json to prevent name collisions
https://bugs.webkit.org/show_bug.cgi?id=137825
Reviewed by Timothy Hatcher.
* CMakeLists.txt:
* DerivedSources.make:
* JavaScriptCore.vcxproj/copy-files.cmd:
* JavaScriptCore.xcodeproj/project.pbxproj:
* inspector/protocol/Inspector.json: Renamed from Source/JavaScriptCore/inspector/protocol/InspectorDomain.json.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreDerivedSourcesmake">trunk/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojcopyfilescmd">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolInspectorjson">trunk/Source/JavaScriptCore/inspector/protocol/Inspector.json</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolInspectorDomainjson">trunk/Source/JavaScriptCore/inspector/protocol/InspectorDomain.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (174892 => 174893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-10-20 17:59:24 UTC (rev 174892)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-10-20 17:59:28 UTC (rev 174893)
</span><span class="lines">@@ -971,7 +971,7 @@
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOMStorage.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Debugger.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/GenericTypes.json
</span><del>- ${JAVASCRIPTCORE_DIR}/inspector/protocol/InspectorDomain.json
</del><ins>+ ${JAVASCRIPTCORE_DIR}/inspector/protocol/Inspector.json
</ins><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/LayerTree.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Network.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Page.json
</span><span class="lines">@@ -999,10 +999,10 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Inspector.json
</del><ins>+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
</ins><span class="cx"> MAIN_DEPENDENCY ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-combined-inspector-json.py
</span><span class="cx"> DEPENDS ${JavaScriptCore_INSPECTOR_DOMAINS}
</span><del>- COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-combined-inspector-json.py ${JavaScriptCore_INSPECTOR_DOMAINS} > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Inspector.json
</del><ins>+ COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-combined-inspector-json.py ${JavaScriptCore_INSPECTOR_DOMAINS} > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
</ins><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> # Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
</span><span class="lines">@@ -1014,9 +1014,9 @@
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.cpp
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.h
</span><span class="cx"> ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
</span><del>- MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Inspector.json
</del><ins>+ MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
</ins><span class="cx"> DEPENDS ${JavaScriptCore_INSPECTOR_PROTOCOL_SCRIPTS}
</span><del>- COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --framework JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Inspector.json && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && mkdir -p ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendCommands.js ${DERIVED_SOURCES_WEB
INSPECTORUI_DIR}/UserInterface/Protocol
</del><ins>+ COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --framework JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && mkdir -p ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendCommands.js ${DERIVED_SOURCE
S_WEBINSPECTORUI_DIR}/UserInterface/Protocol
</ins><span class="cx"> VERBATIM)
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (174892 => 174893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-10-20 17:59:24 UTC (rev 174892)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-10-20 17:59:28 UTC (rev 174893)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-10-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Rename generated Inspector.json to CombinedDomains.json to prevent name collisions
+ https://bugs.webkit.org/show_bug.cgi?id=137825
+
+ Reviewed by Timothy Hatcher.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * JavaScriptCore.vcxproj/copy-files.cmd:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * inspector/protocol/Inspector.json: Renamed from Source/JavaScriptCore/inspector/protocol/InspectorDomain.json.
+
+2014-10-20 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Generate all Inspector domains together in JavaScriptCore
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137748
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources.make (174892 => 174893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources.make 2014-10-20 17:59:24 UTC (rev 174892)
+++ trunk/Source/JavaScriptCore/DerivedSources.make 2014-10-20 17:59:28 UTC (rev 174893)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/DOMStorage.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Debugger.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/GenericTypes.json \
</span><del>- $(JavaScriptCore)/inspector/protocol/InspectorDomain.json \
</del><ins>+ $(JavaScriptCore)/inspector/protocol/Inspector.json \
</ins><span class="cx"> $(JavaScriptCore)/inspector/protocol/LayerTree.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Network.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Page.json \
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> all : \
</span><del>- Inspector.json \
</del><ins>+ CombinedDomains.json \
</ins><span class="cx"> InspectorFrontendDispatchers.h \
</span><span class="cx"> InjectedScriptSource.h \
</span><span class="cx"> #
</span><span class="lines">@@ -171,12 +171,12 @@
</span><span class="cx"> EnabledInspectorDomains : force
</span><span class="cx"> echo '$(INSPECTOR_DOMAINS)' | cmp -s - $@ || echo '$(INSPECTOR_DOMAINS)' > $@
</span><span class="cx">
</span><del>-Inspector.json : inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) EnabledInspectorDomains
- $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./Inspector.json
</del><ins>+CombinedDomains.json : inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) EnabledInspectorDomains
+ $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./CombinedDomains.json
</ins><span class="cx">
</span><span class="cx"> # Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
</span><del>-InspectorFrontendDispatchers.h : Inspector.json $(INSPECTOR_GENERATOR_SCRIPTS)
- $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-inspector-protocol-bindings.py --framework JavaScriptCore --outputDir . ./Inspector.json
</del><ins>+InspectorFrontendDispatchers.h : CombinedDomains.json $(INSPECTOR_GENERATOR_SCRIPTS)
+ $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-inspector-protocol-bindings.py --framework JavaScriptCore --outputDir . ./CombinedDomains.json
</ins><span class="cx">
</span><span class="cx"> InjectedScriptSource.h : inspector/InjectedScriptSource.js $(JavaScriptCore)/inspector/scripts/jsmin.py $(JavaScriptCore)/inspector/scripts/xxd.pl
</span><span class="cx"> echo "//# sourceURL=__WebInspectorInjectedScript__" > ./InjectedScriptSource.min.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojcopyfilescmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd (174892 => 174893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd 2014-10-20 17:59:24 UTC (rev 174892)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd 2014-10-20 17:59:28 UTC (rev 174893)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> echo Copying Inspector generated files as if they were private headers...
</span><del>-xcopy /y "%DerivedSourcesDirectory%\Inspector.json" "%PrivateHeadersDirectory%" >NUL
</del><ins>+xcopy /y "%DerivedSourcesDirectory%\CombinedDomains.json" "%PrivateHeadersDirectory%" >NUL
</ins><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorProtocolObjects.h" "%PrivateHeadersDirectory%" >NUL
</span><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorBackendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
</span><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorFrontendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (174892 => 174893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-10-20 17:59:24 UTC (rev 174892)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-10-20 17:59:28 UTC (rev 174893)
</span><span class="lines">@@ -1125,7 +1125,7 @@
</span><span class="cx"> A532438B18568335002ED692 /* InspectorProtocolObjects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438518568317002ED692 /* InspectorProtocolObjects.cpp */; };
</span><span class="cx"> A532438C18568335002ED692 /* InspectorProtocolObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438618568317002ED692 /* InspectorProtocolObjects.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A532439418569709002ED692 /* generate-combined-inspector-json.py in Headers */ = {isa = PBXBuildFile; fileRef = A5324391185696E6002ED692 /* generate-combined-inspector-json.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- A53243981856A489002ED692 /* Inspector.json in Headers */ = {isa = PBXBuildFile; fileRef = A53243951856A475002ED692 /* Inspector.json */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ A53243981856A489002ED692 /* CombinedDomains.json in Headers */ = {isa = PBXBuildFile; fileRef = A53243951856A475002ED692 /* CombinedDomains.json */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> A53CE08518BC1A5600BEDF76 /* ConsolePrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A53CE08118BC1A5600BEDF76 /* ConsolePrototype.cpp */; };
</span><span class="cx"> A53CE08618BC1A5600BEDF76 /* ConsolePrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = A53CE08218BC1A5600BEDF76 /* ConsolePrototype.h */; };
</span><span class="cx"> A53CE08718BC1A5600BEDF76 /* JSConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A53CE08318BC1A5600BEDF76 /* JSConsole.cpp */; };
</span><span class="lines">@@ -2797,7 +2797,7 @@
</span><span class="cx"> A532438618568317002ED692 /* InspectorProtocolObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorProtocolObjects.h; sourceTree = "<group>"; };
</span><span class="cx"> A532438D185696CA002ED692 /* protocol */ = {isa = PBXFileReference; lastKnownFileType = folder; path = protocol; sourceTree = "<group>"; };
</span><span class="cx"> A5324391185696E6002ED692 /* generate-combined-inspector-json.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "generate-combined-inspector-json.py"; sourceTree = "<group>"; };
</span><del>- A53243951856A475002ED692 /* Inspector.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Inspector.json; sourceTree = "<group>"; };
</del><ins>+ A53243951856A475002ED692 /* CombinedDomains.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = CombinedDomains.json; sourceTree = "<group>"; };
</ins><span class="cx"> A53243961856A475002ED692 /* InspectorBackendCommands.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InspectorBackendCommands.js; sourceTree = "<group>"; };
</span><span class="cx"> A53CE08118BC1A5600BEDF76 /* ConsolePrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsolePrototype.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A53CE08218BC1A5600BEDF76 /* ConsolePrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsolePrototype.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4007,10 +4007,10 @@
</span><span class="cx"> children = (
</span><span class="cx"> BC18C5230E16FC8A00B34460 /* ArrayPrototype.lut.h */,
</span><span class="cx"> 6514F21718B3E1670098FF8B /* Bytecodes.h */,
</span><ins>+ A53243951856A475002ED692 /* CombinedDomains.json */,
</ins><span class="cx"> BCD203E70E1718F4002C7E82 /* DatePrototype.lut.h */,
</span><span class="cx"> 6514F21818B3E1670098FF8B /* InitBytecodes.asm */,
</span><span class="cx"> A513E5C6185F9436007E95AD /* InjectedScriptSource.h */,
</span><del>- A53243951856A475002ED692 /* Inspector.json */,
</del><span class="cx"> A53243961856A475002ED692 /* InspectorBackendCommands.js */,
</span><span class="cx"> A532438118568317002ED692 /* InspectorBackendDispatchers.cpp */,
</span><span class="cx"> A532438218568317002ED692 /* InspectorBackendDispatchers.h */,
</span><span class="lines">@@ -5708,7 +5708,7 @@
</span><span class="cx"> A57D23E61890CEBF0031C7FA /* InspectorDebuggerAgent.h in Headers */,
</span><span class="cx"> A5D0A1BB1862301B00C7B496 /* InspectorEnvironment.h in Headers */,
</span><span class="cx"> A5945595182479EB00CC3843 /* InspectorFrontendChannel.h in Headers */,
</span><del>- A53243981856A489002ED692 /* Inspector.json in Headers */,
</del><ins>+ A53243981856A489002ED692 /* CombinedDomains.json in Headers */,
</ins><span class="cx"> A532438818568335002ED692 /* InspectorBackendDispatchers.h in Headers */,
</span><span class="cx"> A532438A18568335002ED692 /* InspectorFrontendDispatchers.h in Headers */,
</span><span class="cx"> 8606DDEA18DA44AB00A383D0 /* IdentifierInlines.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolInspectorjsonfromrev174892trunkSourceJavaScriptCoreinspectorprotocolInspectorDomainjson"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/protocol/Inspector.json (from rev 174892, trunk/Source/JavaScriptCore/inspector/protocol/InspectorDomain.json) (0 => 174893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Inspector.json (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Inspector.json 2014-10-20 17:59:28 UTC (rev 174893)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+{
+ "domain": "Inspector",
+ "types": [],
+ "commands": [
+ {
+ "name": "enable",
+ "description": "Enables inspector domain notifications."
+ },
+ {
+ "name": "disable",
+ "description": "Disables inspector domain notifications."
+ },
+ {
+ "name": "initialized",
+ "description": "Sent by the frontend after all initialization messages have been sent."
+ }
+ ],
+ "events": [
+ {
+ "name": "evaluateForTestInFrontend",
+ "parameters": [
+ { "name": "script", "type": "string" }
+ ]
+ },
+ {
+ "name": "inspect",
+ "parameters": [
+ { "name": "object", "$ref": "Runtime.RemoteObject" },
+ { "name": "hints", "type": "object" }
+ ]
+ },
+ {
+ "name": "detached",
+ "description": "Fired when remote debugging connection is about to be terminated. Contains detach reason.",
+ "parameters": [
+ { "name": "reason", "type": "string", "description": "The reason why connection has been terminated." }
+ ]
+ },
+ {
+ "name": "targetCrashed",
+ "description": "Fired when debugging target has crashed"
+ }
+ ]
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolInspectorDomainjson"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/inspector/protocol/InspectorDomain.json (174892 => 174893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/InspectorDomain.json 2014-10-20 17:59:24 UTC (rev 174892)
+++ trunk/Source/JavaScriptCore/inspector/protocol/InspectorDomain.json 2014-10-20 17:59:28 UTC (rev 174893)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-{
- "domain": "Inspector",
- "types": [],
- "commands": [
- {
- "name": "enable",
- "description": "Enables inspector domain notifications."
- },
- {
- "name": "disable",
- "description": "Disables inspector domain notifications."
- },
- {
- "name": "initialized",
- "description": "Sent by the frontend after all initialization messages have been sent."
- }
- ],
- "events": [
- {
- "name": "evaluateForTestInFrontend",
- "parameters": [
- { "name": "script", "type": "string" }
- ]
- },
- {
- "name": "inspect",
- "parameters": [
- { "name": "object", "$ref": "Runtime.RemoteObject" },
- { "name": "hints", "type": "object" }
- ]
- },
- {
- "name": "detached",
- "description": "Fired when remote debugging connection is about to be terminated. Contains detach reason.",
- "parameters": [
- { "name": "reason", "type": "string", "description": "The reason why connection has been terminated." }
- ]
- },
- {
- "name": "targetCrashed",
- "description": "Fired when debugging target has crashed"
- }
- ]
-}
</del></span></pre>
</div>
</div>
</body>
</html>