<!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>[189433] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189433">189433</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2015-09-05 09:06:23 -0700 (Sat, 05 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: agents should send messages through FrontendRouter instead of FrontendChannel
https://bugs.webkit.org/show_bug.cgi?id=148492
Reviewed by Joseph Pecoraro.
Source/JavaScriptCore:
Replace uses of FrontendChannel with FrontendRouter. Minor cleanups along the way.
Make AgentRegistry automatically signal discardAgent() in its destructor, since it always
gets executed in the owning controller's destructor anyway.
* inspector/InspectorAgentBase.h:
* inspector/InspectorAgentRegistry.cpp:
(Inspector::AgentRegistry::~AgentRegistry):
(Inspector::AgentRegistry::didCreateFrontendAndBackend):
(Inspector::AgentRegistry::willDestroyFrontendAndBackend):
(Inspector::AgentRegistry::discardAgents): Deleted.
* inspector/InspectorAgentRegistry.h:
* inspector/InspectorBackendDispatcher.cpp:
* inspector/InspectorFrontendRouter.cpp:
(Inspector::FrontendRouter::leakChannel): Deleted, no longer necessary.
* inspector/InspectorFrontendRouter.h:
* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
(Inspector::JSGlobalObjectInspectorController::connectFrontend):
(Inspector::JSGlobalObjectInspectorController::appendExtraAgent):
(Inspector::JSGlobalObjectInspectorController::~JSGlobalObjectInspectorController):
* inspector/JSGlobalObjectInspectorController.h:
* inspector/agents/InspectorAgent.cpp:
(Inspector::InspectorAgent::didCreateFrontendAndBackend):
* inspector/agents/InspectorAgent.h:
* inspector/agents/InspectorConsoleAgent.cpp:
(Inspector::InspectorConsoleAgent::didCreateFrontendAndBackend):
* inspector/agents/InspectorConsoleAgent.h:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::didCreateFrontendAndBackend):
* inspector/agents/InspectorDebuggerAgent.h:
* inspector/agents/JSGlobalObjectRuntimeAgent.cpp:
(Inspector::JSGlobalObjectRuntimeAgent::didCreateFrontendAndBackend):
* inspector/agents/JSGlobalObjectRuntimeAgent.h:
* inspector/augmentable/AlternateDispatchableAgent.h:
* inspector/remote/RemoteInspectorDebuggable.cpp:
* inspector/scripts/codegen/cpp_generator_templates.py:
* inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
(CppBackendDispatcherImplementationGenerator.generate_output):
* inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py:
(CppFrontendDispatcherHeaderGenerator.generate_output.FrontendRouter):
(CppFrontendDispatcherHeaderGenerator.generate_output):
* inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py:
(CppFrontendDispatcherImplementationGenerator.generate_output):
(CppFrontendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_event):
* inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py:
(ObjCConfigurationImplementationGenerator.generate_output):
* inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py:
(ObjCFrontendDispatcherImplementationGenerator.generate_output):
Source/WebCore:
Replace uses of FrontendChannel with FrontendRouter. Minor code cleanup along the way.
No new tests, no behavior changed.
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* inspector/InspectorApplicationCacheAgent.cpp:
(WebCore::InspectorApplicationCacheAgent::didCreateFrontendAndBackend):
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::didCreateFrontendAndBackend):
* inspector/InspectorCSSAgent.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::connectFrontend):
(WebCore::InspectorController::~InspectorController): No need to call discardAgents().
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::didCreateFrontendAndBackend):
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDOMDebuggerAgent.cpp:
(WebCore::InspectorDOMDebuggerAgent::didCreateFrontendAndBackend):
* inspector/InspectorDOMDebuggerAgent.h:
* inspector/InspectorDOMStorageAgent.cpp:
(WebCore::InspectorDOMStorageAgent::didCreateFrontendAndBackend):
* inspector/InspectorDOMStorageAgent.h:
* inspector/InspectorDatabaseAgent.cpp:
(WebCore::InspectorDatabaseAgent::didCreateFrontendAndBackend):
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorForwarding.h: Removed.
* inspector/InspectorIndexedDBAgent.cpp:
(WebCore::InspectorIndexedDBAgent::didCreateFrontendAndBackend):
* inspector/InspectorIndexedDBAgent.h:
* inspector/InspectorLayerTreeAgent.cpp:
(WebCore::InspectorLayerTreeAgent::didCreateFrontendAndBackend):
* inspector/InspectorLayerTreeAgent.h:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::didCreateFrontendAndBackend):
* inspector/InspectorPageAgent.h:
* inspector/InspectorReplayAgent.cpp:
(WebCore::InspectorReplayAgent::didCreateFrontendAndBackend):
* inspector/InspectorReplayAgent.h:
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::didCreateFrontendAndBackend):
* inspector/InspectorResourceAgent.h:
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didCreateFrontendAndBackend):
* inspector/InspectorTimelineAgent.h:
* inspector/InspectorWebAgentBase.h:
* inspector/InspectorWorkerAgent.cpp:
(WebCore::InspectorWorkerAgent::didCreateFrontendAndBackend):
* inspector/InspectorWorkerAgent.h:
* inspector/PageRuntimeAgent.cpp:
(WebCore::PageRuntimeAgent::didCreateFrontendAndBackend):
* inspector/PageRuntimeAgent.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::connectFrontend):
* inspector/WorkerInspectorController.h:
* inspector/WorkerRuntimeAgent.cpp:
(WebCore::WorkerRuntimeAgent::didCreateFrontendAndBackend):
* inspector/WorkerRuntimeAgent.h:
* page/PageDebuggable.cpp:
* testing/Internals.cpp:
Source/WebKit/mac:
* WebCoreSupport/WebInspectorClient.h: Clean up the forward declarations, don't use InspectorForwarding.h.
* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorClient::openInspectorFrontend):
Source/WebKit/win:
Stop using InspectorForwarding.h.
* WebCoreSupport/WebInspectorClient.h:
Source/WebKit2:
Stop using InspectorForwarding.h.
* WebProcess/WebPage/WebInspector.h:
* WebProcess/WebPage/WebInspectorUI.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorAgentBaseh">trunk/Source/JavaScriptCore/inspector/InspectorAgentBase.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorAgentRegistrycpp">trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorAgentRegistryh">trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorBackendDispatchercpp">trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorFrontendRoutercpp">trunk/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorFrontendRouterh">trunk/Source/JavaScriptCore/inspector/InspectorFrontendRouter.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllerh">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoraugmentableAlternateDispatchableAgenth">trunk/Source/JavaScriptCore/inspector/augmentable/AlternateDispatchableAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorDebuggablecpp">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generator_templatespy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_backend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_frontend_dispatcher_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_frontend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_backend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_frontend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp">trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth">trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgenth">trunk/Source/WebCore/inspector/InspectorCSSAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgenth">trunk/Source/WebCore/inspector/InspectorDOMAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMStorageAgenth">trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp">trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseAgenth">trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgenth">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp">trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorLayerTreeAgenth">trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgenth">trunk/Source/WebCore/inspector/InspectorPageAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorReplayAgentcpp">trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorReplayAgenth">trunk/Source/WebCore/inspector/InspectorReplayAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgenth">trunk/Source/WebCore/inspector/InspectorResourceAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWebAgentBaseh">trunk/Source/WebCore/inspector/InspectorWebAgentBase.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerAgentcpp">trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerAgenth">trunk/Source/WebCore/inspector/InspectorWorkerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageRuntimeAgentcpp">trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageRuntimeAgenth">trunk/Source/WebCore/inspector/PageRuntimeAgent.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>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgenth">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h</a></li>
<li><a href="#trunkSourceWebCorepagePageDebuggablecpp">trunk/Source/WebCore/page/PageDebuggable.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebInspectorClientIOSmm">trunk/Source/WebKit/ios/WebCoreSupport/WebInspectorClientIOS.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebInspectorClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebInspectorClienth">trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorh">trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorUIh">trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreinspectorInspectorForwardingh">trunk/Source/WebCore/inspector/InspectorForwarding.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2015-09-04 Brian Burg <bburg@apple.com>
+
+ Web Inspector: agents should send messages through FrontendRouter instead of FrontendChannel
+ https://bugs.webkit.org/show_bug.cgi?id=148492
+
+ Reviewed by Joseph Pecoraro.
+
+ Replace uses of FrontendChannel with FrontendRouter. Minor cleanups along the way.
+
+ Make AgentRegistry automatically signal discardAgent() in its destructor, since it always
+ gets executed in the owning controller's destructor anyway.
+
+ * inspector/InspectorAgentBase.h:
+ * inspector/InspectorAgentRegistry.cpp:
+ (Inspector::AgentRegistry::~AgentRegistry):
+ (Inspector::AgentRegistry::didCreateFrontendAndBackend):
+ (Inspector::AgentRegistry::willDestroyFrontendAndBackend):
+ (Inspector::AgentRegistry::discardAgents): Deleted.
+ * inspector/InspectorAgentRegistry.h:
+ * inspector/InspectorBackendDispatcher.cpp:
+ * inspector/InspectorFrontendRouter.cpp:
+ (Inspector::FrontendRouter::leakChannel): Deleted, no longer necessary.
+ * inspector/InspectorFrontendRouter.h:
+ * inspector/JSGlobalObjectInspectorController.cpp:
+ (Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
+ (Inspector::JSGlobalObjectInspectorController::connectFrontend):
+ (Inspector::JSGlobalObjectInspectorController::appendExtraAgent):
+ (Inspector::JSGlobalObjectInspectorController::~JSGlobalObjectInspectorController):
+ * inspector/JSGlobalObjectInspectorController.h:
+ * inspector/agents/InspectorAgent.cpp:
+ (Inspector::InspectorAgent::didCreateFrontendAndBackend):
+ * inspector/agents/InspectorAgent.h:
+ * inspector/agents/InspectorConsoleAgent.cpp:
+ (Inspector::InspectorConsoleAgent::didCreateFrontendAndBackend):
+ * inspector/agents/InspectorConsoleAgent.h:
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::didCreateFrontendAndBackend):
+ * inspector/agents/InspectorDebuggerAgent.h:
+ * inspector/agents/JSGlobalObjectRuntimeAgent.cpp:
+ (Inspector::JSGlobalObjectRuntimeAgent::didCreateFrontendAndBackend):
+ * inspector/agents/JSGlobalObjectRuntimeAgent.h:
+ * inspector/augmentable/AlternateDispatchableAgent.h:
+ * inspector/remote/RemoteInspectorDebuggable.cpp:
+ * inspector/scripts/codegen/cpp_generator_templates.py:
+ * inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
+ (CppBackendDispatcherImplementationGenerator.generate_output):
+ * inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py:
+ (CppFrontendDispatcherHeaderGenerator.generate_output.FrontendRouter):
+ (CppFrontendDispatcherHeaderGenerator.generate_output):
+ * inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py:
+ (CppFrontendDispatcherImplementationGenerator.generate_output):
+ (CppFrontendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_event):
+ * inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py:
+ (ObjCConfigurationImplementationGenerator.generate_output):
+ * inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py:
+ (ObjCFrontendDispatcherImplementationGenerator.generate_output):
+
</ins><span class="cx"> 2015-09-05 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Enable ES6 Module in JSC shell by default
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorAgentBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorAgentBase.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorAgentBase.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/InspectorAgentBase.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All Rights Reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx"> class BackendDispatcher;
</span><del>-class FrontendChannel;
</del><ins>+class FrontendRouter;
</ins><span class="cx">
</span><span class="cx"> enum class DisconnectReason {
</span><span class="cx"> InspectedTargetDestroyed,
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> String domainName() const { return m_name; }
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) = 0;
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) = 0;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(DisconnectReason) = 0;
</span><span class="cx"> virtual void discardAgent() { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorAgentRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -35,6 +35,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+AgentRegistry::~AgentRegistry()
+{
+ // Allow agents to remove cross-references to other agents that would otherwise
+ // make it difficult to establish a correct destruction order for all agents.
+ for (auto& agent : m_agents)
+ agent->discardAgent();
+}
+
</ins><span class="cx"> void AgentRegistry::append(std::unique_ptr<InspectorAgentBase> agent)
</span><span class="cx"> {
</span><span class="cx"> m_agents.append(WTF::move(agent));
</span><span class="lines">@@ -49,23 +57,17 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void AgentRegistry::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</del><ins>+void AgentRegistry::didCreateFrontendAndBackend(FrontendRouter* frontendRouter, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- for (size_t i = 0; i < m_agents.size(); i++)
- m_agents[i]->didCreateFrontendAndBackend(frontendChannel, backendDispatcher);
</del><ins>+ for (auto& agent : m_agents)
+ agent->didCreateFrontendAndBackend(frontendRouter, backendDispatcher);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AgentRegistry::willDestroyFrontendAndBackend(DisconnectReason reason)
</span><span class="cx"> {
</span><del>- for (size_t i = 0; i < m_agents.size(); i++)
- m_agents[i]->willDestroyFrontendAndBackend(reason);
</del><ins>+ for (auto& agent : m_agents)
+ agent->willDestroyFrontendAndBackend(reason);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void AgentRegistry::discardAgents()
-{
- for (size_t i = 0; i < m_agents.size(); i++)
- m_agents[i]->discardAgent();
-}
-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorAgentRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx"> class BackendDispatcher;
</span><del>-class FrontendChannel;
</del><ins>+class FrontendRouter;
</ins><span class="cx"> class InspectorAgentBase;
</span><span class="cx">
</span><span class="cx"> enum class DisconnectReason;
</span><span class="lines">@@ -41,12 +41,12 @@
</span><span class="cx"> class JS_EXPORT_PRIVATE AgentRegistry {
</span><span class="cx"> public:
</span><span class="cx"> AgentRegistry();
</span><ins>+ ~AgentRegistry();
</ins><span class="cx">
</span><span class="cx"> void append(std::unique_ptr<InspectorAgentBase>);
</span><span class="cx">
</span><del>- void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*);
</del><ins>+ void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*);
</ins><span class="cx"> void willDestroyFrontendAndBackend(DisconnectReason);
</span><del>- void discardAgents();
</del><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> void appendExtraAgent(std::unique_ptr<InspectorAgentBase>);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorBackendDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatcher.h"
</span><span class="cx">
</span><del>-#include "InspectorFrontendChannel.h"
</del><span class="cx"> #include "InspectorFrontendRouter.h"
</span><span class="cx"> #include "InspectorValues.h"
</span><span class="cx"> #include <wtf/TemporaryChange.h>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorFrontendRoutercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/InspectorFrontendRouter.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -65,15 +65,6 @@
</span><span class="cx"> m_connections.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: <https://webkit.org/b/148492> remove this method once agents move to using FrontendRouter directly.
-FrontendChannel* FrontendRouter::leakChannel() const
-{
- if (m_connections.size())
- return m_connections.at(0);
-
- return nullptr;
-}
-
</del><span class="cx"> bool FrontendRouter::hasLocalFrontend() const
</span><span class="cx"> {
</span><span class="cx"> for (auto* connection : m_connections) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorFrontendRouterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorFrontendRouter.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorFrontendRouter.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/InspectorFrontendRouter.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -45,9 +45,6 @@
</span><span class="cx"> void disconnectFrontend(FrontendChannel*);
</span><span class="cx"> void disconnectAllFrontends();
</span><span class="cx">
</span><del>- // FIXME: <https://webkit.org/b/148492> remove this method once agents move to using FrontendRouter directly.
- FrontendChannel* leakChannel() const;
-
</del><span class="cx"> void sendEvent(const String& message) const;
</span><span class="cx"> void sendResponse(const String& message) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -64,14 +64,9 @@
</span><span class="cx"> JSGlobalObjectInspectorController::JSGlobalObjectInspectorController(JSGlobalObject& globalObject)
</span><span class="cx"> : m_globalObject(globalObject)
</span><span class="cx"> , m_injectedScriptManager(std::make_unique<InjectedScriptManager>(*this, InjectedScriptHost::create()))
</span><ins>+ , m_executionStopwatch(Stopwatch::create())
</ins><span class="cx"> , m_frontendRouter(FrontendRouter::create())
</span><span class="cx"> , m_backendDispatcher(BackendDispatcher::create(m_frontendRouter.copyRef()))
</span><del>- , m_executionStopwatch(Stopwatch::create())
- , m_includeNativeCallStackWithExceptions(true)
- , m_isAutomaticInspection(false)
-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- , m_augmentingClient(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> auto inspectorAgent = std::make_unique<InspectorAgent>(*this);
</span><span class="cx"> auto runtimeAgent = std::make_unique<JSGlobalObjectRuntimeAgent>(*m_injectedScriptManager, m_globalObject);
</span><span class="lines">@@ -95,7 +90,6 @@
</span><span class="cx">
</span><span class="cx"> JSGlobalObjectInspectorController::~JSGlobalObjectInspectorController()
</span><span class="cx"> {
</span><del>- m_agents.discardAgents();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectInspectorController::globalObjectDestroyed()
</span><span class="lines">@@ -117,7 +111,7 @@
</span><span class="cx"> if (!connectedFirstFrontend)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_agents.didCreateFrontendAndBackend(frontendChannel, &m_backendDispatcher.get());
</del><ins>+ m_agents.didCreateFrontendAndBackend(&m_frontendRouter.get(), &m_backendDispatcher.get());
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> m_inspectorAgent->activateExtraDomains(m_agents.extraDomains());
</span><span class="lines">@@ -277,7 +271,7 @@
</span><span class="cx"> {
</span><span class="cx"> String domainName = agent->domainName();
</span><span class="cx">
</span><del>- agent->didCreateFrontendAndBackend(m_frontendRouter->leakChannel(), &m_backendDispatcher.get());
</del><ins>+ agent->didCreateFrontendAndBackend(&m_frontendRouter.get(), &m_backendDispatcher.get());
</ins><span class="cx">
</span><span class="cx"> m_agents.appendExtraAgent(WTF::move(agent));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -112,18 +112,21 @@
</span><span class="cx"> JSC::JSGlobalObject& m_globalObject;
</span><span class="cx"> std::unique_ptr<InjectedScriptManager> m_injectedScriptManager;
</span><span class="cx"> std::unique_ptr<JSGlobalObjectConsoleClient> m_consoleClient;
</span><del>- InspectorAgent* m_inspectorAgent;
- InspectorConsoleAgent* m_consoleAgent;
- InspectorDebuggerAgent* m_debuggerAgent;
</del><ins>+ Ref<WTF::Stopwatch> m_executionStopwatch;
+
</ins><span class="cx"> AgentRegistry m_agents;
</span><ins>+ InspectorAgent* m_inspectorAgent { nullptr };
+ InspectorConsoleAgent* m_consoleAgent { nullptr };
+ InspectorDebuggerAgent* m_debuggerAgent { nullptr };
+
</ins><span class="cx"> Ref<FrontendRouter> m_frontendRouter;
</span><span class="cx"> Ref<BackendDispatcher> m_backendDispatcher;
</span><del>- Ref<WTF::Stopwatch> m_executionStopwatch;
- bool m_includeNativeCallStackWithExceptions;
- bool m_isAutomaticInspection;
</del><span class="cx">
</span><ins>+ bool m_includeNativeCallStackWithExceptions { false };
+ bool m_isAutomaticInspection { false };
+
</ins><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><del>- AugmentableInspectorControllerClient* m_augmentingClient;
</del><ins>+ AugmentableInspectorControllerClient* m_augmentingClient { nullptr };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -48,9 +48,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorAgent::didCreateFrontendAndBackend(FrontendRouter* frontendRouter, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<InspectorFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = InspectorBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007-2010, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> InspectorAgent(InspectorEnvironment&);
</span><span class="cx"> virtual ~InspectorAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorConsoleAgent::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorConsoleAgent::didCreateFrontendAndBackend(FrontendRouter* frontendRouter, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<ConsoleFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<ConsoleFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = ConsoleBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>-* Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+* Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> InspectorConsoleAgent(InjectedScriptManager&);
</span><span class="cx"> virtual ~InspectorConsoleAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
- * Copyright (C) 2010-2011 Google Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2011 Google Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -69,9 +69,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorDebuggerAgent::didCreateFrontendAndBackend(FrontendRouter* frontendRouter, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<DebuggerFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<DebuggerFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = DebuggerBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
- * Copyright (C) 2010-2011 Google Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2011 Google Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~InspectorDebuggerAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -40,9 +40,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectRuntimeAgent::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</del><ins>+void JSGlobalObjectRuntimeAgent::didCreateFrontendAndBackend(FrontendRouter* frontendRouter, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<RuntimeFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<RuntimeFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = RuntimeBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> public:
</span><span class="cx"> JSGlobalObjectRuntimeAgent(InjectedScriptManager&, JSC::JSGlobalObject&);
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> virtual JSC::VM& globalVM() override;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoraugmentableAlternateDispatchableAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/augmentable/AlternateDispatchableAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/augmentable/AlternateDispatchableAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/augmentable/AlternateDispatchableAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher* backendDispatcher) override
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher* backendDispatcher) override
</ins><span class="cx"> {
</span><span class="cx"> m_backendDispatcher = TBackendDispatcher::create(backendDispatcher, nullptr);
</span><span class="cx"> m_backendDispatcher->setAlternateDispatcher(m_alternateDispatcher.get());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorDebuggablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #include "EventLoop.h"
</span><del>-#include "InspectorFrontendChannel.h"
</del><span class="cx"> #include "RemoteInspector.h"
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generator_templatespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -204,10 +204,10 @@
</span><span class="cx"> FrontendDispatcherDomainDispatcherDeclaration = (
</span><span class="cx"> """${classAndExportMacro} ${domainName}FrontendDispatcher {
</span><span class="cx"> public:
</span><del>- ${domainName}FrontendDispatcher(FrontendChannel* frontendChannel) : m_frontendChannel(frontendChannel) { }
</del><ins>+ ${domainName}FrontendDispatcher(FrontendRouter* frontendRouter) : m_frontendRouter(frontendRouter) { }
</ins><span class="cx"> ${eventDeclarations}
</span><span class="cx"> private:
</span><del>- FrontendChannel* m_frontendChannel;
</del><ins>+ FrontendRouter* m_frontendRouter;
</ins><span class="cx"> };""")
</span><span class="cx">
</span><span class="cx"> ProtocolObjectBuilderDeclarationPrelude = (
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_backend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> secondary_headers = [
</span><del>- '<inspector/InspectorFrontendChannel.h>',
</del><span class="cx"> '<inspector/InspectorFrontendRouter.h>',
</span><span class="cx"> '<inspector/InspectorValues.h>',
</span><span class="cx"> '<wtf/NeverDestroyed.h>',
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_frontend_dispatcher_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/env python
</span><span class="cx"> #
</span><del>-# Copyright (c) 2014 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.
</span><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -51,14 +51,13 @@
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = [
</span><span class="cx"> '"InspectorProtocolObjects.h"',
</span><del>- '<inspector/InspectorFrontendChannel.h>',
</del><span class="cx"> '<inspector/InspectorValues.h>',
</span><span class="cx"> '<wtf/text/WTFString.h>']
</span><span class="cx">
</span><span class="cx"> header_args = {
</span><span class="cx"> 'headerGuardString': re.sub('\W+', '_', self.output_filename()),
</span><span class="cx"> 'includes': '\n'.join(['#include ' + header for header in headers]),
</span><del>- 'typedefs': '',
</del><ins>+ 'typedefs': 'class FrontendRouter;',
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sections = []
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_frontend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/env python
</span><span class="cx"> #
</span><del>-# Copyright (c) 2014 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.
</span><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -48,7 +48,10 @@
</span><span class="cx"> return filter(lambda domain: len(domain.events) > 0, Generator.domains_to_generate(self))
</span><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><del>- secondary_headers = ['<wtf/text/CString.h>']
</del><ins>+ secondary_headers = [
+ '"InspectorFrontendRouter.h"',
+ '<wtf/text/CString.h>',
+ ]
</ins><span class="cx">
</span><span class="cx"> header_args = {
</span><span class="cx"> 'primaryInclude': '"InspectorFrontendDispatchers.h"',
</span><span class="lines">@@ -116,6 +119,6 @@
</span><span class="cx"> lines.append(' jsonMessage->setObject(ASCIILiteral("params"), WTF::move(paramsObject));')
</span><span class="cx">
</span><span class="cx"> lines.append('')
</span><del>- lines.append(' m_frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());')
</del><ins>+ lines.append(' m_frontendRouter->sendEvent(jsonMessage->toJSONString());')
</ins><span class="cx"> lines.append('}')
</span><span class="cx"> return "\n".join(lines)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_backend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/env python
</span><span class="cx"> #
</span><del>-# Copyright (c) 2014 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.
</span><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> secondary_headers = [
</span><span class="cx"> '"%sInternal.h"' % ObjCGenerator.OBJC_PREFIX,
</span><span class="cx"> '"%sEnumConversionHelpers.h"' % ObjCGenerator.OBJC_PREFIX,
</span><del>- '<JavaScriptCore/InspectorFrontendChannel.h>',
</del><span class="cx"> '<JavaScriptCore/InspectorValues.h>',
</span><span class="cx"> ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_frontend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/env python
</span><span class="cx"> #
</span><del>-# Copyright (c) 2014 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.
</span><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> secondary_headers = [
</span><span class="cx"> '"%sEnumConversionHelpers.h"' % ObjCGenerator.OBJC_PREFIX,
</span><del>- '<JavaScriptCore/InspectorFrontendChannel.h>',
</del><span class="cx"> '<JavaScriptCore/InspectorValues.h>',
</span><span class="cx"> ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/ChangeLog 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,3 +1,73 @@
</span><ins>+2015-09-04 Brian Burg <bburg@apple.com>
+
+ Web Inspector: agents should send messages through FrontendRouter instead of FrontendChannel
+ https://bugs.webkit.org/show_bug.cgi?id=148492
+
+ Reviewed by Joseph Pecoraro.
+
+ Replace uses of FrontendChannel with FrontendRouter. Minor code cleanup along the way.
+
+ No new tests, no behavior changed.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ (WebCore::InspectorApplicationCacheAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorApplicationCacheAgent.h:
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorCSSAgent.h:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::connectFrontend):
+ (WebCore::InspectorController::~InspectorController): No need to call discardAgents().
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDOMDebuggerAgent.cpp:
+ (WebCore::InspectorDOMDebuggerAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorDOMDebuggerAgent.h:
+ * inspector/InspectorDOMStorageAgent.cpp:
+ (WebCore::InspectorDOMStorageAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorDOMStorageAgent.h:
+ * inspector/InspectorDatabaseAgent.cpp:
+ (WebCore::InspectorDatabaseAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorDatabaseAgent.h:
+ * inspector/InspectorForwarding.h: Removed.
+ * inspector/InspectorIndexedDBAgent.cpp:
+ (WebCore::InspectorIndexedDBAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorIndexedDBAgent.h:
+ * inspector/InspectorLayerTreeAgent.cpp:
+ (WebCore::InspectorLayerTreeAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorLayerTreeAgent.h:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorPageAgent.h:
+ * inspector/InspectorReplayAgent.cpp:
+ (WebCore::InspectorReplayAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorReplayAgent.h:
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorResourceAgent.h:
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/InspectorWebAgentBase.h:
+ * inspector/InspectorWorkerAgent.cpp:
+ (WebCore::InspectorWorkerAgent::didCreateFrontendAndBackend):
+ * inspector/InspectorWorkerAgent.h:
+ * inspector/PageRuntimeAgent.cpp:
+ (WebCore::PageRuntimeAgent::didCreateFrontendAndBackend):
+ * inspector/PageRuntimeAgent.h:
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::connectFrontend):
+ * inspector/WorkerInspectorController.h:
+ * inspector/WorkerRuntimeAgent.cpp:
+ (WebCore::WorkerRuntimeAgent::didCreateFrontendAndBackend):
+ * inspector/WorkerRuntimeAgent.h:
+ * page/PageDebuggable.cpp:
+ * testing/Internals.cpp:
+
</ins><span class="cx"> 2015-09-05 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a new ResourceLoaderOption to avoid page defers loading mechanisms for inspector
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -22747,7 +22747,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorDOMAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorDOMDebuggerAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorDOMStorageAgent.h" />
</span><del>- <ClInclude Include="..\inspector\InspectorForwarding.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorFrontendClient.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorFrontendClientLocal.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorFrontendHost.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -11918,9 +11918,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorDOMStorageAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\InspectorForwarding.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorFrontendClient.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 (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -991,7 +991,6 @@
</span><span class="cx"> 20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 20D629251253690B00081543 /* InspectorInstrumentation.h */; };
</span><span class="cx"> 225A16B50D5C11E900090295 /* WebEventRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = 225A16B30D5C11E900090295 /* WebEventRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 225A16B60D5C11E900090295 /* WebEventRegion.mm in Sources */ = {isa = PBXBuildFile; fileRef = 225A16B40D5C11E900090295 /* WebEventRegion.mm */; };
</span><del>- 227777601345DEA9008EA455 /* InspectorForwarding.h in Headers */ = {isa = PBXBuildFile; fileRef = 2277775F1345DEA9008EA455 /* InspectorForwarding.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 228C284510D82500009D0D0E /* ScriptWrappable.h in Headers */ = {isa = PBXBuildFile; fileRef = 228C284410D82500009D0D0E /* ScriptWrappable.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2292B27C1356669400CF11EF /* ImageBufferDataCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2292B27B1356669400CF11EF /* ImageBufferDataCG.cpp */; };
</span><span class="cx"> 22BD9F7F1353625C009BD102 /* ImageBufferData.h in Headers */ = {isa = PBXBuildFile; fileRef = 22BD9F7D1353625C009BD102 /* ImageBufferData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -8170,7 +8169,6 @@
</span><span class="cx"> 20D629251253690B00081543 /* InspectorInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorInstrumentation.h; sourceTree = "<group>"; };
</span><span class="cx"> 225A16B30D5C11E900090295 /* WebEventRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEventRegion.h; sourceTree = "<group>"; };
</span><span class="cx"> 225A16B40D5C11E900090295 /* WebEventRegion.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebEventRegion.mm; sourceTree = "<group>"; };
</span><del>- 2277775F1345DEA9008EA455 /* InspectorForwarding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorForwarding.h; sourceTree = "<group>"; };
</del><span class="cx"> 228C284410D82500009D0D0E /* ScriptWrappable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptWrappable.h; sourceTree = "<group>"; };
</span><span class="cx"> 2292B27B1356669400CF11EF /* ImageBufferDataCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageBufferDataCG.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 22BD9F7D1353625C009BD102 /* ImageBufferData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageBufferData.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -15650,7 +15648,6 @@
</span><span class="cx"> F3D4C47712E07663003DA150 /* InspectorDOMDebuggerAgent.h */,
</span><span class="cx"> 7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */,
</span><span class="cx"> 7A74ECB9101839A600BF939E /* InspectorDOMStorageAgent.h */,
</span><del>- 2277775F1345DEA9008EA455 /* InspectorForwarding.h */,
</del><span class="cx"> F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */,
</span><span class="cx"> F344C75711294FF600F26EEE /* InspectorFrontendClientLocal.cpp */,
</span><span class="cx"> F344C75211294D9D00F26EEE /* InspectorFrontendClientLocal.h */,
</span><span class="lines">@@ -25336,7 +25333,6 @@
</span><span class="cx"> 7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */,
</span><span class="cx"> F3D4C47912E07663003DA150 /* InspectorDOMDebuggerAgent.h in Headers */,
</span><span class="cx"> 7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */,
</span><del>- 227777601345DEA9008EA455 /* InspectorForwarding.h in Headers */,
</del><span class="cx"> F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */,
</span><span class="cx"> F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */,
</span><span class="cx"> 7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorApplicationCacheAgent::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorApplicationCacheAgent::didCreateFrontendAndBackend(FrontendRouter* frontendRouter, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<Inspector::ApplicationCacheFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::ApplicationCacheFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = Inspector::ApplicationCacheBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> InspectorApplicationCacheAgent(InstrumentingAgents&, InspectorPageAgent*);
</span><span class="cx"> virtual ~InspectorApplicationCacheAgent() { }
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> void updateApplicationCacheStatus(Frame*);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -354,9 +354,9 @@
</span><span class="cx"> reset();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorCSSAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter* frontendRouter, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<CSSFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<CSSFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = CSSBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> static CSSStyleRule* asCSSStyleRule(CSSRule&);
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx"> virtual void discardAgent() override;
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -174,7 +174,6 @@
</span><span class="cx"> InspectorController::~InspectorController()
</span><span class="cx"> {
</span><span class="cx"> m_instrumentingAgents->reset();
</span><del>- m_agents.discardAgents();
</del><span class="cx"> ASSERT(!m_inspectorClient);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -235,7 +234,7 @@
</span><span class="cx">
</span><span class="cx"> if (connectedFirstFrontend) {
</span><span class="cx"> InspectorInstrumentation::registerInstrumentingAgents(m_instrumentingAgents.get());
</span><del>- m_agents.didCreateFrontendAndBackend(frontendChannel, &m_backendDispatcher.get());
</del><ins>+ m_agents.didCreateFrontendAndBackend(&m_frontendRouter.get(), &m_backendDispatcher.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2009, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2009 Joseph Pecoraro
</span><span class="cx"> *
</span><span class="lines">@@ -215,9 +215,9 @@
</span><span class="cx"> ASSERT(!m_searchingForNode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorDOMAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter* frontendRouter, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<Inspector::DOMFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::DOMFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = Inspector::DOMBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx">
</span><span class="cx"> m_history = std::make_unique<InspectorHistory>();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2009, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> static String toErrorString(const ExceptionCode&);
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> Vector<Document*> documents();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -100,7 +101,7 @@
</span><span class="cx"> clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorDOMDebuggerAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><span class="cx"> m_backendDispatcher = Inspector::DOMDebuggerBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -78,7 +79,7 @@
</span><span class="cx"> void willSendXMLHttpRequest(const String& url);
</span><span class="cx"> void pauseOnNativeEventIfNeeded(bool isDOMEvent, const String& eventName, bool synchronous);
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx"> virtual void discardAgent() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013 Samsung Electronics. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -65,9 +66,9 @@
</span><span class="cx"> m_instrumentingAgents.setInspectorDOMStorageAgent(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMStorageAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorDOMStorageAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter* frontendRouter, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<Inspector::DOMStorageFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::DOMStorageFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = Inspector::DOMStorageBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -57,7 +58,7 @@
</span><span class="cx"> InspectorDOMStorageAgent(InstrumentingAgents&, InspectorPageAgent*);
</span><span class="cx"> virtual ~InspectorDOMStorageAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> // Called from the front-end.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -222,9 +223,9 @@
</span><span class="cx"> m_instrumentingAgents.setInspectorDatabaseAgent(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorDatabaseAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter* frontendRouter, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<Inspector::DatabaseFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::DatabaseFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = Inspector::DatabaseBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -53,7 +54,7 @@
</span><span class="cx"> explicit InspectorDatabaseAgent(InstrumentingAgents&);
</span><span class="cx"> virtual ~InspectorDatabaseAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> void clearResources();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorForwardingh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorForwarding.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorForwarding.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorForwarding.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All Rights Reserved.
- * Copyright (C) 2011 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:
- * 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 InspectorForwarding_h
-#define InspectorForwarding_h
-
-#include <inspector/InspectorFrontendChannel.h>
-
-namespace WebCore {
-typedef Inspector::FrontendChannel InspectorFrontendChannel;
-}
-
-#endif // !defined(InspectorForwarding_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -576,7 +577,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorIndexedDBAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><span class="cx"> m_backendDispatcher = Inspector::IndexedDBBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -53,7 +54,7 @@
</span><span class="cx"> InspectorIndexedDBAgent(InstrumentingAgents&, Inspector::InjectedScriptManager&, InspectorPageAgent*);
</span><span class="cx"> virtual ~InspectorIndexedDBAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> // Called from the front-end.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -56,9 +56,9 @@
</span><span class="cx"> reset();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorLayerTreeAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter* frontendRouter, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<Inspector::LayerTreeFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::LayerTreeFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = Inspector::LayerTreeBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> explicit InspectorLayerTreeAgent(InstrumentingAgents&);
</span><span class="cx"> virtual ~InspectorLayerTreeAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx"> void reset();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -333,9 +334,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorPageAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter* frontendRouter, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<Inspector::PageFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::PageFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = Inspector::PageBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -139,7 +140,7 @@
</span><span class="cx"> void scriptsEnabled(bool isEnabled);
</span><span class="cx">
</span><span class="cx"> // Inspector Controller API
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> // Cross-agents API
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011-2013 University of Washington. All rights reserved.
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -173,9 +173,9 @@
</span><span class="cx"> return m_page.replayController().sessionState();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorReplayAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter* frontendRouter, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<Inspector::ReplayFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::ReplayFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = Inspector::ReplayBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx">
</span><span class="cx"> m_instrumentingAgents.setInspectorReplayAgent(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011-2013 University of Washington. All rights reserved.
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> InspectorReplayAgent(InstrumentingAgents&, InspectorPageAgent*);
</span><span class="cx"> virtual ~InspectorReplayAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> // InspectorInstrumentation callbacks.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -169,9 +170,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorResourceAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter* frontendRouter, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<Inspector::NetworkFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::NetworkFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = Inspector::NetworkBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -78,7 +79,7 @@
</span><span class="cx"> InspectorResourceAgent(InstrumentingAgents&, InspectorPageAgent*, InspectorClient*);
</span><span class="cx"> virtual ~InspectorResourceAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> // InspectorInstrumentation callbacks.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2014 University of Washington.
</span><ins>+* Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -89,9 +90,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorTimelineAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter* frontendRouter, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<Inspector::TimelineFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::TimelineFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = Inspector::TimelineBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx">
</span><span class="cx"> m_instrumentingAgents.setPersistentInspectorTimelineAgent(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2014 University of Washington.
</span><ins>+* Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -120,7 +121,7 @@
</span><span class="cx"> InspectorTimelineAgent(InstrumentingAgents&, InspectorPageAgent*, InspectorType, InspectorClient*);
</span><span class="cx"> virtual ~InspectorTimelineAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> virtual void start(ErrorString&, const int* maxCallStackDepth = nullptr) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWebAgentBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWebAgentBase.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWebAgentBase.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorWebAgentBase.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All Rights Reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #ifndef InspectorWebAgentBase_h
</span><span class="cx"> #define InspectorWebAgentBase_h
</span><span class="cx">
</span><del>-#include "InspectorForwarding.h"
</del><span class="cx"> #include <inspector/InspectorAgentBase.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -31,7 +32,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorWorkerAgent.h"
</span><span class="cx">
</span><del>-#include "InspectorForwarding.h"
</del><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "WorkerGlobalScopeProxy.h"
</span><span class="lines">@@ -112,9 +112,9 @@
</span><span class="cx"> m_instrumentingAgents.setInspectorWorkerAgent(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorWorkerAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void InspectorWorkerAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter* frontendRouter, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<Inspector::WorkerFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::WorkerFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = Inspector::WorkerBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx"> explicit InspectorWorkerAgent(InstrumentingAgents&);
</span><span class="cx"> virtual ~InspectorWorkerAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> // Called from InspectorInstrumentation
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -59,9 +60,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageRuntimeAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void PageRuntimeAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter* frontendRouter, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<Inspector::RuntimeFrontendDispatcher>(frontendChannel);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::RuntimeFrontendDispatcher>(frontendRouter);
</ins><span class="cx"> m_backendDispatcher = Inspector::RuntimeBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx"> PageRuntimeAgent(Inspector::InjectedScriptManager&, Page*, InspectorPageAgent*);
</span><span class="cx"> virtual ~PageRuntimeAgent() { }
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -33,7 +34,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CommandLineAPIHost.h"
</span><span class="cx"> #include "InspectorClient.h"
</span><del>-#include "InspectorForwarding.h"
</del><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "InspectorTimelineAgent.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include "WorkerRuntimeAgent.h"
</span><span class="cx"> #include "WorkerThread.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <inspector/InspectorFrontendChannel.h>
</ins><span class="cx"> #include <inspector/InspectorFrontendDispatchers.h>
</span><span class="cx"> #include <inspector/InspectorFrontendRouter.h>
</span><span class="cx"> #include <wtf/Stopwatch.h>
</span><span class="lines">@@ -57,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> namespace {
</span><span class="cx">
</span><del>-class PageInspectorProxy : public InspectorFrontendChannel {
</del><ins>+class PageInspectorProxy : public FrontendChannel {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> explicit PageInspectorProxy(WorkerGlobalScope& workerGlobalScope)
</span><span class="lines">@@ -115,7 +116,6 @@
</span><span class="cx"> ASSERT(!m_forwardingChannel);
</span><span class="cx">
</span><span class="cx"> m_instrumentingAgents->reset();
</span><del>- m_agents.discardAgents();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerInspectorController::connectFrontend()
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">
</span><span class="cx"> m_forwardingChannel = std::make_unique<PageInspectorProxy>(m_workerGlobalScope);
</span><span class="cx"> m_frontendRouter->connectFrontend(m_forwardingChannel.get());
</span><del>- m_agents.didCreateFrontendAndBackend(m_forwardingChannel.get(), &m_backendDispatcher.get());
</del><ins>+ m_agents.didCreateFrontendAndBackend(&m_frontendRouter.get(), &m_backendDispatcher.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerInspectorController::disconnectFrontend(Inspector::DisconnectReason reason)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -42,6 +43,7 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><ins>+class FrontendChannel;
</ins><span class="cx"> class FrontendRouter;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -52,7 +53,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerRuntimeAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher* backendDispatcher)
</del><ins>+void WorkerRuntimeAgent::didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><span class="cx"> m_backendDispatcher = Inspector::RuntimeBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -43,7 +44,7 @@
</span><span class="cx"> WorkerRuntimeAgent(Inspector::InjectedScriptManager&, WorkerGlobalScope*);
</span><span class="cx"> virtual ~WorkerRuntimeAgent() { }
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
</ins><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> virtual void run(ErrorString&) override;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageDebuggablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageDebuggable.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageDebuggable.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/page/PageDebuggable.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "InspectorController.h"
</span><del>-#include "InspectorForwarding.h"
</del><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "Settings.h"
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2012 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -69,7 +69,6 @@
</span><span class="cx"> #include "IconController.h"
</span><span class="cx"> #include "InspectorClient.h"
</span><span class="cx"> #include "InspectorController.h"
</span><del>-#include "InspectorForwarding.h"
</del><span class="cx"> #include "InspectorFrontendClientLocal.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "InspectorOverlay.h"
</span><span class="lines">@@ -120,6 +119,7 @@
</span><span class="cx"> #include <JavaScriptCore/Profile.h>
</span><span class="cx"> #include <bytecode/CodeBlock.h>
</span><span class="cx"> #include <inspector/InspectorAgentBase.h>
</span><ins>+#include <inspector/InspectorFrontendChannel.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx"> #include <runtime/JSCJSValue.h>
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class InspectorFrontendChannelDummy : public InspectorFrontendChannel {
</del><ins>+class InspectorFrontendChannelDummy : public FrontendChannel {
</ins><span class="cx"> public:
</span><span class="cx"> explicit InspectorFrontendChannelDummy(Page*);
</span><span class="cx"> virtual ~InspectorFrontendChannelDummy() { }
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebInspectorClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebInspectorClientIOS.mm (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebInspectorClientIOS.mm 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebInspectorClientIOS.mm 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> delete this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorFrontendChannel* WebInspectorClient::openInspectorFrontend(InspectorController*)
</del><ins>+Inspector::FrontendChannel* WebInspectorClient::openInspectorFrontend(InspectorController*)
</ins><span class="cx"> {
</span><span class="cx"> // iOS does not have a local inspector, this should not be reached.
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-09-04 Brian Burg <bburg@apple.com>
+
+ Web Inspector: agents should send messages through FrontendRouter instead of FrontendChannel
+ https://bugs.webkit.org/show_bug.cgi?id=148492
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebCoreSupport/WebInspectorClient.h: Clean up the forward declarations, don't use InspectorForwarding.h.
+ * WebCoreSupport/WebInspectorClient.mm:
+ (WebInspectorClient::openInspectorFrontend):
+
</ins><span class="cx"> 2015-09-04 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary compiler guards from mm files
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,45 +27,35 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <WebCore/InspectorClient.h>
</span><del>-#import <WebCore/InspectorForwarding.h>
-#import <WebCore/InspectorFrontendClientLocal.h>
</del><span class="cx">
</span><ins>+#import <WebCore/InspectorFrontendClientLocal.h>
+#import <inspector/InspectorFrontendChannel.h>
</ins><span class="cx"> #import <wtf/Forward.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/text/StringHash.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#ifdef __OBJC__
-@class NSURL;
-@class WebInspectorRemoteChannel;
-@class WebInspectorWindowController;
-@class WebNodeHighlighter;
-@class WebView;
-#else
-class NSURL;
-class WebInspectorRemoteChannel;
-class WebInspectorWindowController;
-class WebNodeHighlighter;
-class WebView;
-#endif
</del><ins>+OBJC_CLASS NSURL;
+OBJC_CLASS WebInspectorRemoteChannel;
+OBJC_CLASS WebInspectorWindowController;
+OBJC_CLASS WebNodeHighlighter;
+OBJC_CLASS WebView;
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-
</del><span class="cx"> class Frame;
</span><span class="cx"> class Page;
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class WebInspectorFrontendClient;
</span><span class="cx">
</span><del>-class WebInspectorClient : public WebCore::InspectorClient, public WebCore::InspectorFrontendChannel {
</del><ins>+class WebInspectorClient : public WebCore::InspectorClient, public Inspector::FrontendChannel {
</ins><span class="cx"> public:
</span><span class="cx"> explicit WebInspectorClient(WebView *);
</span><span class="cx">
</span><span class="cx"> virtual void inspectorDestroyed() override;
</span><span class="cx">
</span><del>- virtual WebCore::InspectorFrontendChannel* openInspectorFrontend(WebCore::InspectorController*) override;
</del><ins>+ virtual Inspector::FrontendChannel* openInspectorFrontend(WebCore::InspectorController*) override;
</ins><span class="cx"> virtual void closeInspectorFrontend() override;
</span><span class="cx"> virtual void bringFrontendToFront() override;
</span><span class="cx"> virtual void didResizeMainFrame(WebCore::Frame*) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2008, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><ins>+using namespace Inspector;
</ins><span class="cx">
</span><span class="cx"> static const CGFloat minimumWindowWidth = 500;
</span><span class="cx"> static const CGFloat minimumWindowHeight = 400;
</span><span class="lines">@@ -106,7 +107,7 @@
</span><span class="cx"> delete this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorFrontendChannel* WebInspectorClient::openInspectorFrontend(InspectorController* inspectorController)
</del><ins>+FrontendChannel* WebInspectorClient::openInspectorFrontend(InspectorController* inspectorController)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<WebInspectorWindowController> windowController = adoptNS([[WebInspectorWindowController alloc] initWithInspectedWebView:m_webView isUnderTest:inspectorController->isUnderTest()]);
</span><span class="cx"> [windowController.get() setInspectorClient:this];
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebKit/win/ChangeLog 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-09-04 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: agents should send messages through FrontendRouter instead of FrontendChannel
+ https://bugs.webkit.org/show_bug.cgi?id=148492
+
+ Reviewed by Joseph Pecoraro.
+
+ Stop using InspectorForwarding.h.
+
+ * WebCoreSupport/WebInspectorClient.h:
+
+2015-09-04 Brian Burg <bburg@apple.com>
+
</ins><span class="cx"> Web Inspector: InspectorController should support multiple frontend channels
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148538
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebInspectorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> delete this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebCore::InspectorFrontendChannel* WebInspectorClient::openInspectorFrontend(InspectorController* inspectorController)
</del><ins>+Inspector::FrontendChannel* WebInspectorClient::openInspectorFrontend(InspectorController* inspectorController)
</ins><span class="cx"> {
</span><span class="cx"> registerWindowClass();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebInspectorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -31,9 +31,9 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/COMPtr.h>
</span><span class="cx"> #include <WebCore/InspectorClient.h>
</span><del>-#include <WebCore/InspectorForwarding.h>
</del><span class="cx"> #include <WebCore/InspectorFrontendClientLocal.h>
</span><span class="cx"> #include <WebCore/WindowMessageListener.h>
</span><ins>+#include <inspector/InspectorFrontendChannel.h>
</ins><span class="cx"> #include <windows.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -41,23 +41,21 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-
</del><span class="cx"> class Page;
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class WebInspectorFrontendClient;
</span><span class="cx"> class WebNodeHighlight;
</span><span class="cx"> class WebView;
</span><span class="cx">
</span><del>-class WebInspectorClient : public WebCore::InspectorClient, public WebCore::InspectorFrontendChannel {
</del><ins>+class WebInspectorClient : public WebCore::InspectorClient, public Inspector::FrontendChannel {
</ins><span class="cx"> public:
</span><span class="cx"> explicit WebInspectorClient(WebView*);
</span><span class="cx">
</span><span class="cx"> // InspectorClient
</span><span class="cx"> virtual void inspectorDestroyed();
</span><span class="cx">
</span><del>- virtual WebCore::InspectorFrontendChannel* openInspectorFrontend(WebCore::InspectorController*);
</del><ins>+ virtual Inspector::FrontendChannel* openInspectorFrontend(WebCore::InspectorController*);
</ins><span class="cx"> virtual void closeInspectorFrontend();
</span><span class="cx"> virtual void bringFrontendToFront();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-09-04 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: agents should send messages through FrontendRouter instead of FrontendChannel
+ https://bugs.webkit.org/show_bug.cgi?id=148492
+
+ Reviewed by Joseph Pecoraro.
+
+ Stop using InspectorForwarding.h.
+
+ * WebProcess/WebPage/WebInspector.h:
+ * WebProcess/WebPage/WebInspectorUI.h:
+
+2015-09-04 Brian Burg <bburg@apple.com>
+
</ins><span class="cx"> Web Inspector: InspectorController should support multiple frontend channels
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148538
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "Connection.h"
</span><span class="cx"> #include "MessageReceiver.h"
</span><del>-#include <WebCore/InspectorForwarding.h>
</del><ins>+#include <inspector/InspectorFrontendChannel.h>
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class WebPage;
</span><span class="cx">
</span><del>-class WebInspector : public API::ObjectImpl<API::Object::Type::BundleInspector>, public IPC::Connection::Client, public WebCore::InspectorFrontendChannel {
</del><ins>+class WebInspector : public API::ObjectImpl<API::Object::Type::BundleInspector>, public IPC::Connection::Client, public Inspector::FrontendChannel {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<WebInspector> create(WebPage*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorUIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h (189432 => 189433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h 2015-09-05 08:47:22 UTC (rev 189432)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h 2015-09-05 16:06:23 UTC (rev 189433)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "Connection.h"
</span><del>-#include <WebCore/InspectorForwarding.h>
</del><span class="cx"> #include <WebCore/InspectorFrontendClient.h>
</span><span class="cx"> #include <WebCore/InspectorFrontendHost.h>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>