<!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>[163987] trunk/Source/WebCore</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/163987">163987</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-12 14:36:24 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Rename PageInjectedScript* to WebInjectedScript*
https://bugs.webkit.org/show_bug.cgi?id=128660
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-02-12
Reviewed by Timothy Hatcher.
Rename the files update build systems and users.
* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* inspector/CommandLineAPIModule.cpp:
(WebCore::CommandLineAPIModule::host):
* inspector/InspectorAllInOne.cpp:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
* inspector/InspectorController.h:
* inspector/InspectorHeapProfilerAgent.cpp:
(WebCore::InspectorHeapProfilerAgent::InspectorHeapProfilerAgent):
* inspector/InspectorHeapProfilerAgent.h:
* inspector/InspectorProfilerAgent.cpp:
(WebCore::PageProfilerAgent::PageProfilerAgent):
(WebCore::InspectorProfilerAgent::create):
(WebCore::WorkerProfilerAgent::WorkerProfilerAgent):
(WebCore::InspectorProfilerAgent::InspectorProfilerAgent):
* inspector/InspectorProfilerAgent.h:
* inspector/PageConsoleAgent.cpp:
(WebCore::PageConsoleAgent::PageConsoleAgent):
(WebCore::PageConsoleAgent::addInspectedNode):
* inspector/PageConsoleAgent.h:
* inspector/WebConsoleAgent.cpp:
(WebCore::WebConsoleAgent::WebConsoleAgent):
(WebCore::WebConsoleAgent::frameWindowDiscarded):
(WebCore::WebConsoleAgent::addInspectedHeapObject):
* inspector/WebConsoleAgent.h:
* inspector/WebInjectedScriptHost.cpp: Renamed from Source/WebCore/inspector/PageInjectedScriptHost.cpp.
(WebCore::WebInjectedScriptHost::type):
(WebCore::WebInjectedScriptHost::isHTMLAllCollection):
* inspector/WebInjectedScriptHost.h: Renamed from Source/WebCore/inspector/PageInjectedScriptHost.h.
* inspector/WebInjectedScriptManager.cpp: Renamed from Source/WebCore/inspector/PageInjectedScriptManager.cpp.
(WebCore::WebInjectedScriptManager::WebInjectedScriptManager):
(WebCore::WebInjectedScriptManager::disconnect):
(WebCore::WebInjectedScriptManager::didCreateInjectedScript):
(WebCore::WebInjectedScriptManager::discardInjectedScriptsFor):
* inspector/WebInjectedScriptManager.h: Renamed from Source/WebCore/inspector/PageInjectedScriptManager.h.
* inspector/WorkerConsoleAgent.cpp:
(WebCore::WorkerConsoleAgent::WorkerConsoleAgent):
* inspector/WorkerConsoleAgent.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
* inspector/WorkerInspectorController.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreinspectorCommandLineAPIModulecpp">trunk/Source/WebCore/inspector/CommandLineAPIModule.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorAllInOnecpp">trunk/Source/WebCore/inspector/InspectorAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorHeapProfilerAgentcpp">trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorHeapProfilerAgenth">trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorProfilerAgentcpp">trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorProfilerAgenth">trunk/Source/WebCore/inspector/InspectorProfilerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageConsoleAgentcpp">trunk/Source/WebCore/inspector/PageConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageConsoleAgenth">trunk/Source/WebCore/inspector/PageConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebConsoleAgentcpp">trunk/Source/WebCore/inspector/WebConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebConsoleAgenth">trunk/Source/WebCore/inspector/WebConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerConsoleAgentcpp">trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerConsoleAgenth">trunk/Source/WebCore/inspector/WorkerConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllerh">trunk/Source/WebCore/inspector/WorkerInspectorController.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreinspectorWebInjectedScriptHostcpp">trunk/Source/WebCore/inspector/WebInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebInjectedScriptHosth">trunk/Source/WebCore/inspector/WebInjectedScriptHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebInjectedScriptManagercpp">trunk/Source/WebCore/inspector/WebInjectedScriptManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebInjectedScriptManagerh">trunk/Source/WebCore/inspector/WebInjectedScriptManager.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreinspectorPageInjectedScriptHostcpp">trunk/Source/WebCore/inspector/PageInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageInjectedScriptHosth">trunk/Source/WebCore/inspector/PageInjectedScriptHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageInjectedScriptManagercpp">trunk/Source/WebCore/inspector/PageInjectedScriptManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageInjectedScriptManagerh">trunk/Source/WebCore/inspector/PageInjectedScriptManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -1601,12 +1601,12 @@
</span><span class="cx"> inspector/NetworkResourcesData.cpp
</span><span class="cx"> inspector/PageConsoleAgent.cpp
</span><span class="cx"> inspector/PageDebuggerAgent.cpp
</span><del>- inspector/PageInjectedScriptHost.cpp
- inspector/PageInjectedScriptManager.cpp
</del><span class="cx"> inspector/PageRuntimeAgent.cpp
</span><span class="cx"> inspector/TimelineRecordFactory.cpp
</span><span class="cx"> inspector/WebConsoleAgent.cpp
</span><span class="cx"> inspector/WebDebuggerAgent.cpp
</span><ins>+ inspector/WebInjectedScriptHost.cpp
+ inspector/WebInjectedScriptManager.cpp
</ins><span class="cx"> inspector/WorkerConsoleAgent.cpp
</span><span class="cx"> inspector/WorkerDebuggerAgent.cpp
</span><span class="cx"> inspector/WorkerInspectorController.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/ChangeLog 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2014-02-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Rename PageInjectedScript* to WebInjectedScript*
+ https://bugs.webkit.org/show_bug.cgi?id=128660
+
+ Reviewed by Timothy Hatcher.
+
+ Rename the files update build systems and users.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/CommandLineAPIModule.cpp:
+ (WebCore::CommandLineAPIModule::host):
+ * inspector/InspectorAllInOne.cpp:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ * inspector/InspectorController.h:
+ * inspector/InspectorHeapProfilerAgent.cpp:
+ (WebCore::InspectorHeapProfilerAgent::InspectorHeapProfilerAgent):
+ * inspector/InspectorHeapProfilerAgent.h:
+ * inspector/InspectorProfilerAgent.cpp:
+ (WebCore::PageProfilerAgent::PageProfilerAgent):
+ (WebCore::InspectorProfilerAgent::create):
+ (WebCore::WorkerProfilerAgent::WorkerProfilerAgent):
+ (WebCore::InspectorProfilerAgent::InspectorProfilerAgent):
+ * inspector/InspectorProfilerAgent.h:
+ * inspector/PageConsoleAgent.cpp:
+ (WebCore::PageConsoleAgent::PageConsoleAgent):
+ (WebCore::PageConsoleAgent::addInspectedNode):
+ * inspector/PageConsoleAgent.h:
+ * inspector/WebConsoleAgent.cpp:
+ (WebCore::WebConsoleAgent::WebConsoleAgent):
+ (WebCore::WebConsoleAgent::frameWindowDiscarded):
+ (WebCore::WebConsoleAgent::addInspectedHeapObject):
+ * inspector/WebConsoleAgent.h:
+ * inspector/WebInjectedScriptHost.cpp: Renamed from Source/WebCore/inspector/PageInjectedScriptHost.cpp.
+ (WebCore::WebInjectedScriptHost::type):
+ (WebCore::WebInjectedScriptHost::isHTMLAllCollection):
+ * inspector/WebInjectedScriptHost.h: Renamed from Source/WebCore/inspector/PageInjectedScriptHost.h.
+ * inspector/WebInjectedScriptManager.cpp: Renamed from Source/WebCore/inspector/PageInjectedScriptManager.cpp.
+ (WebCore::WebInjectedScriptManager::WebInjectedScriptManager):
+ (WebCore::WebInjectedScriptManager::disconnect):
+ (WebCore::WebInjectedScriptManager::didCreateInjectedScript):
+ (WebCore::WebInjectedScriptManager::discardInjectedScriptsFor):
+ * inspector/WebInjectedScriptManager.h: Renamed from Source/WebCore/inspector/PageInjectedScriptManager.h.
+ * inspector/WorkerConsoleAgent.cpp:
+ (WebCore::WorkerConsoleAgent::WorkerConsoleAgent):
+ * inspector/WorkerConsoleAgent.h:
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::WorkerInspectorController):
+ * inspector/WorkerInspectorController.h:
+
</ins><span class="cx"> 2014-02-12 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed iOS Build fix after r163975.
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -3762,29 +3762,29 @@
</span><span class="cx"> Source/WebCore/inspector/InjectedScriptCanvasModule.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorApplicationCacheAgent.h \
</span><ins>+ Source/WebCore/inspector/InspectorCSSAgent.cpp \
+ Source/WebCore/inspector/InspectorCSSAgent.h \
</ins><span class="cx"> Source/WebCore/inspector/InspectorCanvasAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorCanvasAgent.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorCanvasInstrumentation.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorClient.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorClient.h \
</span><ins>+ Source/WebCore/inspector/InspectorConsoleInstrumentation.h \
</ins><span class="cx"> Source/WebCore/inspector/InspectorController.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorController.h \
</span><del>- Source/WebCore/inspector/InspectorConsoleInstrumentation.h \
</del><span class="cx"> Source/WebCore/inspector/InspectorCounters.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorCounters.h \
</span><del>- Source/WebCore/inspector/InspectorCSSAgent.cpp \
- Source/WebCore/inspector/InspectorCSSAgent.h \
- Source/WebCore/inspector/InspectorDatabaseAgent.cpp \
- Source/WebCore/inspector/InspectorDatabaseAgent.h \
- Source/WebCore/inspector/InspectorDatabaseInstrumentation.h \
- Source/WebCore/inspector/InspectorDatabaseResource.cpp \
- Source/WebCore/inspector/InspectorDatabaseResource.h \
</del><span class="cx"> Source/WebCore/inspector/InspectorDOMAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorDOMAgent.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorDOMDebuggerAgent.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorDOMStorageAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorDOMStorageAgent.h \
</span><ins>+ Source/WebCore/inspector/InspectorDatabaseAgent.cpp \
+ Source/WebCore/inspector/InspectorDatabaseAgent.h \
+ Source/WebCore/inspector/InspectorDatabaseInstrumentation.h \
+ Source/WebCore/inspector/InspectorDatabaseResource.cpp \
+ Source/WebCore/inspector/InspectorDatabaseResource.h \
</ins><span class="cx"> Source/WebCore/inspector/InspectorForwarding.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorFrontendClient.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorFrontendClientLocal.cpp \
</span><span class="lines">@@ -3795,8 +3795,8 @@
</span><span class="cx"> Source/WebCore/inspector/InspectorHeapProfilerAgent.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorHistory.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorHistory.h \
</span><ins>+ Source/WebCore/inspector/InspectorIndexedDBAgent.cpp \
</ins><span class="cx"> Source/WebCore/inspector/InspectorIndexedDBAgent.h \
</span><del>- Source/WebCore/inspector/InspectorIndexedDBAgent.cpp \
</del><span class="cx"> Source/WebCore/inspector/InspectorInputAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorInputAgent.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorInstrumentation.cpp \
</span><span class="lines">@@ -3835,10 +3835,6 @@
</span><span class="cx"> Source/WebCore/inspector/PageConsoleAgent.h \
</span><span class="cx"> Source/WebCore/inspector/PageDebuggerAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/PageDebuggerAgent.h \
</span><del>- Source/WebCore/inspector/PageInjectedScriptHost.cpp \
- Source/WebCore/inspector/PageInjectedScriptHost.h \
- Source/WebCore/inspector/PageInjectedScriptManager.cpp \
- Source/WebCore/inspector/PageInjectedScriptManager.h \
</del><span class="cx"> Source/WebCore/inspector/PageRuntimeAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/PageRuntimeAgent.h \
</span><span class="cx"> Source/WebCore/inspector/TimelineRecordFactory.cpp \
</span><span class="lines">@@ -3847,6 +3843,10 @@
</span><span class="cx"> Source/WebCore/inspector/WebConsoleAgent.h \
</span><span class="cx"> Source/WebCore/inspector/WebDebuggerAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/WebDebuggerAgent.h \
</span><ins>+ Source/WebCore/inspector/WebInjectedScriptHost.cpp \
+ Source/WebCore/inspector/WebInjectedScriptHost.h \
+ Source/WebCore/inspector/WebInjectedScriptManager.cpp \
+ Source/WebCore/inspector/WebInjectedScriptManager.h \
</ins><span class="cx"> Source/WebCore/inspector/WorkerConsoleAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/WorkerConsoleAgent.h \
</span><span class="cx"> Source/WebCore/inspector/WorkerDebuggerAgent.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -17771,7 +17771,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\PageInjectedScriptHost.cpp">
</del><ins>+ <ClCompile Include="..\inspector\PageRuntimeAgent.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17779,7 +17779,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\PageInjectedScriptManager.cpp">
</del><ins>+ <ClCompile Include="..\inspector\TimelineRecordFactory.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17787,7 +17787,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\PageRuntimeAgent.cpp">
</del><ins>+ <ClCompile Include="..\inspector\WebConsoleAgent.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17795,7 +17795,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\TimelineRecordFactory.cpp">
</del><ins>+ <ClCompile Include="..\inspector\WebDebuggerAgent.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17803,7 +17803,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\WebConsoleAgent.cpp">
</del><ins>+ <ClCompile Include="..\inspector\WorkerConsoleAgent.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17811,7 +17811,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\WebDebuggerAgent.cpp">
</del><ins>+ <ClCompile Include="..\inspector\WorkerDebuggerAgent.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17819,7 +17819,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\WorkerConsoleAgent.cpp">
</del><ins>+ <ClCompile Include="..\inspector\WebInjectedScriptHost.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17827,7 +17827,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\WorkerDebuggerAgent.cpp">
</del><ins>+ <ClCompile Include="..\inspector\WebInjectedScriptManager.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -20822,12 +20822,12 @@
</span><span class="cx"> <ClInclude Include="..\inspector\NetworkResourcesData.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\PageConsoleAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\PageDebuggerAgent.h" />
</span><del>- <ClInclude Include="..\inspector\PageInjectedScriptHost.h" />
- <ClInclude Include="..\inspector\PageInjectedScriptManager.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\PageRuntimeAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\TimelineRecordFactory.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WebConsoleAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WebDebuggerAgent.h" />
</span><ins>+ <ClInclude Include="..\inspector\WebInjectedScriptHost.h" />
+ <ClInclude Include="..\inspector\WebInjectedScriptManager.h" />
</ins><span class="cx"> <ClInclude Include="..\inspector\WorkerConsoleAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WorkerDebuggerAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WorkerInspectorController.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -4839,12 +4839,6 @@
</span><span class="cx"> <ClCompile Include="..\inspector\PageDebuggerAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\PageInjectedScriptHost.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
- <ClCompile Include="..\inspector\PageInjectedScriptManager.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\PageRuntimeAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4857,6 +4851,12 @@
</span><span class="cx"> <ClCompile Include="..\inspector\WebDebuggerAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\inspector\WebInjectedScriptHost.cpp">
+ <Filter>inspector</Filter>
+ </ClCompile>
+ <ClCompile Include="..\inspector\WebInjectedScriptManager.cpp">
+ <Filter>inspector</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\inspector\WorkerConsoleAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -12407,12 +12407,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\PageDebuggerAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\PageInjectedScriptHost.h">
- <Filter>inspector</Filter>
- </ClInclude>
- <ClInclude Include="..\inspector\PageInjectedScriptManager.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\PageRuntimeAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12425,6 +12419,12 @@
</span><span class="cx"> <ClInclude Include="..\inspector\WebDebuggerAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\inspector\WebInjectedScriptHost.h">
+ <Filter>inspector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\inspector\WebInjectedScriptManager.h">
+ <Filter>inspector</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\inspector\WorkerConsoleAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -3630,13 +3630,13 @@
</span><span class="cx"> A5732B0B136A161D005C8D7C /* DateComponents.h in Headers */ = {isa = PBXBuildFile; fileRef = A5732B09136A161D005C8D7C /* DateComponents.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A5840E1C187B74D500843B10 /* InspectorInstrumentationCookie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5840E1A187B74D500843B10 /* InspectorInstrumentationCookie.cpp */; };
</span><span class="cx"> A5840E1D187B74D500843B10 /* InspectorInstrumentationCookie.h in Headers */ = {isa = PBXBuildFile; fileRef = A5840E1B187B74D500843B10 /* InspectorInstrumentationCookie.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- A5840E24187B8AC200843B10 /* PageInjectedScriptHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5840E22187B8AC200843B10 /* PageInjectedScriptHost.cpp */; };
- A5840E25187B8AC200843B10 /* PageInjectedScriptHost.h in Headers */ = {isa = PBXBuildFile; fileRef = A5840E23187B8AC200843B10 /* PageInjectedScriptHost.h */; };
</del><ins>+ A5840E24187B8AC200843B10 /* WebInjectedScriptHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5840E22187B8AC200843B10 /* WebInjectedScriptHost.cpp */; };
+ A5840E25187B8AC200843B10 /* WebInjectedScriptHost.h in Headers */ = {isa = PBXBuildFile; fileRef = A5840E23187B8AC200843B10 /* WebInjectedScriptHost.h */; };
</ins><span class="cx"> A584FE2618637DAB00843B10 /* CommandLineAPIModuleSource.h in Headers */ = {isa = PBXBuildFile; fileRef = A584FE2518637DAB00843B10 /* CommandLineAPIModuleSource.h */; };
</span><span class="cx"> A584FE2B1863870F00843B10 /* CommandLineAPIModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A584FE291863870F00843B10 /* CommandLineAPIModule.cpp */; };
</span><span class="cx"> A584FE2C1863870F00843B10 /* CommandLineAPIModule.h in Headers */ = {isa = PBXBuildFile; fileRef = A584FE2A1863870F00843B10 /* CommandLineAPIModule.h */; };
</span><del>- A584FE2F1864CB8400843B10 /* PageInjectedScriptManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A584FE2D1864CB8400843B10 /* PageInjectedScriptManager.cpp */; };
- A584FE301864CB8400843B10 /* PageInjectedScriptManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A584FE2E1864CB8400843B10 /* PageInjectedScriptManager.h */; };
</del><ins>+ A584FE2F1864CB8400843B10 /* WebInjectedScriptManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A584FE2D1864CB8400843B10 /* WebInjectedScriptManager.cpp */; };
+ A584FE301864CB8400843B10 /* WebInjectedScriptManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A584FE2E1864CB8400843B10 /* WebInjectedScriptManager.h */; };
</ins><span class="cx"> A584FE341864D5AF00843B10 /* CommandLineAPIHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A584FE311864D5AF00843B10 /* CommandLineAPIHost.cpp */; };
</span><span class="cx"> A584FE351864D5AF00843B10 /* CommandLineAPIHost.h in Headers */ = {isa = PBXBuildFile; fileRef = A584FE321864D5AF00843B10 /* CommandLineAPIHost.h */; };
</span><span class="cx"> A584FE381864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A584FE371864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp */; };
</span><span class="lines">@@ -10594,14 +10594,14 @@
</span><span class="cx"> A5732B09136A161D005C8D7C /* DateComponents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateComponents.h; sourceTree = "<group>"; };
</span><span class="cx"> A5840E1A187B74D500843B10 /* InspectorInstrumentationCookie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorInstrumentationCookie.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A5840E1B187B74D500843B10 /* InspectorInstrumentationCookie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorInstrumentationCookie.h; sourceTree = "<group>"; };
</span><del>- A5840E22187B8AC200843B10 /* PageInjectedScriptHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageInjectedScriptHost.cpp; sourceTree = "<group>"; };
- A5840E23187B8AC200843B10 /* PageInjectedScriptHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageInjectedScriptHost.h; sourceTree = "<group>"; };
</del><ins>+ A5840E22187B8AC200843B10 /* WebInjectedScriptHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInjectedScriptHost.cpp; sourceTree = "<group>"; };
+ A5840E23187B8AC200843B10 /* WebInjectedScriptHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInjectedScriptHost.h; sourceTree = "<group>"; };
</ins><span class="cx"> A584FE2518637DAB00843B10 /* CommandLineAPIModuleSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLineAPIModuleSource.h; sourceTree = "<group>"; };
</span><span class="cx"> A584FE2718637DCA00843B10 /* CommandLineAPIModuleSource.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = CommandLineAPIModuleSource.js; sourceTree = "<group>"; };
</span><span class="cx"> A584FE291863870F00843B10 /* CommandLineAPIModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLineAPIModule.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A584FE2A1863870F00843B10 /* CommandLineAPIModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLineAPIModule.h; sourceTree = "<group>"; };
</span><del>- A584FE2D1864CB8400843B10 /* PageInjectedScriptManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageInjectedScriptManager.cpp; sourceTree = "<group>"; };
- A584FE2E1864CB8400843B10 /* PageInjectedScriptManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageInjectedScriptManager.h; sourceTree = "<group>"; };
</del><ins>+ A584FE2D1864CB8400843B10 /* WebInjectedScriptManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebInjectedScriptManager.cpp; sourceTree = "<group>"; };
+ A584FE2E1864CB8400843B10 /* WebInjectedScriptManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebInjectedScriptManager.h; sourceTree = "<group>"; };
</ins><span class="cx"> A584FE311864D5AF00843B10 /* CommandLineAPIHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLineAPIHost.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A584FE321864D5AF00843B10 /* CommandLineAPIHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLineAPIHost.h; sourceTree = "<group>"; };
</span><span class="cx"> A584FE331864D5AF00843B10 /* CommandLineAPIHost.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CommandLineAPIHost.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -14875,10 +14875,6 @@
</span><span class="cx"> F382088B147D35F90010BC06 /* PageConsoleAgent.h */,
</span><span class="cx"> F34742DA134362F000531BC2 /* PageDebuggerAgent.cpp */,
</span><span class="cx"> F34742DB134362F000531BC2 /* PageDebuggerAgent.h */,
</span><del>- A5840E22187B8AC200843B10 /* PageInjectedScriptHost.cpp */,
- A5840E23187B8AC200843B10 /* PageInjectedScriptHost.h */,
- A584FE2D1864CB8400843B10 /* PageInjectedScriptManager.cpp */,
- A584FE2E1864CB8400843B10 /* PageInjectedScriptManager.h */,
</del><span class="cx"> F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */,
</span><span class="cx"> F382088D147D35F90010BC06 /* PageRuntimeAgent.h */,
</span><span class="cx"> 9FA37EEF1172FD4100C4CD55 /* ScriptProfile.idl */,
</span><span class="lines">@@ -14889,6 +14885,10 @@
</span><span class="cx"> A56C5B99189F34570082D13C /* WebConsoleAgent.h */,
</span><span class="cx"> A5E616711894581F009ADF50 /* WebDebuggerAgent.cpp */,
</span><span class="cx"> A5E616721894581F009ADF50 /* WebDebuggerAgent.h */,
</span><ins>+ A5840E22187B8AC200843B10 /* WebInjectedScriptHost.cpp */,
+ A5840E23187B8AC200843B10 /* WebInjectedScriptHost.h */,
+ A584FE2D1864CB8400843B10 /* WebInjectedScriptManager.cpp */,
+ A584FE2E1864CB8400843B10 /* WebInjectedScriptManager.h */,
</ins><span class="cx"> F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */,
</span><span class="cx"> F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */,
</span><span class="cx"> F34742DE1343631F00531BC2 /* WorkerDebuggerAgent.cpp */,
</span><span class="lines">@@ -23137,7 +23137,7 @@
</span><span class="cx"> 85909CDD0ACC7A7E00DF01F1 /* DOMCSSFontFaceRuleInternal.h in Headers */,
</span><span class="cx"> B562DB6117D3CD660010AF96 /* SVGElementTypeHelpers.h in Headers */,
</span><span class="cx"> 85032DDB0AA8C9BE007D3B7D /* DOMCSSImportRule.h in Headers */,
</span><del>- A5840E25187B8AC200843B10 /* PageInjectedScriptHost.h in Headers */,
</del><ins>+ A5840E25187B8AC200843B10 /* WebInjectedScriptHost.h in Headers */,
</ins><span class="cx"> 85909CDE0ACC7A7E00DF01F1 /* DOMCSSImportRuleInternal.h in Headers */,
</span><span class="cx"> 85032DDD0AA8C9BE007D3B7D /* DOMCSSMediaRule.h in Headers */,
</span><span class="cx"> 85909CDF0ACC7A7E00DF01F1 /* DOMCSSMediaRuleInternal.h in Headers */,
</span><span class="lines">@@ -25540,7 +25540,7 @@
</span><span class="cx"> 088A0E0B126EF1DB00978F7A /* SVGPropertyTearOff.h in Headers */,
</span><span class="cx"> 088A0E0C126EF1DB00978F7A /* SVGPropertyTraits.h in Headers */,
</span><span class="cx"> B2227A9A0D00BF220071B782 /* SVGRadialGradientElement.h in Headers */,
</span><del>- A584FE301864CB8400843B10 /* PageInjectedScriptManager.h in Headers */,
</del><ins>+ A584FE301864CB8400843B10 /* WebInjectedScriptManager.h in Headers */,
</ins><span class="cx"> E43A023B17EB370A004CDD25 /* RenderElement.h in Headers */,
</span><span class="cx"> 08EDE19F12A50B8E00B95797 /* SVGRect.h in Headers */,
</span><span class="cx"> B2227A9E0D00BF220071B782 /* SVGRectElement.h in Headers */,
</span><span class="lines">@@ -27210,7 +27210,7 @@
</span><span class="cx"> BCCD74E50A4C8DDF005FDA6D /* HTMLViewSourceDocument.cpp in Sources */,
</span><span class="cx"> 977B3879122883E900B81FF8 /* HTMLViewSourceParser.cpp in Sources */,
</span><span class="cx"> E1C266D818317AB4003F8B33 /* CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp in Sources */,
</span><del>- A584FE2F1864CB8400843B10 /* PageInjectedScriptManager.cpp in Sources */,
</del><ins>+ A584FE2F1864CB8400843B10 /* WebInjectedScriptManager.cpp in Sources */,
</ins><span class="cx"> 0B8C56D40F28627F000502E1 /* HTTPHeaderMap.cpp in Sources */,
</span><span class="cx"> 514C76720CE923A1007EF3CD /* HTTPParsers.cpp in Sources */,
</span><span class="cx"> 371A67CB11C6C7DB00047B8B /* HyphenationCF.cpp in Sources */,
</span><span class="lines">@@ -28605,7 +28605,7 @@
</span><span class="cx"> BCEF447A0E6747D0001C1287 /* StyleCachedImage.cpp in Sources */,
</span><span class="cx"> 9393E604151A9A1800066F06 /* StyleCachedImageSet.cpp in Sources */,
</span><span class="cx"> 31A795C81888BCB500382F90 /* ANGLEInstancedArrays.cpp in Sources */,
</span><del>- A5840E24187B8AC200843B10 /* PageInjectedScriptHost.cpp in Sources */,
</del><ins>+ A5840E24187B8AC200843B10 /* WebInjectedScriptHost.cpp in Sources */,
</ins><span class="cx"> A8C4A7FE09D563270003AC8D /* StyledElement.cpp in Sources */,
</span><span class="cx"> A56C5B9A189F34570082D13C /* WebConsoleAgent.cpp in Sources */,
</span><span class="cx"> BC5EB8B80E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorCommandLineAPIModulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/CommandLineAPIModule.cpp (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/CommandLineAPIModule.cpp 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/CommandLineAPIModule.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CommandLineAPIModuleSource.h"
</span><span class="cx"> #include "JSCommandLineAPIHost.h"
</span><del>-#include "PageInjectedScriptManager.h"
</del><ins>+#include "WebInjectedScriptManager.h"
</ins><span class="cx"> #include <inspector/InjectedScript.h>
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="lines">@@ -56,8 +56,8 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSValue CommandLineAPIModule::host(InjectedScriptManager* injectedScriptManager, JSC::ExecState* exec) const
</span><span class="cx"> {
</span><del>- // CommandLineAPIModule should only ever be used by a PageInjectedScriptManager.
- PageInjectedScriptManager* pageInjectedScriptManager = static_cast<PageInjectedScriptManager*>(injectedScriptManager);
</del><ins>+ // CommandLineAPIModule should only ever be used by a WebInjectedScriptManager.
+ WebInjectedScriptManager* pageInjectedScriptManager = static_cast<WebInjectedScriptManager*>(injectedScriptManager);
</ins><span class="cx"> ASSERT(pageInjectedScriptManager->commandLineAPIHost());
</span><span class="cx"> JSDOMGlobalObject* globalObject = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject());
</span><span class="cx"> return toJS(exec, globalObject, pageInjectedScriptManager->commandLineAPIHost());
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAllInOne.cpp (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -64,12 +64,12 @@
</span><span class="cx"> #include "NetworkResourcesData.cpp"
</span><span class="cx"> #include "PageConsoleAgent.cpp"
</span><span class="cx"> #include "PageDebuggerAgent.cpp"
</span><del>-#include "PageInjectedScriptHost.cpp"
-#include "PageInjectedScriptManager.cpp"
</del><span class="cx"> #include "PageRuntimeAgent.cpp"
</span><span class="cx"> #include "TimelineRecordFactory.cpp"
</span><span class="cx"> #include "WebConsoleAgent.cpp"
</span><span class="cx"> #include "WebDebuggerAgent.cpp"
</span><ins>+#include "WebInjectedScriptHost.cpp"
+#include "WebInjectedScriptManager.cpp"
</ins><span class="cx"> #include "WorkerConsoleAgent.cpp"
</span><span class="cx"> #include "WorkerDebuggerAgent.cpp"
</span><span class="cx"> #include "WorkerInspectorController.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -67,10 +67,10 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageConsoleAgent.h"
</span><span class="cx"> #include "PageDebuggerAgent.h"
</span><del>-#include "PageInjectedScriptHost.h"
-#include "PageInjectedScriptManager.h"
</del><span class="cx"> #include "PageRuntimeAgent.h"
</span><span class="cx"> #include "Settings.h"
</span><ins>+#include "WebInjectedScriptHost.h"
+#include "WebInjectedScriptManager.h"
</ins><span class="cx"> #include <inspector/IdentifiersFactory.h>
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <inspector/agents/InspectorAgent.h>
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> InspectorController::InspectorController(Page& page, InspectorClient* inspectorClient)
</span><span class="cx"> : m_instrumentingAgents(InstrumentingAgents::create(*this))
</span><del>- , m_injectedScriptManager(std::make_unique<PageInjectedScriptManager>(*this, PageInjectedScriptHost::create()))
</del><ins>+ , m_injectedScriptManager(std::make_unique<WebInjectedScriptManager>(*this, WebInjectedScriptHost::create()))
</ins><span class="cx"> , m_overlay(std::make_unique<InspectorOverlay>(page, inspectorClient))
</span><span class="cx"> , m_inspectorFrontendChannel(nullptr)
</span><span class="cx"> , m_page(page)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx"> class DOMWrapperWorld;
</span><span class="cx"> class Frame;
</span><span class="cx"> class GraphicsContext;
</span><del>-class InspectorApplicationCacheAgent;
</del><span class="cx"> class InspectorClient;
</span><span class="cx"> class InspectorDOMAgent;
</span><span class="cx"> class InspectorDOMDebuggerAgent;
</span><span class="lines">@@ -66,11 +65,9 @@
</span><span class="cx"> class InspectorProfilerAgent;
</span><span class="cx"> class InspectorResourceAgent;
</span><span class="cx"> class InstrumentingAgents;
</span><del>-class IntSize;
-class Page;
-class PageInjectedScriptManager;
</del><span class="cx"> class Node;
</span><del>-
</del><ins>+class Page;
+class WebInjectedScriptManager;
</ins><span class="cx"> struct Highlight;
</span><span class="cx">
</span><span class="cx"> class InspectorController final : public Inspector::InspectorEnvironment {
</span><span class="lines">@@ -145,7 +142,7 @@
</span><span class="cx"> friend InstrumentingAgents* instrumentationForPage(Page*);
</span><span class="cx">
</span><span class="cx"> RefPtr<InstrumentingAgents> m_instrumentingAgents;
</span><del>- std::unique_ptr<PageInjectedScriptManager> m_injectedScriptManager;
</del><ins>+ std::unique_ptr<WebInjectedScriptManager> m_injectedScriptManager;
</ins><span class="cx"> std::unique_ptr<InspectorOverlay> m_overlay;
</span><span class="cx">
</span><span class="cx"> Inspector::InspectorAgent* m_inspectorAgent;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorHeapProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx">
</span><span class="cx"> #include "CommandLineAPIHost.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><del>-#include "PageInjectedScriptManager.h"
</del><span class="cx"> #include "ScriptProfiler.h"
</span><ins>+#include "WebInjectedScriptManager.h"
</ins><span class="cx"> #include <inspector/InjectedScript.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> static const char* const UserInitiatedProfileNameHeap = "org.webkit.profiles.user-initiated";
</span><span class="cx">
</span><del>-InspectorHeapProfilerAgent::InspectorHeapProfilerAgent(InstrumentingAgents* instrumentingAgents, PageInjectedScriptManager* injectedScriptManager)
</del><ins>+InspectorHeapProfilerAgent::InspectorHeapProfilerAgent(InstrumentingAgents* instrumentingAgents, WebInjectedScriptManager* injectedScriptManager)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("HeapProfiler"), instrumentingAgents)
</span><span class="cx"> , m_injectedScriptManager(injectedScriptManager)
</span><span class="cx"> , m_nextUserInitiatedHeapSnapshotNumber(1)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorHeapProfilerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/InspectorHeapProfilerAgent.h 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -44,16 +44,15 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class PageInjectedScriptManager;
</del><span class="cx"> class ScriptHeapSnapshot;
</span><del>-class ScriptProfile;
</del><ins>+class WebInjectedScriptManager;
</ins><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><span class="cx"> class InspectorHeapProfilerAgent : public InspectorAgentBase, public Inspector::InspectorHeapProfilerBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorHeapProfilerAgent); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- InspectorHeapProfilerAgent(InstrumentingAgents*, PageInjectedScriptManager*);
</del><ins>+ InspectorHeapProfilerAgent(InstrumentingAgents*, WebInjectedScriptManager*);
</ins><span class="cx"> virtual ~InspectorHeapProfilerAgent();
</span><span class="cx">
</span><span class="cx"> virtual void collectGarbage(ErrorString*) override;
</span><span class="lines">@@ -81,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Inspector::TypeBuilder::HeapProfiler::ProfileHeader> createSnapshotHeader(const ScriptHeapSnapshot&);
</span><span class="cx">
</span><del>- PageInjectedScriptManager* m_injectedScriptManager;
</del><ins>+ WebInjectedScriptManager* m_injectedScriptManager;
</ins><span class="cx"> std::unique_ptr<Inspector::InspectorHeapProfilerFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::InspectorHeapProfilerBackendDispatcher> m_backendDispatcher;
</span><span class="cx"> unsigned m_nextUserInitiatedHeapSnapshotNumber;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -37,12 +37,12 @@
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="cx"> #include "Page.h"
</span><del>-#include "PageInjectedScriptManager.h"
</del><span class="cx"> #include "PageScriptDebugServer.h"
</span><span class="cx"> #include "ScriptHeapSnapshot.h"
</span><span class="cx"> #include "ScriptProfile.h"
</span><span class="cx"> #include "ScriptProfiler.h"
</span><span class="cx"> #include "URL.h"
</span><ins>+#include "WebInjectedScriptManager.h"
</ins><span class="cx"> #include "WorkerScriptDebugServer.h"
</span><span class="cx"> #include <bindings/ScriptObject.h>
</span><span class="cx"> #include <inspector/ConsoleTypes.h>
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> class PageProfilerAgent : public InspectorProfilerAgent {
</span><span class="cx"> public:
</span><del>- PageProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, Page* inspectedPage, PageInjectedScriptManager* injectedScriptManager)
</del><ins>+ PageProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, Page* inspectedPage, WebInjectedScriptManager* injectedScriptManager)
</ins><span class="cx"> : InspectorProfilerAgent(instrumentingAgents, consoleAgent, injectedScriptManager), m_inspectedPage(inspectedPage) { }
</span><span class="cx"> virtual ~PageProfilerAgent() { }
</span><span class="cx">
</span><span class="lines">@@ -87,14 +87,14 @@
</span><span class="cx"> Page* m_inspectedPage;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-std::unique_ptr<InspectorProfilerAgent> InspectorProfilerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, Page* inspectedPage, PageInjectedScriptManager* injectedScriptManager)
</del><ins>+std::unique_ptr<InspectorProfilerAgent> InspectorProfilerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, Page* inspectedPage, WebInjectedScriptManager* injectedScriptManager)
</ins><span class="cx"> {
</span><span class="cx"> return std::make_unique<PageProfilerAgent>(instrumentingAgents, consoleAgent, inspectedPage, injectedScriptManager);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class WorkerProfilerAgent : public InspectorProfilerAgent {
</span><span class="cx"> public:
</span><del>- WorkerProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, WorkerGlobalScope* workerGlobalScope, PageInjectedScriptManager* injectedScriptManager)
</del><ins>+ WorkerProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, WorkerGlobalScope* workerGlobalScope, WebInjectedScriptManager* injectedScriptManager)
</ins><span class="cx"> : InspectorProfilerAgent(instrumentingAgents, consoleAgent, injectedScriptManager), m_workerGlobalScope(workerGlobalScope) { }
</span><span class="cx"> virtual ~WorkerProfilerAgent() { }
</span><span class="cx">
</span><span class="lines">@@ -114,12 +114,12 @@
</span><span class="cx"> WorkerGlobalScope* m_workerGlobalScope;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-std::unique_ptr<InspectorProfilerAgent> InspectorProfilerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, WorkerGlobalScope* workerGlobalScope, PageInjectedScriptManager* injectedScriptManager)
</del><ins>+std::unique_ptr<InspectorProfilerAgent> InspectorProfilerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, WorkerGlobalScope* workerGlobalScope, WebInjectedScriptManager* injectedScriptManager)
</ins><span class="cx"> {
</span><span class="cx"> return std::make_unique<WorkerProfilerAgent>(instrumentingAgents, consoleAgent, workerGlobalScope, injectedScriptManager);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorProfilerAgent::InspectorProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, PageInjectedScriptManager* injectedScriptManager)
</del><ins>+InspectorProfilerAgent::InspectorProfilerAgent(InstrumentingAgents* instrumentingAgents, InspectorConsoleAgent* consoleAgent, WebInjectedScriptManager* injectedScriptManager)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Profiler"), instrumentingAgents)
</span><span class="cx"> , m_consoleAgent(consoleAgent)
</span><span class="cx"> , m_injectedScriptManager(injectedScriptManager)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorProfilerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorProfilerAgent.h (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorProfilerAgent.h 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/InspectorProfilerAgent.h 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -51,9 +51,9 @@
</span><span class="cx">
</span><span class="cx"> class InstrumentingAgents;
</span><span class="cx"> class Page;
</span><del>-class PageInjectedScriptManager;
</del><span class="cx"> class ScriptHeapSnapshot;
</span><span class="cx"> class ScriptProfile;
</span><ins>+class WebInjectedScriptManager;
</ins><span class="cx"> class WorkerGlobalScope;
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> class InspectorProfilerAgent : public InspectorAgentBase, public Inspector::InspectorProfilerBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorProfilerAgent); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static std::unique_ptr<InspectorProfilerAgent> create(InstrumentingAgents*, Inspector::InspectorConsoleAgent*, Page*, PageInjectedScriptManager*);
- static std::unique_ptr<InspectorProfilerAgent> create(InstrumentingAgents*, Inspector::InspectorConsoleAgent*, WorkerGlobalScope*, PageInjectedScriptManager*);
</del><ins>+ static std::unique_ptr<InspectorProfilerAgent> create(InstrumentingAgents*, Inspector::InspectorConsoleAgent*, Page*, WebInjectedScriptManager*);
+ static std::unique_ptr<InspectorProfilerAgent> create(InstrumentingAgents*, Inspector::InspectorConsoleAgent*, WorkerGlobalScope*, WebInjectedScriptManager*);
</ins><span class="cx">
</span><span class="cx"> virtual ~InspectorProfilerAgent();
</span><span class="cx">
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> virtual void getHeapObjectId(ErrorString*, const String& objectId, String* heapSnapshotObjectId) override;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- InspectorProfilerAgent(InstrumentingAgents*, Inspector::InspectorConsoleAgent*, PageInjectedScriptManager*);
</del><ins>+ InspectorProfilerAgent(InstrumentingAgents*, Inspector::InspectorConsoleAgent*, WebInjectedScriptManager*);
</ins><span class="cx"> virtual void startProfiling(const String& title) = 0;
</span><span class="cx"> virtual PassRefPtr<ScriptProfile> stopProfiling(const String& title) = 0;
</span><span class="cx">
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> PassRefPtr<Inspector::TypeBuilder::Profiler::ProfileHeader> createSnapshotHeader(const ScriptHeapSnapshot&);
</span><span class="cx">
</span><span class="cx"> Inspector::InspectorConsoleAgent* m_consoleAgent;
</span><del>- PageInjectedScriptManager* m_injectedScriptManager;
</del><ins>+ WebInjectedScriptManager* m_injectedScriptManager;
</ins><span class="cx"> std::unique_ptr<Inspector::InspectorProfilerFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::InspectorProfilerBackendDispatcher> m_backendDispatcher;
</span><span class="cx"> bool m_enabled;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.cpp (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -36,13 +36,13 @@
</span><span class="cx"> #include "CommandLineAPIHost.h"
</span><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="cx"> #include "Node.h"
</span><del>-#include "PageInjectedScriptManager.h"
</del><ins>+#include "WebInjectedScriptManager.h"
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PageConsoleAgent::PageConsoleAgent(PageInjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent)
</del><ins>+PageConsoleAgent::PageConsoleAgent(WebInjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent)
</ins><span class="cx"> : WebConsoleAgent(injectedScriptManager)
</span><span class="cx"> , m_inspectorDOMAgent(domAgent)
</span><span class="cx"> {
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (CommandLineAPIHost* commandLineAPIHost = static_cast<PageInjectedScriptManager*>(m_injectedScriptManager)->commandLineAPIHost())
</del><ins>+ if (CommandLineAPIHost* commandLineAPIHost = static_cast<WebInjectedScriptManager*>(m_injectedScriptManager)->commandLineAPIHost())
</ins><span class="cx"> commandLineAPIHost->addInspectedObject(adoptPtr(new InspectableNode(node)));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.h (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.h 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.h 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PageConsoleAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- PageConsoleAgent(PageInjectedScriptManager*, InspectorDOMAgent*);
</del><ins>+ PageConsoleAgent(WebInjectedScriptManager*, InspectorDOMAgent*);
</ins><span class="cx"> virtual ~PageConsoleAgent() { }
</span><span class="cx">
</span><span class="cx"> virtual bool isWorkerAgent() const override { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageInjectedScriptHostcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/PageInjectedScriptHost.cpp (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageInjectedScriptHost.cpp 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/PageInjectedScriptHost.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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. ``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
- * 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 "PageInjectedScriptHost.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "JSHTMLAllCollection.h"
-#include "JSHTMLCollection.h"
-#include "JSNode.h"
-#include "JSNodeList.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-JSValue PageInjectedScriptHost::type(JSC::ExecState* exec, JSC::JSValue value)
-{
- if (value.inherits(JSNode::info()))
- return jsNontrivialString(exec, ASCIILiteral("node"));
- if (value.inherits(JSNodeList::info()))
- return jsNontrivialString(exec, ASCIILiteral("array"));
- if (value.inherits(JSHTMLCollection::info()))
- return jsNontrivialString(exec, ASCIILiteral("array"));
-
- return jsUndefined();
-}
-
-bool PageInjectedScriptHost::isHTMLAllCollection(JSC::JSValue value)
-{
- return value.inherits(JSHTMLAllCollection::info());
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageInjectedScriptHosth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/PageInjectedScriptHost.h (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageInjectedScriptHost.h 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/PageInjectedScriptHost.h 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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. ``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
- * 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.
- */
-
-#ifndef PageInjectedScriptHost_h
-#define PageInjectedScriptHost_h
-
-#if ENABLE(INSPECTOR)
-
-#include <inspector/InjectedScriptHost.h>
-
-namespace WebCore {
-
-// FIXME: Rename to WebInjectedScriptHost.
-class PageInjectedScriptHost final : public Inspector::InjectedScriptHost {
-public:
- static PassRefPtr<PageInjectedScriptHost> create() { return adoptRef(new PageInjectedScriptHost); }
-
- virtual JSC::JSValue type(JSC::ExecState*, JSC::JSValue) override;
- virtual bool isHTMLAllCollection(JSC::JSValue) override;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(PageInjectedScriptHost_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageInjectedScriptManagercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/PageInjectedScriptManager.cpp (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageInjectedScriptManager.cpp 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/PageInjectedScriptManager.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -1,88 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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. ``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
- * 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 "PageInjectedScriptManager.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "CommandLineAPIModule.h"
-#include "ScriptState.h"
-
-using namespace Inspector;
-
-namespace WebCore {
-
-PageInjectedScriptManager::PageInjectedScriptManager(InspectorEnvironment& environment, PassRefPtr<InjectedScriptHost> host)
- : InjectedScriptManager(environment, host)
- , m_commandLineAPIHost(CommandLineAPIHost::create())
-{
-}
-
-void PageInjectedScriptManager::disconnect()
-{
- InjectedScriptManager::disconnect();
-
- m_commandLineAPIHost->disconnect();
- m_commandLineAPIHost.clear();
-}
-
-void PageInjectedScriptManager::didCreateInjectedScript(InjectedScript injectedScript)
-{
- CommandLineAPIModule::injectIfNeeded(this, injectedScript);
-}
-
-void PageInjectedScriptManager::discardInjectedScriptsFor(DOMWindow* window)
-{
- if (m_scriptStateToId.isEmpty())
- return;
-
- Vector<long> idsToRemove;
- for (const auto& it : m_idToInjectedScript) {
- JSC::ExecState* scriptState = it.value.scriptState();
- if (window != domWindowFromExecState(scriptState))
- continue;
- m_scriptStateToId.remove(scriptState);
- idsToRemove.append(it.key);
- }
-
- for (size_t i = 0; i < idsToRemove.size(); i++)
- m_idToInjectedScript.remove(idsToRemove[i]);
-
- // Now remove script states that have id but no injected script.
- Vector<JSC::ExecState*> scriptStatesToRemove;
- for (const auto& it : m_scriptStateToId) {
- JSC::ExecState* scriptState = it.key;
- if (window == domWindowFromExecState(scriptState))
- scriptStatesToRemove.append(scriptState);
- }
-
- for (size_t i = 0; i < scriptStatesToRemove.size(); i++)
- m_scriptStateToId.remove(scriptStatesToRemove[i]);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageInjectedScriptManagerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/PageInjectedScriptManager.h (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageInjectedScriptManager.h 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/PageInjectedScriptManager.h 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -1,62 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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. ``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
- * 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.
- */
-
-#ifndef PageInjectedScriptManager_h
-#define PageInjectedScriptManager_h
-
-#if ENABLE(INSPECTOR)
-
-#include "CommandLineAPIHost.h"
-#include <inspector/InjectedScriptManager.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class DOMWindow;
-
-// FIXME: Rename to WebInjectedScriptManager.
-class PageInjectedScriptManager final : public Inspector::InjectedScriptManager {
-public:
- PageInjectedScriptManager(Inspector::InspectorEnvironment&, PassRefPtr<Inspector::InjectedScriptHost>);
- virtual ~PageInjectedScriptManager() { }
-
- CommandLineAPIHost* commandLineAPIHost() const { return m_commandLineAPIHost.get(); }
-
- virtual void disconnect() override;
-
- void discardInjectedScriptsFor(DOMWindow*);
-
-protected:
- virtual void didCreateInjectedScript(Inspector::InjectedScript) override;
-
-private:
- RefPtr<CommandLineAPIHost> m_commandLineAPIHost;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(PageInjectedScriptManager_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebConsoleAgent.cpp (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebConsoleAgent.cpp 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/WebConsoleAgent.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> #include "CommandLineAPIHost.h"
</span><span class="cx"> #include "Console.h"
</span><span class="cx"> #include "DOMWindow.h"
</span><del>-#include "PageInjectedScriptManager.h"
</del><span class="cx"> #include "ResourceError.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "ScriptProfiler.h"
</span><span class="cx"> #include "ScriptState.h"
</span><ins>+#include "WebInjectedScriptManager.h"
</ins><span class="cx"> #include <inspector/ConsoleMessage.h>
</span><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebConsoleAgent::WebConsoleAgent(PageInjectedScriptManager* injectedScriptManager)
</del><ins>+WebConsoleAgent::WebConsoleAgent(WebInjectedScriptManager* injectedScriptManager)
</ins><span class="cx"> : InspectorConsoleAgent(injectedScriptManager)
</span><span class="cx"> , m_monitoringXHREnabled(false)
</span><span class="cx"> {
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> m_consoleMessages[i]->clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static_cast<PageInjectedScriptManager*>(m_injectedScriptManager)->discardInjectedScriptsFor(window);
</del><ins>+ static_cast<WebInjectedScriptManager*>(m_injectedScriptManager)->discardInjectedScriptsFor(window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebConsoleAgent::didFinishXHRLoading(unsigned long requestIdentifier, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">
</span><span class="cx"> void WebConsoleAgent::addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId)
</span><span class="cx"> {
</span><del>- if (CommandLineAPIHost* commandLineAPIHost = static_cast<PageInjectedScriptManager*>(m_injectedScriptManager)->commandLineAPIHost())
</del><ins>+ if (CommandLineAPIHost* commandLineAPIHost = static_cast<WebInjectedScriptManager*>(m_injectedScriptManager)->commandLineAPIHost())
</ins><span class="cx"> commandLineAPIHost->addInspectedObject(adoptPtr(new InspectableHeapObject(inspectedHeapObjectId)));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebConsoleAgent.h (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebConsoleAgent.h 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/WebConsoleAgent.h 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -33,16 +33,16 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class DOMWindow;
</span><del>-class PageInjectedScriptManager;
</del><span class="cx"> class ResourceError;
</span><span class="cx"> class ResourceResponse;
</span><ins>+class WebInjectedScriptManager;
</ins><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><span class="cx"> class WebConsoleAgent : public Inspector::InspectorConsoleAgent {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WebConsoleAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- WebConsoleAgent(PageInjectedScriptManager*);
</del><ins>+ WebConsoleAgent(WebInjectedScriptManager*);
</ins><span class="cx"> virtual ~WebConsoleAgent() { }
</span><span class="cx">
</span><span class="cx"> virtual void setMonitoringXHREnabled(ErrorString*, bool enabled) override final;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebInjectedScriptHostcppfromrev163986trunkSourceWebCoreinspectorPageInjectedScriptHostcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/inspector/WebInjectedScriptHost.cpp (from rev 163986, trunk/Source/WebCore/inspector/PageInjectedScriptHost.cpp) (0 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebInjectedScriptHost.cpp (rev 0)
+++ trunk/Source/WebCore/inspector/WebInjectedScriptHost.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+/*
+ * Copyright (C) 2013 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. ``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
+ * 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 "WebInjectedScriptHost.h"
+
+#if ENABLE(INSPECTOR)
+
+#include "JSHTMLAllCollection.h"
+#include "JSHTMLCollection.h"
+#include "JSNode.h"
+#include "JSNodeList.h"
+
+using namespace JSC;
+
+namespace WebCore {
+
+JSValue WebInjectedScriptHost::type(JSC::ExecState* exec, JSC::JSValue value)
+{
+ if (value.inherits(JSNode::info()))
+ return jsNontrivialString(exec, ASCIILiteral("node"));
+ if (value.inherits(JSNodeList::info()))
+ return jsNontrivialString(exec, ASCIILiteral("array"));
+ if (value.inherits(JSHTMLCollection::info()))
+ return jsNontrivialString(exec, ASCIILiteral("array"));
+
+ return jsUndefined();
+}
+
+bool WebInjectedScriptHost::isHTMLAllCollection(JSC::JSValue value)
+{
+ return value.inherits(JSHTMLAllCollection::info());
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebInjectedScriptHosthfromrev163986trunkSourceWebCoreinspectorPageInjectedScriptHosth"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/inspector/WebInjectedScriptHost.h (from rev 163986, trunk/Source/WebCore/inspector/PageInjectedScriptHost.h) (0 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebInjectedScriptHost.h (rev 0)
+++ trunk/Source/WebCore/inspector/WebInjectedScriptHost.h 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+/*
+ * Copyright (C) 2013 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. ``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
+ * 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.
+ */
+
+#ifndef WebInjectedScriptHost_h
+#define WebInjectedScriptHost_h
+
+#if ENABLE(INSPECTOR)
+
+#include <inspector/InjectedScriptHost.h>
+
+namespace WebCore {
+
+class WebInjectedScriptHost final : public Inspector::InjectedScriptHost {
+public:
+ static PassRefPtr<WebInjectedScriptHost> create() { return adoptRef(new WebInjectedScriptHost); }
+
+ virtual JSC::JSValue type(JSC::ExecState*, JSC::JSValue) override;
+ virtual bool isHTMLAllCollection(JSC::JSValue) override;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
+
+#endif // !defined(WebInjectedScriptHost_h)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebInjectedScriptManagercppfromrev163986trunkSourceWebCoreinspectorPageInjectedScriptManagercpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/inspector/WebInjectedScriptManager.cpp (from rev 163986, trunk/Source/WebCore/inspector/PageInjectedScriptManager.cpp) (0 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebInjectedScriptManager.cpp (rev 0)
+++ trunk/Source/WebCore/inspector/WebInjectedScriptManager.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -0,0 +1,88 @@
</span><ins>+/*
+ * Copyright (C) 2013 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. ``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
+ * 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 "WebInjectedScriptManager.h"
+
+#if ENABLE(INSPECTOR)
+
+#include "CommandLineAPIModule.h"
+#include "ScriptState.h"
+
+using namespace Inspector;
+
+namespace WebCore {
+
+WebInjectedScriptManager::WebInjectedScriptManager(InspectorEnvironment& environment, PassRefPtr<InjectedScriptHost> host)
+ : InjectedScriptManager(environment, host)
+ , m_commandLineAPIHost(CommandLineAPIHost::create())
+{
+}
+
+void WebInjectedScriptManager::disconnect()
+{
+ InjectedScriptManager::disconnect();
+
+ m_commandLineAPIHost->disconnect();
+ m_commandLineAPIHost.clear();
+}
+
+void WebInjectedScriptManager::didCreateInjectedScript(InjectedScript injectedScript)
+{
+ CommandLineAPIModule::injectIfNeeded(this, injectedScript);
+}
+
+void WebInjectedScriptManager::discardInjectedScriptsFor(DOMWindow* window)
+{
+ if (m_scriptStateToId.isEmpty())
+ return;
+
+ Vector<long> idsToRemove;
+ for (const auto& it : m_idToInjectedScript) {
+ JSC::ExecState* scriptState = it.value.scriptState();
+ if (window != domWindowFromExecState(scriptState))
+ continue;
+ m_scriptStateToId.remove(scriptState);
+ idsToRemove.append(it.key);
+ }
+
+ for (size_t i = 0; i < idsToRemove.size(); i++)
+ m_idToInjectedScript.remove(idsToRemove[i]);
+
+ // Now remove script states that have id but no injected script.
+ Vector<JSC::ExecState*> scriptStatesToRemove;
+ for (const auto& it : m_scriptStateToId) {
+ JSC::ExecState* scriptState = it.key;
+ if (window == domWindowFromExecState(scriptState))
+ scriptStatesToRemove.append(scriptState);
+ }
+
+ for (size_t i = 0; i < scriptStatesToRemove.size(); i++)
+ m_scriptStateToId.remove(scriptStatesToRemove[i]);
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebInjectedScriptManagerhfromrev163986trunkSourceWebCoreinspectorPageInjectedScriptManagerh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/inspector/WebInjectedScriptManager.h (from rev 163986, trunk/Source/WebCore/inspector/PageInjectedScriptManager.h) (0 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebInjectedScriptManager.h (rev 0)
+++ trunk/Source/WebCore/inspector/WebInjectedScriptManager.h 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+/*
+ * Copyright (C) 2013 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. ``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
+ * 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.
+ */
+
+#ifndef WebInjectedScriptManager_h
+#define WebInjectedScriptManager_h
+
+#if ENABLE(INSPECTOR)
+
+#include "CommandLineAPIHost.h"
+#include <inspector/InjectedScriptManager.h>
+#include <wtf/RefPtr.h>
+
+namespace WebCore {
+
+class DOMWindow;
+
+class WebInjectedScriptManager final : public Inspector::InjectedScriptManager {
+public:
+ WebInjectedScriptManager(Inspector::InspectorEnvironment&, PassRefPtr<Inspector::InjectedScriptHost>);
+ virtual ~WebInjectedScriptManager() { }
+
+ CommandLineAPIHost* commandLineAPIHost() const { return m_commandLineAPIHost.get(); }
+
+ virtual void disconnect() override;
+
+ void discardInjectedScriptsFor(DOMWindow*);
+
+protected:
+ virtual void didCreateInjectedScript(Inspector::InjectedScript) override;
+
+private:
+ RefPtr<CommandLineAPIHost> m_commandLineAPIHost;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(INSPECTOR)
+
+#endif // !defined(WebInjectedScriptManager_h)
</ins></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WorkerConsoleAgent::WorkerConsoleAgent(PageInjectedScriptManager* injectedScriptManager)
</del><ins>+WorkerConsoleAgent::WorkerConsoleAgent(WebInjectedScriptManager* injectedScriptManager)
</ins><span class="cx"> : WebConsoleAgent(injectedScriptManager)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.h (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WorkerConsoleAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- WorkerConsoleAgent(PageInjectedScriptManager*);
</del><ins>+ WorkerConsoleAgent(WebInjectedScriptManager*);
</ins><span class="cx"> virtual ~WorkerConsoleAgent() { }
</span><span class="cx">
</span><span class="cx"> virtual bool isWorkerAgent() const override { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><del>-#include "PageInjectedScriptHost.h"
-#include "PageInjectedScriptManager.h"
</del><ins>+#include "WebInjectedScriptHost.h"
+#include "WebInjectedScriptManager.h"
</ins><span class="cx"> #include "WorkerConsoleAgent.h"
</span><span class="cx"> #include "WorkerDebuggerAgent.h"
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope& workerGlobalScope)
</span><span class="cx"> : m_workerGlobalScope(workerGlobalScope)
</span><span class="cx"> , m_instrumentingAgents(InstrumentingAgents::create(*this))
</span><del>- , m_injectedScriptManager(std::make_unique<PageInjectedScriptManager>(*this, PageInjectedScriptHost::create()))
</del><ins>+ , m_injectedScriptManager(std::make_unique<WebInjectedScriptManager>(*this, WebInjectedScriptHost::create()))
</ins><span class="cx"> , m_runtimeAgent(nullptr)
</span><span class="cx"> {
</span><span class="cx"> auto runtimeAgent = std::make_unique<WorkerRuntimeAgent>(m_injectedScriptManager.get(), &workerGlobalScope);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.h (163986 => 163987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.h 2014-02-12 22:32:38 UTC (rev 163986)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.h 2014-02-12 22:36:24 UTC (rev 163987)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> class InspectorInstrumentation;
</span><span class="cx"> class InstrumentingAgents;
</span><del>-class PageInjectedScriptManager;
</del><ins>+class WebInjectedScriptManager;
</ins><span class="cx"> class WorkerGlobalScope;
</span><span class="cx"> class WorkerRuntimeAgent;
</span><span class="cx">
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> WorkerGlobalScope& m_workerGlobalScope;
</span><span class="cx"> RefPtr<InstrumentingAgents> m_instrumentingAgents;
</span><del>- std::unique_ptr<PageInjectedScriptManager> m_injectedScriptManager;
</del><ins>+ std::unique_ptr<WebInjectedScriptManager> m_injectedScriptManager;
</ins><span class="cx"> WorkerRuntimeAgent* m_runtimeAgent;
</span><span class="cx"> Inspector::InspectorAgentRegistry m_agents;
</span><span class="cx"> std::unique_ptr<InspectorFrontendChannel> m_frontendChannel;
</span></span></pre>
</div>
</div>
</body>
</html>