<!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>[164614] 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/164614">164614</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-24 15:25:25 -0800 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prune dead code for Web Inspector canvas instrumentation.
<https://webkit.org/b/129269>
This was leftover code from Chromium's inspector. It's not used by
today's WebKit inspector.
Reviewed by Timothy Hatcher.
* CMakeLists.txt:
* DerivedSources.make:
* GNUmakefile.am:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSHTMLCanvasElementCustom.cpp:
(WebCore::JSHTMLCanvasElement::getContext):
* inspector/InjectedScriptCanvasModule.cpp: Removed.
* inspector/InjectedScriptCanvasModule.h: Removed.
* inspector/InspectorAllInOne.cpp:
* inspector/InspectorCanvasAgent.cpp: Removed.
* inspector/InspectorCanvasAgent.h: Removed.
* inspector/InspectorCanvasInstrumentation.h: Removed.
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::didBeginFrame):
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::frameDetachedFromParentImpl):
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
* inspector/InspectorInstrumentation.h:
* inspector/InstrumentingAgents.cpp:
(WebCore::InstrumentingAgents::InstrumentingAgents):
(WebCore::InstrumentingAgents::reset):
* inspector/InstrumentingAgents.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="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefileam">trunk/Source/WebCore/GNUmakefile.am</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="#trunkSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.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="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentscpp">trunk/Source/WebCore/inspector/InstrumentingAgents.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentsh">trunk/Source/WebCore/inspector/InstrumentingAgents.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreinspectorInjectedScriptCanvasModulecpp">trunk/Source/WebCore/inspector/InjectedScriptCanvasModule.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInjectedScriptCanvasModuleh">trunk/Source/WebCore/inspector/InjectedScriptCanvasModule.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCanvasAgentcpp">trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCanvasAgenth">trunk/Source/WebCore/inspector/InspectorCanvasAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCanvasInstrumentationh">trunk/Source/WebCore/inspector/InspectorCanvasInstrumentation.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 (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -1558,10 +1558,8 @@
</span><span class="cx"> inspector/CommandLineAPIModule.cpp
</span><span class="cx"> inspector/DOMEditor.cpp
</span><span class="cx"> inspector/DOMPatchSupport.cpp
</span><del>- inspector/InjectedScriptCanvasModule.cpp
</del><span class="cx"> inspector/InspectorApplicationCacheAgent.cpp
</span><span class="cx"> inspector/InspectorCSSAgent.cpp
</span><del>- inspector/InspectorCanvasAgent.cpp
</del><span class="cx"> inspector/InspectorClient.cpp
</span><span class="cx"> inspector/InspectorController.cpp
</span><span class="cx"> inspector/InspectorCounters.cpp
</span><span class="lines">@@ -3027,17 +3025,6 @@
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CommandLineAPIModuleSource.h)
</span><span class="cx">
</span><span class="cx">
</span><del>-# Generate InjectedScriptCanvasModuleSource.h
-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptCanvasModuleSource.h ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptCanvasModuleSource.min.js
- MAIN_DEPENDENCY inspector/InjectedScriptCanvasModuleSource.js
- DEPENDS ${WebCore_INSPECTOR_SCRIPTS_DIR}/xxd.pl ${WebCore_INSPECTOR_SCRIPTS_DIR}/jsmin.py
- COMMAND ${PYTHON_EXECUTABLE} ${WebCore_INSPECTOR_SCRIPTS_DIR}/jsmin.py < ${WEBCORE_DIR}/inspector/InjectedScriptCanvasModuleSource.js > ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptCanvasModuleSource.min.js
- COMMAND ${PERL_EXECUTABLE} ${WebCore_INSPECTOR_SCRIPTS_DIR}/xxd.pl InjectedScriptCanvasModuleSource_js ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptCanvasModuleSource.min.js ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptCanvasModuleSource.h
- VERBATIM)
-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InjectedScriptCanvasModuleSource.h)
-
-
</del><span class="cx"> MAKE_HASH_TOOLS(${WEBCORE_DIR}/platform/ColorData)
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/ColorData.cpp)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/ChangeLog 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-02-24 Andreas Kling <akling@apple.com>
+
+ Prune dead code for Web Inspector canvas instrumentation.
+ <https://webkit.org/b/129269>
+
+ This was leftover code from Chromium's inspector. It's not used by
+ today's WebKit inspector.
+
+ Reviewed by Timothy Hatcher.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSHTMLCanvasElementCustom.cpp:
+ (WebCore::JSHTMLCanvasElement::getContext):
+ * inspector/InjectedScriptCanvasModule.cpp: Removed.
+ * inspector/InjectedScriptCanvasModule.h: Removed.
+ * inspector/InspectorAllInOne.cpp:
+ * inspector/InspectorCanvasAgent.cpp: Removed.
+ * inspector/InspectorCanvasAgent.h: Removed.
+ * inspector/InspectorCanvasInstrumentation.h: Removed.
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ (WebCore::InspectorController::didBeginFrame):
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::frameDetachedFromParentImpl):
+ (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+ * inspector/InspectorInstrumentation.h:
+ * inspector/InstrumentingAgents.cpp:
+ (WebCore::InstrumentingAgents::InstrumentingAgents):
+ (WebCore::InstrumentingAgents::reset):
+ * inspector/InstrumentingAgents.h:
+
</ins><span class="cx"> 2014-02-24 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] Adjust lineTop position to the next available wrapping location at shape-outsides
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/DerivedSources.make 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -1143,13 +1143,6 @@
</span><span class="cx"> perl $(InspectorScripts)/xxd.pl CommandLineAPIModuleSource_js ./CommandLineAPIModuleSource.min.js CommandLineAPIModuleSource.h
</span><span class="cx"> rm -f ./CommandLineAPIModuleSource.min.js
</span><span class="cx">
</span><del>-all : InjectedScriptCanvasModuleSource.h
-
-InjectedScriptCanvasModuleSource.h : InjectedScriptCanvasModuleSource.js
- python $(InspectorScripts)/jsmin.py <$(WebCore)/inspector/InjectedScriptCanvasModuleSource.js > ./InjectedScriptCanvasModuleSource.min.js
- perl $(InspectorScripts)/xxd.pl InjectedScriptCanvasModuleSource_js ./InjectedScriptCanvasModuleSource.min.js InjectedScriptCanvasModuleSource.h
- rm -f ./InjectedScriptCanvasModuleSource.min.js
-
</del><span class="cx"> -include $(JS_DOM_HEADERS:.h=.dep)
</span><span class="cx">
</span><span class="cx"> # ------------------------
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.am (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.am 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/GNUmakefile.am 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -379,10 +379,6 @@
</span><span class="cx"> $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/jsmin.py <$(WebCore)/inspector/CommandLineAPIModuleSource.js > $(GENSOURCES_WEBCORE)/CommandLineAPIModuleSource.min.js
</span><span class="cx"> $(AM_V_GEN)$(PERL) $(INSPECTOR_SCRIPTS_DIR)/xxd.pl CommandLineAPIModuleSource_js $(GENSOURCES_WEBCORE)/CommandLineAPIModuleSource.min.js $(GENSOURCES_WEBCORE)/CommandLineAPIModuleSource.h
</span><span class="cx">
</span><del>-DerivedSources/WebCore/InjectedScriptCanvasModuleSource.h: $(WebCore)/inspector/InjectedScriptCanvasModuleSource.js
- $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/jsmin.py <$(WebCore)/inspector/InjectedScriptCanvasModuleSource.js > $(GENSOURCES_WEBCORE)/InjectedScriptCanvasModuleSource.min.js
- $(AM_V_GEN)$(PERL) $(INSPECTOR_SCRIPTS_DIR)/xxd.pl InjectedScriptCanvasModuleSource_js $(GENSOURCES_WEBCORE)/InjectedScriptCanvasModuleSource.min.js $(GENSOURCES_WEBCORE)/InjectedScriptCanvasModuleSource.h
-
</del><span class="cx"> if ENABLE_WEB_AUDIO
</span><span class="cx"> # Installing HRTF database wav files
</span><span class="cx"> audiodir = ${datadir}/webkitgtk-@WEBKITGTK_API_VERSION@/resources/audio/
</span><span class="lines">@@ -701,7 +697,6 @@
</span><span class="cx"> Source/WebCore/html/parser/create-html-entity-table \
</span><span class="cx"> Source/WebCore/html/parser/HTMLEntityNames.in \
</span><span class="cx"> Source/WebCore/icu/LICENSE \
</span><del>- Source/WebCore/inspector/InjectedScriptCanvasModuleSource.js \
</del><span class="cx"> Source/WebCore/inspector/InspectorOverlayPage.html \
</span><span class="cx"> Source/WebCore/LICENSE-APPLE \
</span><span class="cx"> Source/WebCore/LICENSE-LGPL-2 \
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> DerivedSources/WebCore/HTMLEntityTable.cpp \
</span><span class="cx"> DerivedSources/WebCore/HTMLNames.cpp \
</span><span class="cx"> DerivedSources/WebCore/HTMLNames.h \
</span><del>- DerivedSources/WebCore/InjectedScriptCanvasModuleSource.h \
</del><span class="cx"> DerivedSources/WebCore/InspectorOverlayPage.h \
</span><span class="cx"> DerivedSources/WebCore/InspectorWebBackendDispatchers.cpp \
</span><span class="cx"> DerivedSources/WebCore/InspectorWebBackendDispatchers.h \
</span><span class="lines">@@ -3756,15 +3755,10 @@
</span><span class="cx"> Source/WebCore/inspector/DOMEditor.h \
</span><span class="cx"> Source/WebCore/inspector/DOMPatchSupport.cpp \
</span><span class="cx"> Source/WebCore/inspector/DOMPatchSupport.h \
</span><del>- Source/WebCore/inspector/InjectedScriptCanvasModule.cpp \
- Source/WebCore/inspector/InjectedScriptCanvasModule.h \
</del><span class="cx"> Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorApplicationCacheAgent.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorCSSAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorCSSAgent.h \
</span><del>- Source/WebCore/inspector/InspectorCanvasAgent.cpp \
- Source/WebCore/inspector/InspectorCanvasAgent.h \
- Source/WebCore/inspector/InspectorCanvasInstrumentation.h \
</del><span class="cx"> Source/WebCore/inspector/InspectorClient.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorClient.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorConsoleInstrumentation.h \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -17467,14 +17467,6 @@
</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\InjectedScriptCanvasModule.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InspectorAllInOne.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -17491,14 +17483,6 @@
</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\InspectorCanvasAgent.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InspectorClient.cpp">
</span><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="lines">@@ -17919,7 +17903,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLElementFactory.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLElementTypeHelpers.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLNames.h" />
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InjectedScriptCanvasModuleSource.h" />
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorOverlayPage.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebBackendDispatchers.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.h" />
</span><span class="lines">@@ -20761,10 +20744,7 @@
</span><span class="cx"> <ClInclude Include="..\inspector\CommandLineAPIModule.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\DOMEditor.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\DOMPatchSupport.h" />
</span><del>- <ClInclude Include="..\inspector\InjectedScriptCanvasModule.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorApplicationCacheAgent.h" />
</span><del>- <ClInclude Include="..\inspector\InspectorCanvasAgent.h" />
- <ClInclude Include="..\inspector\InspectorCanvasInstrumentation.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorClient.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorConsoleInstrumentation.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorController.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -4728,18 +4728,12 @@
</span><span class="cx"> <ClCompile Include="..\inspector\DOMPatchSupport.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\InjectedScriptCanvasModule.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InspectorAllInOne.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\inspector\InspectorApplicationCacheAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\InspectorCanvasAgent.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InspectorClient.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -12266,18 +12260,9 @@
</span><span class="cx"> <ClInclude Include="..\inspector\DOMPatchSupport.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\InjectedScriptCanvasModule.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorApplicationCacheAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\InspectorCanvasAgent.h">
- <Filter>inspector</Filter>
- </ClInclude>
- <ClInclude Include="..\inspector\InspectorCanvasInstrumentation.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorClient.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12928,9 +12913,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLNames.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InjectedScriptCanvasModuleSource.h">
- <Filter>DerivedSources</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorOverlayPage.h">
</span><span class="cx"> <Filter>DerivedSources</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 (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -4131,8 +4131,6 @@
</span><span class="cx"> AA5F3B8D16CC33D100455EB0 /* PlatformSpeechSynthesizerMock.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE27B7516CBFC0D00623043 /* PlatformSpeechSynthesizerMock.h */; };
</span><span class="cx"> AA5F3B8F16CC4B3900455EB0 /* PlatformSpeechSynthesizerMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE27B7416CBFC0D00623043 /* PlatformSpeechSynthesizerMock.cpp */; };
</span><span class="cx"> AA5F3B9116CC5BEB00455EB0 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA5F3B9016CC5BEB00455EB0 /* CoreFoundation.framework */; };
</span><del>- AA73183E159255B900A93E6E /* InjectedScriptCanvasModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA73183C159255B900A93E6E /* InjectedScriptCanvasModule.cpp */; };
- AA73183F159255B900A93E6E /* InjectedScriptCanvasModule.h in Headers */ = {isa = PBXBuildFile; fileRef = AA73183D159255B900A93E6E /* InjectedScriptCanvasModule.h */; };
</del><span class="cx"> AA7FEEA416A4E6F3004C0C33 /* JSSpeechSynthesis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA7FEE9C16A4E6F3004C0C33 /* JSSpeechSynthesis.cpp */; };
</span><span class="cx"> AA7FEEA616A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA7FEE9E16A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.cpp */; };
</span><span class="cx"> AA7FEEA716A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7FEE9F16A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.h */; };
</span><span class="lines">@@ -4147,9 +4145,6 @@
</span><span class="cx"> AAA728F916D1D8BC00D3BBC6 /* AXObjectCacheIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = AAA728F316D1D8BC00D3BBC6 /* AXObjectCacheIOS.mm */; };
</span><span class="cx"> AAC08CEF15F933D600F1E188 /* SVGImageChromeClient.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC08CED15F933D600F1E188 /* SVGImageChromeClient.h */; };
</span><span class="cx"> AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC08CF115F941FC00F1E188 /* AccessibilitySVGRoot.h */; };
</span><del>- AAD766EB157E502F00E85423 /* InspectorCanvasAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAD766E8157E502F00E85423 /* InspectorCanvasAgent.cpp */; };
- AAD766EC157E502F00E85423 /* InspectorCanvasAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = AAD766E9157E502F00E85423 /* InspectorCanvasAgent.h */; };
- AAD766ED157E502F00E85423 /* InspectorCanvasInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = AAD766EA157E502F00E85423 /* InspectorCanvasInstrumentation.h */; };
</del><span class="cx"> AAF5B7B71524B6C50004CB49 /* WebSocketFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAF5B7B11524B4BD0004CB49 /* WebSocketFrame.cpp */; };
</span><span class="cx"> AB23A32709BBA7D00067CC53 /* BeforeTextInsertedEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB23A32509BBA7D00067CC53 /* BeforeTextInsertedEvent.cpp */; };
</span><span class="cx"> AB23A32809BBA7D00067CC53 /* BeforeTextInsertedEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = AB23A32609BBA7D00067CC53 /* BeforeTextInsertedEvent.h */; };
</span><span class="lines">@@ -11152,8 +11147,6 @@
</span><span class="cx"> AA4C3A740B2B1679002334A2 /* InlineStyleSheetOwner.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = InlineStyleSheetOwner.cpp; sourceTree = "<group>"; };
</span><span class="cx"> AA4C3A750B2B1679002334A2 /* InlineStyleSheetOwner.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = InlineStyleSheetOwner.h; sourceTree = "<group>"; };
</span><span class="cx"> AA5F3B9016CC5BEB00455EB0 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
</span><del>- AA73183C159255B900A93E6E /* InjectedScriptCanvasModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedScriptCanvasModule.cpp; sourceTree = "<group>"; };
- AA73183D159255B900A93E6E /* InjectedScriptCanvasModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptCanvasModule.h; sourceTree = "<group>"; };
</del><span class="cx"> AA7EA0AA17557B9000DF4643 /* UIRequestEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = UIRequestEvent.idl; sourceTree = "<group>"; };
</span><span class="cx"> AA7FEE9C16A4E6F3004C0C33 /* JSSpeechSynthesis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSpeechSynthesis.cpp; sourceTree = "<group>"; };
</span><span class="cx"> AA7FEE9E16A4E6F3004C0C33 /* JSSpeechSynthesisUtterance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSpeechSynthesisUtterance.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -11161,8 +11154,6 @@
</span><span class="cx"> AA7FEEA016A4E6F3004C0C33 /* JSSpeechSynthesisVoice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSpeechSynthesisVoice.cpp; sourceTree = "<group>"; };
</span><span class="cx"> AA7FEEA116A4E6F3004C0C33 /* JSSpeechSynthesisVoice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSpeechSynthesisVoice.h; sourceTree = "<group>"; };
</span><span class="cx"> AA7FEEAC16A4E74B004C0C33 /* JSSpeechSynthesis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSpeechSynthesis.h; sourceTree = "<group>"; };
</span><del>- AA9030FE157E16A000276247 /* InjectedScriptCanvasModuleSource.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InjectedScriptCanvasModuleSource.js; sourceTree = "<group>"; };
- AA912750157E35A500454E54 /* InjectedScriptCanvasModuleSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptCanvasModuleSource.h; sourceTree = "<group>"; };
</del><span class="cx"> AAA4FACE175D5CB300743873 /* JSUIRequestEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSUIRequestEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> AAA4FACF175D5CB300743873 /* JSUIRequestEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSUIRequestEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> AAA728F016D1D8BC00D3BBC6 /* AccessibilityObjectIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityObjectIOS.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -11172,9 +11163,6 @@
</span><span class="cx"> AAC08CED15F933D600F1E188 /* SVGImageChromeClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGImageChromeClient.h; sourceTree = "<group>"; };
</span><span class="cx"> AAC08CF015F941FC00F1E188 /* AccessibilitySVGRoot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilitySVGRoot.cpp; sourceTree = "<group>"; };
</span><span class="cx"> AAC08CF115F941FC00F1E188 /* AccessibilitySVGRoot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilitySVGRoot.h; sourceTree = "<group>"; };
</span><del>- AAD766E8157E502F00E85423 /* InspectorCanvasAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCanvasAgent.cpp; sourceTree = "<group>"; };
- AAD766E9157E502F00E85423 /* InspectorCanvasAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCanvasAgent.h; sourceTree = "<group>"; };
- AAD766EA157E502F00E85423 /* InspectorCanvasInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCanvasInstrumentation.h; sourceTree = "<group>"; };
</del><span class="cx"> AAE27B7416CBFC0D00623043 /* PlatformSpeechSynthesizerMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformSpeechSynthesizerMock.cpp; sourceTree = "<group>"; };
</span><span class="cx"> AAE27B7516CBFC0D00623043 /* PlatformSpeechSynthesizerMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformSpeechSynthesizerMock.h; sourceTree = "<group>"; };
</span><span class="cx"> AAE3755D17429BCC006200C2 /* PlatformSpeechSynthesizerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlatformSpeechSynthesizerIOS.mm; path = ios/PlatformSpeechSynthesizerIOS.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -14771,7 +14759,6 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> A584FE2518637DAB00843B10 /* CommandLineAPIModuleSource.h */,
</span><del>- AA912750157E35A500454E54 /* InjectedScriptCanvasModuleSource.h */,
</del><span class="cx"> 4F707A9711EF679400ACDA69 /* InspectorWebBackendDispatchers.cpp */,
</span><span class="cx"> 4F707A9811EF679400ACDA69 /* InspectorWebBackendDispatchers.h */,
</span><span class="cx"> 4F4F5FFA11CBD2D200A186BF /* InspectorWebFrontendDispatchers.cpp */,
</span><span class="lines">@@ -14805,14 +14792,8 @@
</span><span class="cx"> 7AABA25814BC613300AA9A11 /* DOMEditor.h */,
</span><span class="cx"> 7A54881614E432A1006AE05A /* DOMPatchSupport.cpp */,
</span><span class="cx"> 7A54881514E432A1006AE05A /* DOMPatchSupport.h */,
</span><del>- AA73183C159255B900A93E6E /* InjectedScriptCanvasModule.cpp */,
- AA73183D159255B900A93E6E /* InjectedScriptCanvasModule.h */,
- AA9030FE157E16A000276247 /* InjectedScriptCanvasModuleSource.js */,
</del><span class="cx"> B885E8D211E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp */,
</span><span class="cx"> B885E8D311E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h */,
</span><del>- AAD766E8157E502F00E85423 /* InspectorCanvasAgent.cpp */,
- AAD766E9157E502F00E85423 /* InspectorCanvasAgent.h */,
- AAD766EA157E502F00E85423 /* InspectorCanvasInstrumentation.h */,
</del><span class="cx"> 7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */,
</span><span class="cx"> 1C81B9580E97330800266E07 /* InspectorClient.h */,
</span><span class="cx"> F3F5CF1012ED81A80084C569 /* InspectorConsoleInstrumentation.h */,
</span><span class="lines">@@ -23911,7 +23892,6 @@
</span><span class="cx"> BE16C59517CFE17200852C04 /* InbandWebVTTTextTrack.h in Headers */,
</span><span class="cx"> DB23C2CC0A508D29002489EB /* IndentOutdentCommand.h in Headers */,
</span><span class="cx"> 51D719F8181106E00016DC51 /* IndexedDB.h in Headers */,
</span><del>- AA73183F159255B900A93E6E /* InjectedScriptCanvasModule.h in Headers */,
</del><span class="cx"> A8CFF5E50A155A05000A4234 /* InlineBox.h in Headers */,
</span><span class="cx"> B57CB52E182A3EFC0079A647 /* InlineElementBox.h in Headers */,
</span><span class="cx"> A8CFF5E30A155A05000A4234 /* InlineFlowBox.h in Headers */,
</span><span class="lines">@@ -23928,8 +23908,6 @@
</span><span class="cx"> 93309DF0099E64920056E581 /* InsertParagraphSeparatorCommand.h in Headers */,
</span><span class="cx"> 93309DF2099E64920056E581 /* InsertTextCommand.h in Headers */,
</span><span class="cx"> B885E8D511E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h in Headers */,
</span><del>- AAD766EC157E502F00E85423 /* InspectorCanvasAgent.h in Headers */,
- AAD766ED157E502F00E85423 /* InspectorCanvasInstrumentation.h in Headers */,
</del><span class="cx"> 1C81B95C0E97330800266E07 /* InspectorClient.h in Headers */,
</span><span class="cx"> F3F5CF1112ED81A80084C569 /* InspectorConsoleInstrumentation.h in Headers */,
</span><span class="cx"> 1C81B95A0E97330800266E07 /* InspectorController.h in Headers */,
</span><span class="lines">@@ -27276,7 +27254,6 @@
</span><span class="cx"> 07367DE0172CA68200D861B9 /* InbandTextTrackPrivateLegacyAVFObjC.mm in Sources */,
</span><span class="cx"> BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */,
</span><span class="cx"> DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */,
</span><del>- AA73183E159255B900A93E6E /* InjectedScriptCanvasModule.cpp in Sources */,
</del><span class="cx"> A8CFF5E60A155A05000A4234 /* InlineBox.cpp in Sources */,
</span><span class="cx"> B57CB52D182A3EED0079A647 /* InlineElementBox.cpp in Sources */,
</span><span class="cx"> A8CFF5E40A155A05000A4234 /* InlineFlowBox.cpp in Sources */,
</span><span class="lines">@@ -27292,7 +27269,6 @@
</span><span class="cx"> 93309DEF099E64920056E581 /* InsertParagraphSeparatorCommand.cpp in Sources */,
</span><span class="cx"> 93309DF1099E64920056E581 /* InsertTextCommand.cpp in Sources */,
</span><span class="cx"> B885E8D411E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp in Sources */,
</span><del>- AAD766EB157E502F00E85423 /* InspectorCanvasAgent.cpp in Sources */,
</del><span class="cx"> 7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */,
</span><span class="cx"> 1C81B95B0E97330800266E07 /* InspectorController.cpp in Sources */,
</span><span class="cx"> F325A40A14EE36FA007324E2 /* InspectorCounters.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CanvasContextAttributes.h"
</span><span class="cx"> #include "HTMLCanvasElement.h"
</span><del>-#include "InspectorCanvasInstrumentation.h"
</del><span class="cx"> #include "JSCanvasRenderingContext2D.h"
</span><span class="cx"> #include <bindings/ScriptObject.h>
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="lines">@@ -84,20 +83,7 @@
</span><span class="cx"> CanvasRenderingContext* context = canvas.getContext(contextId, attrs.get());
</span><span class="cx"> if (!context)
</span><span class="cx"> return jsNull();
</span><del>- JSValue jsValue = toJS(exec, globalObject(), WTF::getPtr(context));
- if (InspectorInstrumentation::canvasAgentEnabled(&canvas.document())) {
- Deprecated::ScriptObject contextObject(exec, jsValue.getObject());
- Deprecated::ScriptObject wrapped;
- if (context->is2d())
- wrapped = InspectorInstrumentation::wrapCanvas2DRenderingContextForInstrumentation(&canvas.document(), contextObject);
-#if ENABLE(WEBGL)
- else if (context->is3d())
- wrapped = InspectorInstrumentation::wrapWebGLRenderingContextForInstrumentation(&canvas.document(), contextObject);
-#endif
- if (!wrapped.hasNoValue())
- return wrapped.jsValue();
- }
- return jsValue;
</del><ins>+ return toJS(exec, globalObject(), WTF::getPtr(context));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSHTMLCanvasElement::probablySupportsContext(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInjectedScriptCanvasModulecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InjectedScriptCanvasModule.cpp (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InjectedScriptCanvasModule.cpp 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/inspector/InjectedScriptCanvasModule.cpp 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -1,216 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER 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"
-
-#if ENABLE(INSPECTOR)
-
-#include "InjectedScriptCanvasModule.h"
-
-#include "InjectedScriptCanvasModuleSource.h"
-#include "JSMainThreadExecState.h"
-#include <bindings/ScriptFunctionCall.h>
-#include <bindings/ScriptObject.h>
-#include <inspector/InjectedScript.h>
-#include <inspector/InjectedScriptManager.h>
-#include <inspector/InspectorValues.h>
-
-using Inspector::TypeBuilder::Array;
-using Inspector::TypeBuilder::Canvas::ResourceId;
-using Inspector::TypeBuilder::Canvas::ResourceInfo;
-using Inspector::TypeBuilder::Canvas::ResourceState;
-using Inspector::TypeBuilder::Canvas::TraceLog;
-using Inspector::TypeBuilder::Canvas::TraceLogId;
-
-using namespace JSC;
-using namespace Inspector;
-
-namespace WebCore {
-
-InjectedScriptCanvasModule::InjectedScriptCanvasModule()
- : Inspector::InjectedScriptModule("InjectedScriptCanvasModule")
-{
-}
-
-InjectedScriptCanvasModule InjectedScriptCanvasModule::moduleForState(InjectedScriptManager* injectedScriptManager, JSC::ExecState* scriptState)
-{
- InjectedScriptCanvasModule result;
- result.ensureInjected(injectedScriptManager, scriptState);
- return result;
-}
-
-String InjectedScriptCanvasModule::source() const
-{
- return String(reinterpret_cast<const char*>(InjectedScriptCanvasModuleSource_js), sizeof(InjectedScriptCanvasModuleSource_js));
-}
-
-JSC::JSValue InjectedScriptCanvasModule::host(InjectedScriptManager*, JSC::ExecState*) const
-{
- return jsUndefined();
-}
-
-Deprecated::ScriptObject InjectedScriptCanvasModule::wrapCanvas2DContext(const Deprecated::ScriptObject& context)
-{
- return callWrapContextFunction("wrapCanvas2DContext", context);
-}
-
-#if ENABLE(WEBGL)
-Deprecated::ScriptObject InjectedScriptCanvasModule::wrapWebGLContext(const Deprecated::ScriptObject& glContext)
-{
- return callWrapContextFunction("wrapWebGLContext", glContext);
-}
-#endif // ENABLE(WEBGL)
-
-Deprecated::ScriptObject InjectedScriptCanvasModule::callWrapContextFunction(const String& functionName, const Deprecated::ScriptObject& context)
-{
- Deprecated::ScriptFunctionCall function(injectedScriptObject(), functionName, WebCore::functionCallHandlerFromAnyThread);
- function.appendArgument(context);
- bool hadException = false;
- Deprecated::ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
- if (hadException || resultValue.hasNoValue() || !resultValue.isObject()) {
- ASSERT_NOT_REACHED();
- return Deprecated::ScriptObject();
- }
- return Deprecated::ScriptObject(context.scriptState(), resultValue);
-}
-
-void InjectedScriptCanvasModule::markFrameEnd()
-{
- Deprecated::ScriptFunctionCall function(injectedScriptObject(), "markFrameEnd", WebCore::functionCallHandlerFromAnyThread);
- RefPtr<InspectorValue> resultValue;
- makeCall(function, &resultValue);
- ASSERT(resultValue);
-}
-
-void InjectedScriptCanvasModule::captureFrame(ErrorString* errorString, TraceLogId* traceLogId)
-{
- callStartCapturingFunction("captureFrame", errorString, traceLogId);
-}
-
-void InjectedScriptCanvasModule::startCapturing(ErrorString* errorString, TraceLogId* traceLogId)
-{
- callStartCapturingFunction("startCapturing", errorString, traceLogId);
-}
-
-void InjectedScriptCanvasModule::callStartCapturingFunction(const String& functionName, ErrorString* errorString, TraceLogId* traceLogId)
-{
- Deprecated::ScriptFunctionCall function(injectedScriptObject(), functionName, WebCore::functionCallHandlerFromAnyThread);
- RefPtr<InspectorValue> resultValue;
- makeCall(function, &resultValue);
- if (!resultValue || resultValue->type() != InspectorValue::TypeString || !resultValue->asString(traceLogId))
- *errorString = "Internal error: " + functionName;
-}
-
-void InjectedScriptCanvasModule::stopCapturing(ErrorString* errorString, const TraceLogId& traceLogId)
-{
- callVoidFunctionWithTraceLogIdArgument("stopCapturing", errorString, traceLogId);
-}
-
-void InjectedScriptCanvasModule::dropTraceLog(ErrorString* errorString, const TraceLogId& traceLogId)
-{
- callVoidFunctionWithTraceLogIdArgument("dropTraceLog", errorString, traceLogId);
-}
-
-void InjectedScriptCanvasModule::callVoidFunctionWithTraceLogIdArgument(const String& functionName, ErrorString* errorString, const TraceLogId& traceLogId)
-{
- Deprecated::ScriptFunctionCall function(injectedScriptObject(), functionName, WebCore::functionCallHandlerFromAnyThread);
- function.appendArgument(traceLogId);
- bool hadException = false;
- callFunctionWithEvalEnabled(function, hadException);
- ASSERT(!hadException);
- if (hadException)
- *errorString = "Internal error: " + functionName;
-}
-
-void InjectedScriptCanvasModule::traceLog(ErrorString* errorString, const TraceLogId& traceLogId, const int* startOffset, const int* maxLength, RefPtr<TraceLog>* traceLog)
-{
- Deprecated::ScriptFunctionCall function(injectedScriptObject(), "traceLog", WebCore::functionCallHandlerFromAnyThread);
- function.appendArgument(traceLogId);
- if (startOffset)
- function.appendArgument(*startOffset);
- if (maxLength)
- function.appendArgument(*maxLength);
- RefPtr<InspectorValue> resultValue;
- makeCall(function, &resultValue);
- if (!resultValue || resultValue->type() != InspectorValue::TypeObject) {
- if (!resultValue->asString(errorString))
- *errorString = "Internal error: traceLog";
- return;
- }
- *traceLog = TraceLog::runtimeCast(resultValue);
-}
-
-void InjectedScriptCanvasModule::replayTraceLog(ErrorString* errorString, const TraceLogId& traceLogId, int stepNo, RefPtr<ResourceState>* result)
-{
- Deprecated::ScriptFunctionCall function(injectedScriptObject(), "replayTraceLog", WebCore::functionCallHandlerFromAnyThread);
- function.appendArgument(traceLogId);
- function.appendArgument(stepNo);
- RefPtr<InspectorValue> resultValue;
- makeCall(function, &resultValue);
- if (!resultValue || resultValue->type() != InspectorValue::TypeObject) {
- if (!resultValue->asString(errorString))
- *errorString = "Internal error: replayTraceLog";
- return;
- }
- *result = ResourceState::runtimeCast(resultValue);
-}
-
-void InjectedScriptCanvasModule::resourceInfo(ErrorString* errorString, const ResourceId& resourceId, RefPtr<ResourceInfo>* result)
-{
- Deprecated::ScriptFunctionCall function(injectedScriptObject(), "resourceInfo", WebCore::functionCallHandlerFromAnyThread);
- function.appendArgument(resourceId);
- RefPtr<InspectorValue> resultValue;
- makeCall(function, &resultValue);
- if (!resultValue || resultValue->type() != InspectorValue::TypeObject) {
- if (!resultValue->asString(errorString))
- *errorString = "Internal error: resourceInfo";
- return;
- }
- *result = ResourceInfo::runtimeCast(resultValue);
-}
-
-void InjectedScriptCanvasModule::resourceState(ErrorString* errorString, const TraceLogId& traceLogId, const ResourceId& resourceId, RefPtr<ResourceState>* result)
-{
- Deprecated::ScriptFunctionCall function(injectedScriptObject(), "resourceState", WebCore::functionCallHandlerFromAnyThread);
- function.appendArgument(traceLogId);
- function.appendArgument(resourceId);
- RefPtr<InspectorValue> resultValue;
- makeCall(function, &resultValue);
- if (!resultValue || resultValue->type() != InspectorValue::TypeObject) {
- if (!resultValue->asString(errorString))
- *errorString = "Internal error: resourceState";
- return;
- }
- *result = ResourceState::runtimeCast(resultValue);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInjectedScriptCanvasModuleh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InjectedScriptCanvasModule.h (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InjectedScriptCanvasModule.h 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/inspector/InjectedScriptCanvasModule.h 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -1,84 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER 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 InjectedScriptCanvasModule_h
-#define InjectedScriptCanvasModule_h
-
-#include "InspectorWebTypeBuilders.h"
-#include "ScriptState.h"
-#include <inspector/InjectedScriptModule.h>
-#include <wtf/text/WTFString.h>
-
-namespace Deprecated {
-class ScriptObject;
-}
-
-namespace WebCore {
-
-typedef String ErrorString;
-
-#if ENABLE(INSPECTOR)
-
-class InjectedScriptCanvasModule final : public Inspector::InjectedScriptModule {
-public:
- InjectedScriptCanvasModule();
-
- virtual String source() const override;
- virtual JSC::JSValue host(Inspector::InjectedScriptManager*, JSC::ExecState*) const override;
- virtual bool returnsObject() const override { return true; }
-
- static InjectedScriptCanvasModule moduleForState(Inspector::InjectedScriptManager*, JSC::ExecState*);
-
- Deprecated::ScriptObject wrapCanvas2DContext(const Deprecated::ScriptObject&);
-#if ENABLE(WEBGL)
- Deprecated::ScriptObject wrapWebGLContext(const Deprecated::ScriptObject&);
-#endif
- void markFrameEnd();
-
- void captureFrame(ErrorString*, Inspector::TypeBuilder::Canvas::TraceLogId*);
- void startCapturing(ErrorString*, Inspector::TypeBuilder::Canvas::TraceLogId*);
- void stopCapturing(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&);
- void dropTraceLog(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&);
- void traceLog(ErrorString*, const String&, const int*, const int*, RefPtr<Inspector::TypeBuilder::Canvas::TraceLog>*);
- void replayTraceLog(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&, int, RefPtr<Inspector::TypeBuilder::Canvas::ResourceState>*);
- void resourceInfo(ErrorString*, const Inspector::TypeBuilder::Canvas::ResourceId&, RefPtr<Inspector::TypeBuilder::Canvas::ResourceInfo>*);
- void resourceState(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&, const Inspector::TypeBuilder::Canvas::ResourceId&, RefPtr<Inspector::TypeBuilder::Canvas::ResourceState>*);
-
-private:
- Deprecated::ScriptObject callWrapContextFunction(const String&, const Deprecated::ScriptObject&);
- void callStartCapturingFunction(const String&, ErrorString*, String*);
- void callVoidFunctionWithTraceLogIdArgument(const String&, ErrorString*, const String&);
-};
-
-#endif
-
-} // namespace WebCore
-
-#endif // !defined(InjectedScriptCanvasModule_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAllInOne.cpp (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -29,10 +29,8 @@
</span><span class="cx"> #include "CommandLineAPIModule.cpp"
</span><span class="cx"> #include "DOMEditor.cpp"
</span><span class="cx"> #include "DOMPatchSupport.cpp"
</span><del>-#include "InjectedScriptCanvasModule.cpp"
</del><span class="cx"> #include "InspectorApplicationCacheAgent.cpp"
</span><span class="cx"> #include "InspectorCSSAgent.cpp"
</span><del>-#include "InspectorCanvasAgent.cpp"
</del><span class="cx"> #include "InspectorClient.cpp"
</span><span class="cx"> #include "InspectorController.cpp"
</span><span class="cx"> #include "InspectorCounters.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCanvasAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -1,328 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER 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"
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorCanvasAgent.h"
-
-#include "DOMWindow.h"
-#include "HTMLCanvasElement.h"
-#include "HTMLNames.h"
-#include "InjectedScriptCanvasModule.h"
-#include "InspectorPageAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
-#include "InstrumentingAgents.h"
-#include "MainFrame.h"
-#include "NodeList.h"
-#include "Page.h"
-#include "ScriptProfiler.h"
-#include "ScriptState.h"
-#include <bindings/ScriptObject.h>
-#include <inspector/InjectedScript.h>
-#include <inspector/InjectedScriptManager.h>
-
-using Inspector::TypeBuilder::Array;
-using Inspector::TypeBuilder::Canvas::ResourceId;
-using Inspector::TypeBuilder::Canvas::ResourceInfo;
-using Inspector::TypeBuilder::Canvas::ResourceState;
-using Inspector::TypeBuilder::Canvas::TraceLog;
-using Inspector::TypeBuilder::Canvas::TraceLogId;
-using Inspector::TypeBuilder::Network::FrameId;
-
-using namespace Inspector;
-
-namespace WebCore {
-
-InspectorCanvasAgent::InspectorCanvasAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager)
- : InspectorAgentBase(ASCIILiteral("Canvas"), instrumentingAgents)
- , m_pageAgent(pageAgent)
- , m_injectedScriptManager(injectedScriptManager)
- , m_enabled(false)
-{
-}
-
-InspectorCanvasAgent::~InspectorCanvasAgent()
-{
-}
-
-void InspectorCanvasAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
-{
- m_frontendDispatcher = std::make_unique<InspectorCanvasFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorCanvasBackendDispatcher::create(backendDispatcher, this);
-}
-
-void InspectorCanvasAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
-{
- m_frontendDispatcher = nullptr;
- m_backendDispatcher.clear();
-
- disable(nullptr);
-}
-
-void InspectorCanvasAgent::enable(ErrorString*)
-{
- if (m_enabled)
- return;
- m_enabled = true;
- m_instrumentingAgents->setInspectorCanvasAgent(this);
- findFramesWithUninstrumentedCanvases();
-}
-
-void InspectorCanvasAgent::disable(ErrorString*)
-{
- m_enabled = false;
- m_instrumentingAgents->setInspectorCanvasAgent(nullptr);
- m_framesWithUninstrumentedCanvases.clear();
-}
-
-void InspectorCanvasAgent::dropTraceLog(ErrorString* errorString, const TraceLogId& traceLogId)
-{
- InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, traceLogId);
- if (!module.hasNoValue())
- module.dropTraceLog(errorString, traceLogId);
-}
-
-void InspectorCanvasAgent::hasUninstrumentedCanvases(ErrorString* errorString, bool* result)
-{
- if (!checkIsEnabled(errorString))
- return;
- for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) {
- if (it->value) {
- *result = true;
- return;
- }
- }
- *result = false;
-}
-
-void InspectorCanvasAgent::captureFrame(ErrorString* errorString, const FrameId* frameId, TraceLogId* traceLogId)
-{
- Frame* frame = frameId ? m_pageAgent->assertFrame(errorString, *frameId) : m_pageAgent->mainFrame();
- if (!frame)
- return;
- InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, mainWorldExecState(frame));
- if (!module.hasNoValue())
- module.captureFrame(errorString, traceLogId);
-}
-
-void InspectorCanvasAgent::startCapturing(ErrorString* errorString, const FrameId* frameId, TraceLogId* traceLogId)
-{
- Frame* frame = frameId ? m_pageAgent->assertFrame(errorString, *frameId) : m_pageAgent->mainFrame();
- if (!frame)
- return;
- InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, mainWorldExecState(frame));
- if (!module.hasNoValue())
- module.startCapturing(errorString, traceLogId);
-}
-
-void InspectorCanvasAgent::stopCapturing(ErrorString* errorString, const TraceLogId& traceLogId)
-{
- InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, traceLogId);
- if (!module.hasNoValue())
- module.stopCapturing(errorString, traceLogId);
-}
-
-void InspectorCanvasAgent::getTraceLog(ErrorString* errorString, const TraceLogId& traceLogId, const int* startOffset, const int* maxLength, RefPtr<TraceLog>& traceLog)
-{
- InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, traceLogId);
- if (!module.hasNoValue())
- module.traceLog(errorString, traceLogId, startOffset, maxLength, &traceLog);
-}
-
-void InspectorCanvasAgent::replayTraceLog(ErrorString* errorString, const TraceLogId& traceLogId, int stepNo, RefPtr<ResourceState>& result)
-{
- InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, traceLogId);
- if (!module.hasNoValue())
- module.replayTraceLog(errorString, traceLogId, stepNo, &result);
-}
-
-void InspectorCanvasAgent::getResourceInfo(ErrorString* errorString, const ResourceId& resourceId, RefPtr<ResourceInfo>& result)
-{
- InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, resourceId);
- if (!module.hasNoValue())
- module.resourceInfo(errorString, resourceId, &result);
-}
-
-void InspectorCanvasAgent::getResourceState(ErrorString* errorString, const TraceLogId& traceLogId, const ResourceId& resourceId, RefPtr<ResourceState>& result)
-{
- InjectedScriptCanvasModule module = injectedScriptCanvasModule(errorString, traceLogId);
- if (!module.hasNoValue())
- module.resourceState(errorString, traceLogId, resourceId, &result);
-}
-
-Deprecated::ScriptObject InspectorCanvasAgent::wrapCanvas2DRenderingContextForInstrumentation(const Deprecated::ScriptObject& context)
-{
- ErrorString error;
- InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, context);
- if (module.hasNoValue())
- return Deprecated::ScriptObject();
- return notifyRenderingContextWasWrapped(module.wrapCanvas2DContext(context));
-}
-
-#if ENABLE(WEBGL)
-Deprecated::ScriptObject InspectorCanvasAgent::wrapWebGLRenderingContextForInstrumentation(const Deprecated::ScriptObject& glContext)
-{
- ErrorString error;
- InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, glContext);
- if (module.hasNoValue())
- return Deprecated::ScriptObject();
- return notifyRenderingContextWasWrapped(module.wrapWebGLContext(glContext));
-}
-#endif
-
-Deprecated::ScriptObject InspectorCanvasAgent::notifyRenderingContextWasWrapped(const Deprecated::ScriptObject& wrappedContext)
-{
- ASSERT(m_frontendDispatcher);
- JSC::ExecState* scriptState = wrappedContext.scriptState();
- DOMWindow* domWindow = scriptState ? domWindowFromExecState(scriptState) : nullptr;
- Frame* frame = domWindow ? domWindow->frame() : nullptr;
- if (frame && !m_framesWithUninstrumentedCanvases.contains(frame))
- m_framesWithUninstrumentedCanvases.set(frame, false);
- String frameId = m_pageAgent->frameId(frame);
- if (!frameId.isEmpty())
- m_frontendDispatcher->contextCreated(frameId);
- return wrappedContext;
-}
-
-InjectedScriptCanvasModule InspectorCanvasAgent::injectedScriptCanvasModule(ErrorString* errorString, JSC::ExecState* scriptState)
-{
- if (!checkIsEnabled(errorString))
- return InjectedScriptCanvasModule();
- InjectedScriptCanvasModule module = InjectedScriptCanvasModule::moduleForState(m_injectedScriptManager, scriptState);
- if (module.hasNoValue()) {
- ASSERT_NOT_REACHED();
- *errorString = "Internal error: no Canvas module";
- }
- return module;
-}
-
-InjectedScriptCanvasModule InspectorCanvasAgent::injectedScriptCanvasModule(ErrorString* errorString, const Deprecated::ScriptObject& scriptObject)
-{
- if (!checkIsEnabled(errorString))
- return InjectedScriptCanvasModule();
- if (scriptObject.hasNoValue()) {
- ASSERT_NOT_REACHED();
- *errorString = "Internal error: original Deprecated::ScriptObject has no value";
- return InjectedScriptCanvasModule();
- }
- return injectedScriptCanvasModule(errorString, scriptObject.scriptState());
-}
-
-InjectedScriptCanvasModule InspectorCanvasAgent::injectedScriptCanvasModule(ErrorString* errorString, const String& objectId)
-{
- if (!checkIsEnabled(errorString))
- return InjectedScriptCanvasModule();
- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
- if (injectedScript.hasNoValue()) {
- *errorString = "Inspected frame has gone";
- return InjectedScriptCanvasModule();
- }
- return injectedScriptCanvasModule(errorString, injectedScript.scriptState());
-}
-
-void InspectorCanvasAgent::findFramesWithUninstrumentedCanvases()
-{
- m_framesWithUninstrumentedCanvases.clear();
-
- for (Frame* frame = &m_pageAgent->page()->mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (!frame->document())
- continue;
-
- RefPtr<NodeList> canvases = frame->document()->getElementsByTagName(HTMLNames::canvasTag.localName());
- if (canvases) {
- for (unsigned i = 0, length = canvases->length(); i < length; i++) {
- const HTMLCanvasElement* canvas = toHTMLCanvasElement(canvases->item(i));
- if (canvas->renderingContext()) {
- m_framesWithUninstrumentedCanvases.set(frame, true);
- break;
- }
- }
- }
- }
-
- for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) {
- String frameId = m_pageAgent->frameId(it->key);
- if (!frameId.isEmpty())
- m_frontendDispatcher->contextCreated(frameId);
- }
-}
-
-bool InspectorCanvasAgent::checkIsEnabled(ErrorString* errorString) const
-{
- if (m_enabled)
- return true;
- *errorString = "Canvas agent is not enabled";
- return false;
-}
-
-void InspectorCanvasAgent::frameNavigated(Frame* frame)
-{
- if (!m_enabled)
- return;
- if (frame == m_pageAgent->mainFrame()) {
- for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it)
- m_framesWithUninstrumentedCanvases.set(it->key, false);
- m_frontendDispatcher->traceLogsRemoved(nullptr, nullptr);
- } else {
- while (frame) {
- if (m_framesWithUninstrumentedCanvases.contains(frame))
- m_framesWithUninstrumentedCanvases.set(frame, false);
- if (m_pageAgent->hasIdForFrame(frame)) {
- String frameId = m_pageAgent->frameId(frame);
- m_frontendDispatcher->traceLogsRemoved(&frameId, nullptr);
- }
- frame = frame->tree().traverseNext();
- }
- }
-}
-
-void InspectorCanvasAgent::frameDetached(Frame* frame)
-{
- if (m_enabled)
- m_framesWithUninstrumentedCanvases.remove(frame);
-}
-
-void InspectorCanvasAgent::didBeginFrame()
-{
- if (!m_enabled)
- return;
- ErrorString error;
- for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) {
- InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, mainWorldExecState(it->key));
- if (!module.hasNoValue())
- module.markFrameEnd();
- }
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCanvasAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorCanvasAgent.h (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCanvasAgent.h 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/inspector/InspectorCanvasAgent.h 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -1,116 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER 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 InspectorCanvasAgent_h
-#define InspectorCanvasAgent_h
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
-#include "InspectorWebTypeBuilders.h"
-#include "ScriptState.h"
-#include <wtf/HashMap.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/text/WTFString.h>
-
-namespace Deprecated {
-class ScriptObject;
-}
-
-namespace Inspector {
-class InjectedScriptManager;
-}
-
-namespace WebCore {
-
-class Frame;
-class InjectedScriptCanvasModule;
-class InspectorPageAgent;
-class InstrumentingAgents;
-
-typedef String ErrorString;
-
-class InspectorCanvasAgent : public InspectorAgentBase, public Inspector::InspectorCanvasBackendDispatcherHandler {
-public:
- InspectorCanvasAgent(InstrumentingAgents*, InspectorPageAgent*, Inspector::InjectedScriptManager*);
- ~InspectorCanvasAgent();
-
- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
-
- void frameNavigated(Frame*);
- void frameDetached(Frame*);
- void didBeginFrame();
-
- // Called from InspectorCanvasInstrumentation.
- Deprecated::ScriptObject wrapCanvas2DRenderingContextForInstrumentation(const Deprecated::ScriptObject&);
-#if ENABLE(WEBGL)
- Deprecated::ScriptObject wrapWebGLRenderingContextForInstrumentation(const Deprecated::ScriptObject&);
-#endif
-
- // Called from the front-end.
- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- virtual void dropTraceLog(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&) override;
- virtual void hasUninstrumentedCanvases(ErrorString*, bool*) override;
- virtual void captureFrame(ErrorString*, const Inspector::TypeBuilder::Network::FrameId*, Inspector::TypeBuilder::Canvas::TraceLogId*) override;
- virtual void startCapturing(ErrorString*, const Inspector::TypeBuilder::Network::FrameId*, Inspector::TypeBuilder::Canvas::TraceLogId*) override;
- virtual void stopCapturing(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&) override;
- virtual void getTraceLog(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&, const int*, const int*, RefPtr<Inspector::TypeBuilder::Canvas::TraceLog>&) override;
- virtual void replayTraceLog(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&, int, RefPtr<Inspector::TypeBuilder::Canvas::ResourceState>&) override;
- virtual void getResourceInfo(ErrorString*, const Inspector::TypeBuilder::Canvas::ResourceId&, RefPtr<Inspector::TypeBuilder::Canvas::ResourceInfo>&) override;
- virtual void getResourceState(ErrorString*, const Inspector::TypeBuilder::Canvas::TraceLogId&, const Inspector::TypeBuilder::Canvas::ResourceId&, RefPtr<Inspector::TypeBuilder::Canvas::ResourceState>&) override;
-
-private:
- InjectedScriptCanvasModule injectedScriptCanvasModule(ErrorString*, JSC::ExecState*);
- InjectedScriptCanvasModule injectedScriptCanvasModule(ErrorString*, const Deprecated::ScriptObject&);
- InjectedScriptCanvasModule injectedScriptCanvasModule(ErrorString*, const String&);
-
- void findFramesWithUninstrumentedCanvases();
- bool checkIsEnabled(ErrorString*) const;
- Deprecated::ScriptObject notifyRenderingContextWasWrapped(const Deprecated::ScriptObject&);
-
- InspectorPageAgent* m_pageAgent;
- Inspector::InjectedScriptManager* m_injectedScriptManager;
- std::unique_ptr<Inspector::InspectorCanvasFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorCanvasBackendDispatcher> m_backendDispatcher;
- bool m_enabled;
- // Contains all frames with canvases, value is true only for frames that have an uninstrumented canvas.
- typedef HashMap<Frame*, bool> FramesWithUninstrumentedCanvases;
- FramesWithUninstrumentedCanvases m_framesWithUninstrumentedCanvases;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(InspectorCanvasAgent_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCanvasInstrumentationh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorCanvasInstrumentation.h (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCanvasInstrumentation.h 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/inspector/InspectorCanvasInstrumentation.h 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Google 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER 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 InspectorCanvasInstrumentation_h
-#define InspectorCanvasInstrumentation_h
-
-#include "InspectorCanvasAgent.h"
-#include "InspectorInstrumentation.h"
-#include "InstrumentingAgents.h"
-#include <bindings/ScriptObject.h>
-
-namespace WebCore {
-
-Deprecated::ScriptObject InspectorInstrumentation::wrapCanvas2DRenderingContextForInstrumentation(Document* document, const Deprecated::ScriptObject& context)
-{
-#if ENABLE(INSPECTOR)
- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document)) {
- if (InspectorCanvasAgent* canvasAgent = instrumentingAgents->inspectorCanvasAgent())
- return canvasAgent->wrapCanvas2DRenderingContextForInstrumentation(context);
- }
-#else
- UNUSED_PARAM(document);
- UNUSED_PARAM(context);
-#endif
- return Deprecated::ScriptObject();
-}
-
-#if ENABLE(WEBGL)
-Deprecated::ScriptObject InspectorInstrumentation::wrapWebGLRenderingContextForInstrumentation(Document* document, const Deprecated::ScriptObject& glContext)
-{
-#if ENABLE(INSPECTOR)
- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document)) {
- if (InspectorCanvasAgent* canvasAgent = instrumentingAgents->inspectorCanvasAgent())
- return canvasAgent->wrapWebGLRenderingContextForInstrumentation(glContext);
- }
-#else
- UNUSED_PARAM(document);
- UNUSED_PARAM(glContext);
-#endif
- return Deprecated::ScriptObject();
-}
-#endif // ENABLE(WEBGL)
-
-} // namespace WebCore
-
-#endif // !defined(InspectorCanvasInstrumentation_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "InspectorApplicationCacheAgent.h"
</span><span class="cx"> #include "InspectorCSSAgent.h"
</span><del>-#include "InspectorCanvasAgent.h"
</del><span class="cx"> #include "InspectorClient.h"
</span><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="cx"> #include "InspectorDOMDebuggerAgent.h"
</span><span class="lines">@@ -162,8 +161,6 @@
</span><span class="cx">
</span><span class="cx"> m_agents.append(std::make_unique<InspectorWorkerAgent>(m_instrumentingAgents.get()));
</span><span class="cx">
</span><del>- m_agents.append(std::make_unique<InspectorCanvasAgent>(m_instrumentingAgents.get(), pageAgent, m_injectedScriptManager.get()));
-
</del><span class="cx"> m_agents.append(std::make_unique<InspectorInputAgent>(m_instrumentingAgents.get(), &page));
</span><span class="cx">
</span><span class="cx"> m_agents.append(std::make_unique<InspectorLayerTreeAgent>(m_instrumentingAgents.get()));
</span><span class="lines">@@ -416,8 +413,6 @@
</span><span class="cx"> {
</span><span class="cx"> if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
</span><span class="cx"> timelineAgent->didBeginFrame();
</span><del>- if (InspectorCanvasAgent* canvasAgent = m_instrumentingAgents->inspectorCanvasAgent())
- canvasAgent->didBeginFrame();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorController::didCancelFrame()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "EventDispatcher.h"
</span><span class="cx"> #include "InspectorApplicationCacheAgent.h"
</span><span class="cx"> #include "InspectorCSSAgent.h"
</span><del>-#include "InspectorCanvasAgent.h"
</del><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="cx"> #include "InspectorDOMDebuggerAgent.h"
</span><span class="cx"> #include "InspectorDOMStorageAgent.h"
</span><span class="lines">@@ -739,8 +738,6 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::frameDetachedFromParentImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
</span><span class="cx"> {
</span><del>- if (InspectorCanvasAgent* canvasAgent = instrumentingAgents->inspectorCanvasAgent())
- canvasAgent->frameDetached(frame);
</del><span class="cx"> if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent())
</span><span class="cx"> pageAgent->frameDetached(frame);
</span><span class="cx"> }
</span><span class="lines">@@ -773,8 +770,6 @@
</span><span class="cx"> }
</span><span class="cx"> if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
</span><span class="cx"> domAgent->didCommitLoad(loader->frame()->document());
</span><del>- if (InspectorCanvasAgent* canvasAgent = instrumentingAgents->inspectorCanvasAgent())
- canvasAgent->frameNavigated(loader->frame());
</del><span class="cx"> if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent())
</span><span class="cx"> pageAgent->frameNavigated(loader);
</span><span class="cx"> }
</span><span class="lines">@@ -1062,12 +1057,6 @@
</span><span class="cx"> applicationCacheAgent->updateApplicationCacheStatus(frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorInstrumentation::canvasAgentEnabled(ScriptExecutionContext* scriptExecutionContext)
-{
- InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(scriptExecutionContext);
- return instrumentingAgents && instrumentingAgents->inspectorCanvasAgent();
-}
-
</del><span class="cx"> bool InspectorInstrumentation::consoleAgentEnabled(ScriptExecutionContext* scriptExecutionContext)
</span><span class="cx"> {
</span><span class="cx"> InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(scriptExecutionContext);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -261,12 +261,10 @@
</span><span class="cx"> static void frontendCreated() { s_frontendCounter += 1; }
</span><span class="cx"> static void frontendDeleted() { s_frontendCounter -= 1; }
</span><span class="cx"> static bool hasFrontends() { return s_frontendCounter; }
</span><del>- static bool canvasAgentEnabled(ScriptExecutionContext*);
</del><span class="cx"> static bool consoleAgentEnabled(ScriptExecutionContext*);
</span><span class="cx"> static bool timelineAgentEnabled(ScriptExecutionContext*);
</span><span class="cx"> #else
</span><span class="cx"> static bool hasFrontends() { return false; }
</span><del>- static bool canvasAgentEnabled(ScriptExecutionContext*) { return false; }
</del><span class="cx"> static bool consoleAgentEnabled(ScriptExecutionContext*) { return false; }
</span><span class="cx"> static bool runtimeAgentEnabled(Frame*) { return false; }
</span><span class="cx"> static bool timelineAgentEnabled(ScriptExecutionContext*) { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.cpp (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> , m_inspectorDOMDebuggerAgent(nullptr)
</span><span class="cx"> , m_inspectorProfilerAgent(nullptr)
</span><span class="cx"> , m_inspectorWorkerAgent(nullptr)
</span><del>- , m_inspectorCanvasAgent(nullptr)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -91,7 +90,6 @@
</span><span class="cx"> m_inspectorDOMDebuggerAgent = nullptr;
</span><span class="cx"> m_inspectorProfilerAgent = nullptr;
</span><span class="cx"> m_inspectorWorkerAgent = nullptr;
</span><del>- m_inspectorCanvasAgent = nullptr;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InstrumentingAgents* instrumentationForPage(Page* page)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.h (164613 => 164614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.h 2014-02-24 23:10:32 UTC (rev 164613)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.h 2014-02-24 23:25:25 UTC (rev 164614)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx">
</span><span class="cx"> class InspectorApplicationCacheAgent;
</span><span class="cx"> class InspectorCSSAgent;
</span><del>-class InspectorCanvasAgent;
</del><span class="cx"> class InspectorDOMAgent;
</span><span class="cx"> class InspectorDOMDebuggerAgent;
</span><span class="cx"> class InspectorDOMStorageAgent;
</span><span class="lines">@@ -134,9 +133,6 @@
</span><span class="cx"> InspectorWorkerAgent* inspectorWorkerAgent() const { return m_inspectorWorkerAgent; }
</span><span class="cx"> void setInspectorWorkerAgent(InspectorWorkerAgent* agent) { m_inspectorWorkerAgent = agent; }
</span><span class="cx">
</span><del>- InspectorCanvasAgent* inspectorCanvasAgent() const { return m_inspectorCanvasAgent; }
- void setInspectorCanvasAgent(InspectorCanvasAgent* agent) { m_inspectorCanvasAgent = agent; }
-
</del><span class="cx"> InspectorLayerTreeAgent* inspectorLayerTreeAgent() const { return m_inspectorLayerTreeAgent; }
</span><span class="cx"> void setInspectorLayerTreeAgent(InspectorLayerTreeAgent* agent) { m_inspectorLayerTreeAgent = agent; }
</span><span class="cx">
</span><span class="lines">@@ -166,7 +162,6 @@
</span><span class="cx"> InspectorProfilerAgent* m_inspectorProfilerAgent;
</span><span class="cx"> InspectorHeapProfilerAgent* m_inspectorHeapProfilerAgent;
</span><span class="cx"> InspectorWorkerAgent* m_inspectorWorkerAgent;
</span><del>- InspectorCanvasAgent* m_inspectorCanvasAgent;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> InstrumentingAgents* instrumentationForPage(Page*);
</span></span></pre>
</div>
</div>
</body>
</html>