<!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>[180116] 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/180116">180116</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2015-02-14 15:25:53 -0800 (Sat, 14 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: remove some unnecessary Inspector prefixes from class names in Inspector namespace
https://bugs.webkit.org/show_bug.cgi?id=141372
Reviewed by Joseph Pecoraro.
Source/JavaScriptCore:
* inspector/ConsoleMessage.cpp:
(Inspector::ConsoleMessage::addToFrontend):
(Inspector::ConsoleMessage::updateRepeatCountInConsole):
* inspector/ConsoleMessage.h:
* inspector/InspectorAgentBase.h:
* inspector/InspectorAgentRegistry.cpp:
(Inspector::AgentRegistry::AgentRegistry):
(Inspector::AgentRegistry::append):
(Inspector::AgentRegistry::appendExtraAgent):
(Inspector::AgentRegistry::didCreateFrontendAndBackend):
(Inspector::AgentRegistry::willDestroyFrontendAndBackend):
(Inspector::AgentRegistry::discardAgents):
(Inspector::InspectorAgentRegistry::InspectorAgentRegistry): Deleted.
(Inspector::InspectorAgentRegistry::append): Deleted.
(Inspector::InspectorAgentRegistry::appendExtraAgent): Deleted.
(Inspector::InspectorAgentRegistry::didCreateFrontendAndBackend): Deleted.
(Inspector::InspectorAgentRegistry::willDestroyFrontendAndBackend): Deleted.
(Inspector::InspectorAgentRegistry::discardAgents): Deleted.
* inspector/InspectorAgentRegistry.h:
* inspector/InspectorBackendDispatcher.cpp:
(Inspector::BackendDispatcher::CallbackBase::CallbackBase):
(Inspector::BackendDispatcher::CallbackBase::isActive):
(Inspector::BackendDispatcher::CallbackBase::sendFailure):
(Inspector::BackendDispatcher::CallbackBase::sendIfActive):
(Inspector::BackendDispatcher::create):
(Inspector::BackendDispatcher::registerDispatcherForDomain):
(Inspector::BackendDispatcher::dispatch):
(Inspector::BackendDispatcher::sendResponse):
(Inspector::BackendDispatcher::reportProtocolError):
(Inspector::BackendDispatcher::getInteger):
(Inspector::BackendDispatcher::getDouble):
(Inspector::BackendDispatcher::getString):
(Inspector::BackendDispatcher::getBoolean):
(Inspector::BackendDispatcher::getObject):
(Inspector::BackendDispatcher::getArray):
(Inspector::BackendDispatcher::getValue):
(Inspector::InspectorBackendDispatcher::CallbackBase::CallbackBase): Deleted.
(Inspector::InspectorBackendDispatcher::CallbackBase::isActive): Deleted.
(Inspector::InspectorBackendDispatcher::CallbackBase::sendFailure): Deleted.
(Inspector::InspectorBackendDispatcher::CallbackBase::sendIfActive): Deleted.
(Inspector::InspectorBackendDispatcher::create): Deleted.
(Inspector::InspectorBackendDispatcher::registerDispatcherForDomain): Deleted.
(Inspector::InspectorBackendDispatcher::dispatch): Deleted.
(Inspector::InspectorBackendDispatcher::sendResponse): Deleted.
(Inspector::InspectorBackendDispatcher::reportProtocolError): Deleted.
(Inspector::InspectorBackendDispatcher::getInteger): Deleted.
(Inspector::InspectorBackendDispatcher::getDouble): Deleted.
(Inspector::InspectorBackendDispatcher::getString): Deleted.
(Inspector::InspectorBackendDispatcher::getBoolean): Deleted.
(Inspector::InspectorBackendDispatcher::getObject): Deleted.
(Inspector::InspectorBackendDispatcher::getArray): Deleted.
(Inspector::InspectorBackendDispatcher::getValue): Deleted.
* inspector/InspectorBackendDispatcher.h:
(Inspector::SupplementalBackendDispatcher::SupplementalBackendDispatcher):
(Inspector::SupplementalBackendDispatcher::~SupplementalBackendDispatcher):
(Inspector::InspectorSupplementalBackendDispatcher::InspectorSupplementalBackendDispatcher): Deleted.
(Inspector::InspectorSupplementalBackendDispatcher::~InspectorSupplementalBackendDispatcher): Deleted.
* inspector/InspectorFrontendChannel.h:
(Inspector::FrontendChannel::~FrontendChannel):
(Inspector::InspectorFrontendChannel::~InspectorFrontendChannel): Deleted.
* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
(Inspector::JSGlobalObjectInspectorController::globalObjectDestroyed):
(Inspector::JSGlobalObjectInspectorController::connectFrontend):
(Inspector::JSGlobalObjectInspectorController::disconnectFrontend):
(Inspector::JSGlobalObjectInspectorController::dispatchMessageFromFrontend):
(Inspector::JSGlobalObjectInspectorController::appendExtraAgent):
* inspector/JSGlobalObjectInspectorController.h:
* inspector/agents/InspectorAgent.cpp:
(Inspector::InspectorAgent::didCreateFrontendAndBackend):
(Inspector::InspectorAgent::willDestroyFrontendAndBackend):
* inspector/agents/InspectorAgent.h:
* inspector/agents/InspectorConsoleAgent.cpp:
(Inspector::InspectorConsoleAgent::didCreateFrontendAndBackend):
(Inspector::InspectorConsoleAgent::willDestroyFrontendAndBackend):
* inspector/agents/InspectorConsoleAgent.h:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::didCreateFrontendAndBackend):
(Inspector::InspectorDebuggerAgent::willDestroyFrontendAndBackend):
(Inspector::InspectorDebuggerAgent::handleConsoleAssert):
(Inspector::InspectorDebuggerAgent::schedulePauseOnNextStatement):
(Inspector::InspectorDebuggerAgent::pause):
(Inspector::InspectorDebuggerAgent::scriptExecutionBlockedByCSP):
(Inspector::InspectorDebuggerAgent::didPause):
(Inspector::InspectorDebuggerAgent::breakProgram):
(Inspector::InspectorDebuggerAgent::clearBreakDetails):
* inspector/agents/InspectorDebuggerAgent.h:
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::InspectorRuntimeAgent::willDestroyFrontendAndBackend):
* inspector/agents/InspectorRuntimeAgent.h:
* inspector/agents/JSGlobalObjectRuntimeAgent.cpp:
(Inspector::JSGlobalObjectRuntimeAgent::didCreateFrontendAndBackend):
(Inspector::JSGlobalObjectRuntimeAgent::willDestroyFrontendAndBackend):
* inspector/agents/JSGlobalObjectRuntimeAgent.h:
* inspector/augmentable/AlternateDispatchableAgent.h:
* inspector/augmentable/AugmentableInspectorController.h:
* inspector/remote/RemoteInspectorDebuggable.h:
* inspector/remote/RemoteInspectorDebuggableConnection.h:
* inspector/scripts/codegen/cpp_generator.py:
(CppGenerator.cpp_type_for_formal_out_parameter):
(CppGenerator.cpp_type_for_stack_out_parameter):
* inspector/scripts/codegen/cpp_generator_templates.py:
(AlternateBackendDispatcher):
(Alternate):
(void):
(AlternateInspectorBackendDispatcher): Deleted.
(AlternateInspector): Deleted.
* inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py:
(CppBackendDispatcherHeaderGenerator._generate_alternate_handler_forward_declarations_for_domains.Alternate):
(CppBackendDispatcherHeaderGenerator._generate_dispatcher_declaration_for_command):
(CppBackendDispatcherHeaderGenerator._generate_alternate_handler_forward_declarations_for_domains.AlternateInspector): Deleted.
* inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
(CppBackendDispatcherImplementationGenerator._generate_handler_class_destructor_for_domain):
(CppBackendDispatcherImplementationGenerator._generate_large_dispatcher_switch_implementation_for_domain):
(CppBackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command):
* inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py:
(CppFrontendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_event):
* inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py:
(ObjCFrontendDispatcherImplementationGenerator._generate_event):
* inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
* inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
* inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
* inspector/scripts/tests/expected/enum-values.json-result:
* inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
* inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
* inspector/scripts/tests/expected/same-type-id-different-domain.json-result:
* inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
* inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:
* inspector/scripts/tests/expected/type-declaration-array-type.json-result:
* inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
* inspector/scripts/tests/expected/type-declaration-object-type.json-result:
* inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
* runtime/JSGlobalObjectDebuggable.cpp:
(JSC::JSGlobalObjectDebuggable::connect):
(JSC::JSGlobalObjectDebuggable::disconnect):
* runtime/JSGlobalObjectDebuggable.h:
Source/WebCore:
* WebCore.exp.in:
* inspector/InspectorApplicationCacheAgent.cpp:
(WebCore::InspectorApplicationCacheAgent::didCreateFrontendAndBackend):
(WebCore::InspectorApplicationCacheAgent::willDestroyFrontendAndBackend):
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::didCreateFrontendAndBackend):
(WebCore::InspectorCSSAgent::willDestroyFrontendAndBackend):
* inspector/InspectorCSSAgent.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::inspectedPageDestroyed):
(WebCore::InspectorController::connectFrontend):
(WebCore::InspectorController::disconnectFrontend):
(WebCore::InspectorController::show):
(WebCore::InspectorController::close):
(WebCore::InspectorController::dispatchMessageFromFrontend):
* inspector/InspectorController.h:
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::didCreateFrontendAndBackend):
(WebCore::InspectorDOMAgent::willDestroyFrontendAndBackend):
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDOMDebuggerAgent.cpp:
(WebCore::InspectorDOMDebuggerAgent::didCreateFrontendAndBackend):
(WebCore::InspectorDOMDebuggerAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorDOMDebuggerAgent::didInvalidateStyleAttr):
(WebCore::InspectorDOMDebuggerAgent::willInsertDOMNode):
(WebCore::InspectorDOMDebuggerAgent::willRemoveDOMNode):
(WebCore::InspectorDOMDebuggerAgent::willModifyDOMAttr):
(WebCore::InspectorDOMDebuggerAgent::pauseOnNativeEventIfNeeded):
(WebCore::InspectorDOMDebuggerAgent::willSendXMLHttpRequest):
* inspector/InspectorDOMDebuggerAgent.h:
* inspector/InspectorDOMStorageAgent.cpp:
(WebCore::InspectorDOMStorageAgent::didCreateFrontendAndBackend):
(WebCore::InspectorDOMStorageAgent::willDestroyFrontendAndBackend):
* inspector/InspectorDOMStorageAgent.h:
* inspector/InspectorDatabaseAgent.cpp:
(WebCore::InspectorDatabaseAgent::didCreateFrontendAndBackend):
(WebCore::InspectorDatabaseAgent::willDestroyFrontendAndBackend):
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorDatabaseResource.cpp:
(WebCore::InspectorDatabaseResource::bind):
* inspector/InspectorDatabaseResource.h:
* inspector/InspectorForwarding.h:
* inspector/InspectorIndexedDBAgent.cpp:
(WebCore::InspectorIndexedDBAgent::didCreateFrontendAndBackend):
(WebCore::InspectorIndexedDBAgent::willDestroyFrontendAndBackend):
* inspector/InspectorIndexedDBAgent.h:
* inspector/InspectorLayerTreeAgent.cpp:
(WebCore::InspectorLayerTreeAgent::didCreateFrontendAndBackend):
(WebCore::InspectorLayerTreeAgent::willDestroyFrontendAndBackend):
* inspector/InspectorLayerTreeAgent.h:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::didCreateFrontendAndBackend):
(WebCore::InspectorPageAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorPageAgent::getScriptExecutionStatus):
* inspector/InspectorPageAgent.h:
* inspector/InspectorReplayAgent.cpp:
(WebCore::InspectorReplayAgent::didCreateFrontendAndBackend):
(WebCore::InspectorReplayAgent::willDestroyFrontendAndBackend):
* inspector/InspectorReplayAgent.h:
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::didCreateFrontendAndBackend):
(WebCore::InspectorResourceAgent::willDestroyFrontendAndBackend):
* inspector/InspectorResourceAgent.h:
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyle::styleWithProperties):
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didCreateFrontendAndBackend):
(WebCore::InspectorTimelineAgent::willDestroyFrontendAndBackend):
* inspector/InspectorTimelineAgent.h:
* inspector/InspectorWorkerAgent.cpp:
(WebCore::InspectorWorkerAgent::WorkerFrontendChannel::WorkerFrontendChannel):
(WebCore::InspectorWorkerAgent::didCreateFrontendAndBackend):
(WebCore::InspectorWorkerAgent::willDestroyFrontendAndBackend):
* inspector/InspectorWorkerAgent.h:
* inspector/PageRuntimeAgent.cpp:
(WebCore::PageRuntimeAgent::didCreateFrontendAndBackend):
(WebCore::PageRuntimeAgent::willDestroyFrontendAndBackend):
* inspector/PageRuntimeAgent.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::~WorkerInspectorController):
(WebCore::WorkerInspectorController::connectFrontend):
(WebCore::WorkerInspectorController::disconnectFrontend):
* inspector/WorkerInspectorController.h:
* inspector/WorkerRuntimeAgent.cpp:
(WebCore::WorkerRuntimeAgent::didCreateFrontendAndBackend):
(WebCore::WorkerRuntimeAgent::willDestroyFrontendAndBackend):
* inspector/WorkerRuntimeAgent.h:
* loader/EmptyClients.h:
* page/PageDebuggable.cpp:
(WebCore::PageDebuggable::connect):
(WebCore::PageDebuggable::disconnect):
* page/PageDebuggable.h:
* testing/Internals.cpp:
(WebCore::Internals::closeDummyInspectorFrontend):
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::disconnectFromInspector):
Source/WebKit:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
Source/WebKit/mac:
* WebCoreSupport/WebInspectorClient.mm:
(-[WebInspectorWindowController destroyInspectorView:]):
Source/WebKit/win:
* WebCoreSupport/WebInspectorClient.cpp:
(WebInspectorFrontendClient::destroyInspectorView):
Source/WebKit2:
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::remoteFrontendDisconnected):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleMessagecpp">trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleMessageh">trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h</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="#trunkSourceJavaScriptCoreinspectorInspectorBackendDispatcherh">trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorFrontendChannelh">trunk/Source/JavaScriptCore/inspector/InspectorFrontendChannel.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="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.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="#trunkSourceJavaScriptCoreinspectoraugmentableAugmentableInspectorControllerh">trunk/Source/JavaScriptCore/inspector/augmentable/AugmentableInspectorController.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorDebuggableh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorDebuggableConnectionh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggableConnection.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generatorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py</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_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.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_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_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="#trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generator_templatespy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator_templates.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpecteddomainswithvaryingcommandsizesjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedsametypeiddifferentdomainjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedshadowedoptionaltypesettersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationaliasedprimitivetypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationarraytypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationenumtypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectDebuggablecpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectDebuggableh">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</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="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</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="#trunkSourceWebCoreinspectorInspectorDatabaseResourcecpp">trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseResourceh">trunk/Source/WebCore/inspector/InspectorDatabaseResource.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorForwardingh">trunk/Source/WebCore/inspector/InspectorForwarding.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="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</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="#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="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCorepagePageDebuggablecpp">trunk/Source/WebCore/page/PageDebuggable.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageDebuggableh">trunk/Source/WebCore/page/PageDebuggable.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -1,3 +1,147 @@
</span><ins>+2015-02-09 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove some unnecessary Inspector prefixes from class names in Inspector namespace
+ https://bugs.webkit.org/show_bug.cgi?id=141372
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/ConsoleMessage.cpp:
+ (Inspector::ConsoleMessage::addToFrontend):
+ (Inspector::ConsoleMessage::updateRepeatCountInConsole):
+ * inspector/ConsoleMessage.h:
+ * inspector/InspectorAgentBase.h:
+ * inspector/InspectorAgentRegistry.cpp:
+ (Inspector::AgentRegistry::AgentRegistry):
+ (Inspector::AgentRegistry::append):
+ (Inspector::AgentRegistry::appendExtraAgent):
+ (Inspector::AgentRegistry::didCreateFrontendAndBackend):
+ (Inspector::AgentRegistry::willDestroyFrontendAndBackend):
+ (Inspector::AgentRegistry::discardAgents):
+ (Inspector::InspectorAgentRegistry::InspectorAgentRegistry): Deleted.
+ (Inspector::InspectorAgentRegistry::append): Deleted.
+ (Inspector::InspectorAgentRegistry::appendExtraAgent): Deleted.
+ (Inspector::InspectorAgentRegistry::didCreateFrontendAndBackend): Deleted.
+ (Inspector::InspectorAgentRegistry::willDestroyFrontendAndBackend): Deleted.
+ (Inspector::InspectorAgentRegistry::discardAgents): Deleted.
+ * inspector/InspectorAgentRegistry.h:
+ * inspector/InspectorBackendDispatcher.cpp:
+ (Inspector::BackendDispatcher::CallbackBase::CallbackBase):
+ (Inspector::BackendDispatcher::CallbackBase::isActive):
+ (Inspector::BackendDispatcher::CallbackBase::sendFailure):
+ (Inspector::BackendDispatcher::CallbackBase::sendIfActive):
+ (Inspector::BackendDispatcher::create):
+ (Inspector::BackendDispatcher::registerDispatcherForDomain):
+ (Inspector::BackendDispatcher::dispatch):
+ (Inspector::BackendDispatcher::sendResponse):
+ (Inspector::BackendDispatcher::reportProtocolError):
+ (Inspector::BackendDispatcher::getInteger):
+ (Inspector::BackendDispatcher::getDouble):
+ (Inspector::BackendDispatcher::getString):
+ (Inspector::BackendDispatcher::getBoolean):
+ (Inspector::BackendDispatcher::getObject):
+ (Inspector::BackendDispatcher::getArray):
+ (Inspector::BackendDispatcher::getValue):
+ (Inspector::InspectorBackendDispatcher::CallbackBase::CallbackBase): Deleted.
+ (Inspector::InspectorBackendDispatcher::CallbackBase::isActive): Deleted.
+ (Inspector::InspectorBackendDispatcher::CallbackBase::sendFailure): Deleted.
+ (Inspector::InspectorBackendDispatcher::CallbackBase::sendIfActive): Deleted.
+ (Inspector::InspectorBackendDispatcher::create): Deleted.
+ (Inspector::InspectorBackendDispatcher::registerDispatcherForDomain): Deleted.
+ (Inspector::InspectorBackendDispatcher::dispatch): Deleted.
+ (Inspector::InspectorBackendDispatcher::sendResponse): Deleted.
+ (Inspector::InspectorBackendDispatcher::reportProtocolError): Deleted.
+ (Inspector::InspectorBackendDispatcher::getInteger): Deleted.
+ (Inspector::InspectorBackendDispatcher::getDouble): Deleted.
+ (Inspector::InspectorBackendDispatcher::getString): Deleted.
+ (Inspector::InspectorBackendDispatcher::getBoolean): Deleted.
+ (Inspector::InspectorBackendDispatcher::getObject): Deleted.
+ (Inspector::InspectorBackendDispatcher::getArray): Deleted.
+ (Inspector::InspectorBackendDispatcher::getValue): Deleted.
+ * inspector/InspectorBackendDispatcher.h:
+ (Inspector::SupplementalBackendDispatcher::SupplementalBackendDispatcher):
+ (Inspector::SupplementalBackendDispatcher::~SupplementalBackendDispatcher):
+ (Inspector::InspectorSupplementalBackendDispatcher::InspectorSupplementalBackendDispatcher): Deleted.
+ (Inspector::InspectorSupplementalBackendDispatcher::~InspectorSupplementalBackendDispatcher): Deleted.
+ * inspector/InspectorFrontendChannel.h:
+ (Inspector::FrontendChannel::~FrontendChannel):
+ (Inspector::InspectorFrontendChannel::~InspectorFrontendChannel): Deleted.
+ * inspector/JSGlobalObjectInspectorController.cpp:
+ (Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
+ (Inspector::JSGlobalObjectInspectorController::globalObjectDestroyed):
+ (Inspector::JSGlobalObjectInspectorController::connectFrontend):
+ (Inspector::JSGlobalObjectInspectorController::disconnectFrontend):
+ (Inspector::JSGlobalObjectInspectorController::dispatchMessageFromFrontend):
+ (Inspector::JSGlobalObjectInspectorController::appendExtraAgent):
+ * inspector/JSGlobalObjectInspectorController.h:
+ * inspector/agents/InspectorAgent.cpp:
+ (Inspector::InspectorAgent::didCreateFrontendAndBackend):
+ (Inspector::InspectorAgent::willDestroyFrontendAndBackend):
+ * inspector/agents/InspectorAgent.h:
+ * inspector/agents/InspectorConsoleAgent.cpp:
+ (Inspector::InspectorConsoleAgent::didCreateFrontendAndBackend):
+ (Inspector::InspectorConsoleAgent::willDestroyFrontendAndBackend):
+ * inspector/agents/InspectorConsoleAgent.h:
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::didCreateFrontendAndBackend):
+ (Inspector::InspectorDebuggerAgent::willDestroyFrontendAndBackend):
+ (Inspector::InspectorDebuggerAgent::handleConsoleAssert):
+ (Inspector::InspectorDebuggerAgent::schedulePauseOnNextStatement):
+ (Inspector::InspectorDebuggerAgent::pause):
+ (Inspector::InspectorDebuggerAgent::scriptExecutionBlockedByCSP):
+ (Inspector::InspectorDebuggerAgent::didPause):
+ (Inspector::InspectorDebuggerAgent::breakProgram):
+ (Inspector::InspectorDebuggerAgent::clearBreakDetails):
+ * inspector/agents/InspectorDebuggerAgent.h:
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::InspectorRuntimeAgent::willDestroyFrontendAndBackend):
+ * inspector/agents/InspectorRuntimeAgent.h:
+ * inspector/agents/JSGlobalObjectRuntimeAgent.cpp:
+ (Inspector::JSGlobalObjectRuntimeAgent::didCreateFrontendAndBackend):
+ (Inspector::JSGlobalObjectRuntimeAgent::willDestroyFrontendAndBackend):
+ * inspector/agents/JSGlobalObjectRuntimeAgent.h:
+ * inspector/augmentable/AlternateDispatchableAgent.h:
+ * inspector/augmentable/AugmentableInspectorController.h:
+ * inspector/remote/RemoteInspectorDebuggable.h:
+ * inspector/remote/RemoteInspectorDebuggableConnection.h:
+ * inspector/scripts/codegen/cpp_generator.py:
+ (CppGenerator.cpp_type_for_formal_out_parameter):
+ (CppGenerator.cpp_type_for_stack_out_parameter):
+ * inspector/scripts/codegen/cpp_generator_templates.py:
+ (AlternateBackendDispatcher):
+ (Alternate):
+ (void):
+ (AlternateInspectorBackendDispatcher): Deleted.
+ (AlternateInspector): Deleted.
+ * inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py:
+ (CppBackendDispatcherHeaderGenerator._generate_alternate_handler_forward_declarations_for_domains.Alternate):
+ (CppBackendDispatcherHeaderGenerator._generate_dispatcher_declaration_for_command):
+ (CppBackendDispatcherHeaderGenerator._generate_alternate_handler_forward_declarations_for_domains.AlternateInspector): Deleted.
+ * inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
+ (CppBackendDispatcherImplementationGenerator._generate_handler_class_destructor_for_domain):
+ (CppBackendDispatcherImplementationGenerator._generate_large_dispatcher_switch_implementation_for_domain):
+ (CppBackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command):
+ * inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py:
+ (CppFrontendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_event):
+ * inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py:
+ (ObjCFrontendDispatcherImplementationGenerator._generate_event):
+ * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
+ * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
+ * inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
+ * inspector/scripts/tests/expected/enum-values.json-result:
+ * inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
+ * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
+ * inspector/scripts/tests/expected/same-type-id-different-domain.json-result:
+ * inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
+ * inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-array-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
+ * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
+ * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+ * runtime/JSGlobalObjectDebuggable.cpp:
+ (JSC::JSGlobalObjectDebuggable::connect):
+ (JSC::JSGlobalObjectDebuggable::disconnect):
+ * runtime/JSGlobalObjectDebuggable.h:
+
</ins><span class="cx"> 2015-02-14 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r180082): WebCore Debug builds fail on Mavericks due to weak export symbols
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleMessagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> return Inspector::Protocol::Console::ConsoleMessage::Level::Log;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleMessage::addToFrontend(InspectorConsoleFrontendDispatcher* consoleFrontendDispatcher, Inspector::InjectedScriptManager* injectedScriptManager, bool generatePreview)
</del><ins>+void ConsoleMessage::addToFrontend(ConsoleFrontendDispatcher* consoleFrontendDispatcher, InjectedScriptManager* injectedScriptManager, bool generatePreview)
</ins><span class="cx"> {
</span><span class="cx"> Ref<Inspector::Protocol::Console::ConsoleMessage> jsonObj = Inspector::Protocol::Console::ConsoleMessage::create()
</span><span class="cx"> .setSource(messageSourceValue(m_source))
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> consoleFrontendDispatcher->messageAdded(WTF::move(jsonObj));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleMessage::updateRepeatCountInConsole(InspectorConsoleFrontendDispatcher* consoleFrontendDispatcher)
</del><ins>+void ConsoleMessage::updateRepeatCountInConsole(ConsoleFrontendDispatcher* consoleFrontendDispatcher)
</ins><span class="cx"> {
</span><span class="cx"> consoleFrontendDispatcher->messageRepeatCountUpdated(m_repeatCount);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleMessageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, JSC::ExecState*, unsigned long requestIdentifier = 0);
</span><span class="cx"> ~ConsoleMessage();
</span><span class="cx">
</span><del>- void addToFrontend(InspectorConsoleFrontendDispatcher*, InjectedScriptManager*, bool generatePreview);
- void updateRepeatCountInConsole(InspectorConsoleFrontendDispatcher*);
</del><ins>+ void addToFrontend(ConsoleFrontendDispatcher*, InjectedScriptManager*, bool generatePreview);
+ void updateRepeatCountInConsole(ConsoleFrontendDispatcher*);
</ins><span class="cx">
</span><span class="cx"> MessageSource source() const { return m_source; }
</span><span class="cx"> const String& message() const { return m_message; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorAgentBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorAgentBase.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorAgentBase.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/InspectorAgentBase.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class InspectorBackendDispatcher;
-class InspectorFrontendChannel;
</del><ins>+class BackendDispatcher;
+class FrontendChannel;
</ins><span class="cx">
</span><del>-enum class InspectorDisconnectReason {
</del><ins>+enum class DisconnectReason {
</ins><span class="cx"> InspectedTargetDestroyed,
</span><span class="cx"> InspectorDestroyed
</span><span class="cx"> };
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx">
</span><span class="cx"> String domainName() const { return m_name; }
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) = 0;
- virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason reason) = 0;
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) = 0;
+ virtual void willDestroyFrontendAndBackend(DisconnectReason) = 0;
</ins><span class="cx"> virtual void discardAgent() { }
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> String m_name;
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorAgentBase_h)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorAgentRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -31,17 +31,17 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-InspectorAgentRegistry::InspectorAgentRegistry()
</del><ins>+AgentRegistry::AgentRegistry()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgentRegistry::append(std::unique_ptr<InspectorAgentBase> agent)
</del><ins>+void AgentRegistry::append(std::unique_ptr<InspectorAgentBase> agent)
</ins><span class="cx"> {
</span><span class="cx"> m_agents.append(WTF::move(agent));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><del>-void InspectorAgentRegistry::appendExtraAgent(std::unique_ptr<InspectorAgentBase> agent)
</del><ins>+void AgentRegistry::appendExtraAgent(std::unique_ptr<InspectorAgentBase> agent)
</ins><span class="cx"> {
</span><span class="cx"> m_extraDomains.append(agent->domainName());
</span><span class="cx">
</span><span class="lines">@@ -49,19 +49,19 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void InspectorAgentRegistry::didCreateFrontendAndBackend(InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void AgentRegistry::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < m_agents.size(); i++)
</span><span class="cx"> m_agents[i]->didCreateFrontendAndBackend(frontendChannel, backendDispatcher);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgentRegistry::willDestroyFrontendAndBackend(InspectorDisconnectReason reason)
</del><ins>+void AgentRegistry::willDestroyFrontendAndBackend(DisconnectReason reason)
</ins><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < m_agents.size(); i++)
</span><span class="cx"> m_agents[i]->willDestroyFrontendAndBackend(reason);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgentRegistry::discardAgents()
</del><ins>+void AgentRegistry::discardAgents()
</ins><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < m_agents.size(); i++)
</span><span class="cx"> m_agents[i]->discardAgent();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorAgentRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/InspectorAgentRegistry.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -32,19 +32,20 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class BackendDispatcher;
+class FrontendChannel;
</ins><span class="cx"> class InspectorAgentBase;
</span><del>-class InspectorBackendDispatcher;
-class InspectorFrontendChannel;
-enum class InspectorDisconnectReason;
</del><span class="cx">
</span><del>-class JS_EXPORT_PRIVATE InspectorAgentRegistry {
</del><ins>+enum class DisconnectReason;
+
+class JS_EXPORT_PRIVATE AgentRegistry {
</ins><span class="cx"> public:
</span><del>- InspectorAgentRegistry();
</del><ins>+ AgentRegistry();
</ins><span class="cx">
</span><span class="cx"> void append(std::unique_ptr<InspectorAgentBase>);
</span><span class="cx">
</span><del>- void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*);
- void willDestroyFrontendAndBackend(InspectorDisconnectReason reason);
</del><ins>+ void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*);
+ void willDestroyFrontendAndBackend(DisconnectReason);
</ins><span class="cx"> void discardAgents();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="lines">@@ -55,8 +56,8 @@
</span><span class="cx"> private:
</span><span class="cx"> // These are declared here to avoid MSVC from trying to create default iplementations which would
</span><span class="cx"> // involve generating a copy constructor and copy assignment operator for the Vector of std::unique_ptrs.
</span><del>- InspectorAgentRegistry(const InspectorAgentRegistry&) = delete;
- InspectorAgentRegistry& operator=(const InspectorAgentRegistry&) = delete;
</del><ins>+ AgentRegistry(const AgentRegistry&) = delete;
+ AgentRegistry& operator=(const AgentRegistry&) = delete;
</ins><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<InspectorAgentBase>> m_agents;
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorBackendDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -34,25 +34,25 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-InspectorBackendDispatcher::CallbackBase::CallbackBase(Ref<InspectorBackendDispatcher>&& backendDispatcher, int id)
</del><ins>+BackendDispatcher::CallbackBase::CallbackBase(Ref<BackendDispatcher>&& backendDispatcher, int id)
</ins><span class="cx"> : m_backendDispatcher(WTF::move(backendDispatcher))
</span><span class="cx"> , m_id(id)
</span><span class="cx"> , m_alreadySent(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBackendDispatcher::CallbackBase::isActive() const
</del><ins>+bool BackendDispatcher::CallbackBase::isActive() const
</ins><span class="cx"> {
</span><span class="cx"> return !m_alreadySent && m_backendDispatcher->isActive();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorBackendDispatcher::CallbackBase::sendFailure(const ErrorString& error)
</del><ins>+void BackendDispatcher::CallbackBase::sendFailure(const ErrorString& error)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(error.length());
</span><span class="cx"> sendIfActive(nullptr, error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorBackendDispatcher::CallbackBase::sendIfActive(RefPtr<InspectorObject>&& partialMessage, const ErrorString& invocationError)
</del><ins>+void BackendDispatcher::CallbackBase::sendIfActive(RefPtr<InspectorObject>&& partialMessage, const ErrorString& invocationError)
</ins><span class="cx"> {
</span><span class="cx"> if (m_alreadySent)
</span><span class="cx"> return;
</span><span class="lines">@@ -61,20 +61,20 @@
</span><span class="cx"> m_alreadySent = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorBackendDispatcher> InspectorBackendDispatcher::create(InspectorFrontendChannel* inspectorFrontendChannel)
</del><ins>+Ref<BackendDispatcher> BackendDispatcher::create(FrontendChannel* frontendChannel)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorBackendDispatcher(inspectorFrontendChannel));
</del><ins>+ return adoptRef(*new BackendDispatcher(frontendChannel));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorBackendDispatcher::registerDispatcherForDomain(const String& domain, InspectorSupplementalBackendDispatcher* dispatcher)
</del><ins>+void BackendDispatcher::registerDispatcherForDomain(const String& domain, SupplementalBackendDispatcher* dispatcher)
</ins><span class="cx"> {
</span><span class="cx"> auto result = m_dispatchers.add(domain, dispatcher);
</span><span class="cx"> ASSERT_UNUSED(result, result.isNewEntry);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorBackendDispatcher::dispatch(const String& message)
</del><ins>+void BackendDispatcher::dispatch(const String& message)
</ins><span class="cx"> {
</span><del>- Ref<InspectorBackendDispatcher> protect(*this);
</del><ins>+ Ref<BackendDispatcher> protect(*this);
</ins><span class="cx">
</span><span class="cx"> RefPtr<InspectorValue> parsedMessage;
</span><span class="cx"> if (!InspectorValue::parseJSON(message, parsedMessage)) {
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String domain = method.substring(0, position);
</span><del>- InspectorSupplementalBackendDispatcher* domainDispatcher = m_dispatchers.get(domain);
</del><ins>+ SupplementalBackendDispatcher* domainDispatcher = m_dispatchers.get(domain);
</ins><span class="cx"> if (!domainDispatcher) {
</span><span class="cx"> reportProtocolError(&callId, MethodNotFound, "'" + domain + "' domain was not found");
</span><span class="cx"> return;
</span><span class="lines">@@ -129,9 +129,9 @@
</span><span class="cx"> domainDispatcher->dispatch(callId, domainMethod, messageObject.releaseNonNull());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorBackendDispatcher::sendResponse(long callId, RefPtr<InspectorObject>&& result, const ErrorString& invocationError)
</del><ins>+void BackendDispatcher::sendResponse(long callId, RefPtr<InspectorObject>&& result, const ErrorString& invocationError)
</ins><span class="cx"> {
</span><del>- if (!m_inspectorFrontendChannel)
</del><ins>+ if (!m_frontendChannel)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (invocationError.length()) {
</span><span class="lines">@@ -142,15 +142,15 @@
</span><span class="cx"> Ref<InspectorObject> responseMessage = InspectorObject::create();
</span><span class="cx"> responseMessage->setObject(ASCIILiteral("result"), result);
</span><span class="cx"> responseMessage->setInteger(ASCIILiteral("id"), callId);
</span><del>- m_inspectorFrontendChannel->sendMessageToFrontend(responseMessage->toJSONString());
</del><ins>+ m_frontendChannel->sendMessageToFrontend(responseMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorBackendDispatcher::reportProtocolError(const long* const callId, CommonErrorCode errorCode, const String& errorMessage) const
</del><ins>+void BackendDispatcher::reportProtocolError(const long* const callId, CommonErrorCode errorCode, const String& errorMessage) const
</ins><span class="cx"> {
</span><span class="cx"> reportProtocolError(callId, errorCode, errorMessage, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorBackendDispatcher::reportProtocolError(const long* const callId, CommonErrorCode errorCode, const String& errorMessage, RefPtr<Inspector::Protocol::Array<String>>&& data) const
</del><ins>+void BackendDispatcher::reportProtocolError(const long* const callId, CommonErrorCode errorCode, const String& errorMessage, RefPtr<Inspector::Protocol::Array<String>>&& data) const
</ins><span class="cx"> {
</span><span class="cx"> static const int errorCodes[] = {
</span><span class="cx"> -32700, // ParseError
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> ASSERT_ARG(errorCode, (unsigned)errorCode < WTF_ARRAY_LENGTH(errorCodes));
</span><span class="cx"> ASSERT_ARG(errorCode, errorCodes[errorCode]);
</span><span class="cx">
</span><del>- if (!m_inspectorFrontendChannel)
</del><ins>+ if (!m_frontendChannel)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Ref<InspectorObject> error = InspectorObject::create();
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> else
</span><span class="cx"> message->setValue(ASCIILiteral("id"), InspectorValue::null());
</span><span class="cx">
</span><del>- m_inspectorFrontendChannel->sendMessageToFrontend(message->toJSONString());
</del><ins>+ m_frontendChannel->sendMessageToFrontend(message->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename ReturnValueType, typename ValueType, typename DefaultValueType>
</span><span class="lines">@@ -227,37 +227,37 @@
</span><span class="cx"> static bool asValue(InspectorValue& value, RefPtr<InspectorValue>& output) { return value.asValue(output); }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-int InspectorBackendDispatcher::getInteger(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+int BackendDispatcher::getInteger(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</ins><span class="cx"> {
</span><span class="cx"> return getPropertyValue<int, int, int>(object, name, valueFound, protocolErrors, 0, AsMethodBridges::asInteger, "Integer");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double InspectorBackendDispatcher::getDouble(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+double BackendDispatcher::getDouble(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</ins><span class="cx"> {
</span><span class="cx"> return getPropertyValue<double, double, double>(object, name, valueFound, protocolErrors, 0, AsMethodBridges::asDouble, "Number");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String InspectorBackendDispatcher::getString(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+String BackendDispatcher::getString(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</ins><span class="cx"> {
</span><span class="cx"> return getPropertyValue<String, String, String>(object, name, valueFound, protocolErrors, "", AsMethodBridges::asString, "String");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBackendDispatcher::getBoolean(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+bool BackendDispatcher::getBoolean(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</ins><span class="cx"> {
</span><span class="cx"> return getPropertyValue<bool, bool, bool>(object, name, valueFound, protocolErrors, false, AsMethodBridges::asBoolean, "Boolean");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorObject> InspectorBackendDispatcher::getObject(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+RefPtr<InspectorObject> BackendDispatcher::getObject(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</ins><span class="cx"> {
</span><span class="cx"> return getPropertyValue<RefPtr<InspectorObject>, RefPtr<InspectorObject>, InspectorObject*>(object, name, valueFound, protocolErrors, nullptr, AsMethodBridges::asObject, "Object");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorArray> InspectorBackendDispatcher::getArray(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+RefPtr<InspectorArray> BackendDispatcher::getArray(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</ins><span class="cx"> {
</span><span class="cx"> return getPropertyValue<RefPtr<InspectorArray>, RefPtr<InspectorArray>, InspectorArray*>(object, name, valueFound, protocolErrors, nullptr, AsMethodBridges::asArray, "Array");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorValue> InspectorBackendDispatcher::getValue(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+RefPtr<InspectorValue> BackendDispatcher::getValue(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</ins><span class="cx"> {
</span><span class="cx"> return getPropertyValue<RefPtr<InspectorValue>, RefPtr<InspectorValue>, InspectorValue*>(object, name, valueFound, protocolErrors, nullptr, AsMethodBridges::asValue, "Value");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorBackendDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -33,27 +33,28 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class InspectorBackendDispatcher;
-class InspectorFrontendChannel;
</del><ins>+class BackendDispatcher;
+class FrontendChannel;
+
</ins><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class InspectorSupplementalBackendDispatcher : public RefCounted<InspectorSupplementalBackendDispatcher> {
</del><ins>+class SupplementalBackendDispatcher : public RefCounted<SupplementalBackendDispatcher> {
</ins><span class="cx"> public:
</span><del>- InspectorSupplementalBackendDispatcher(InspectorBackendDispatcher& backendDispatcher)
</del><ins>+ SupplementalBackendDispatcher(BackendDispatcher& backendDispatcher)
</ins><span class="cx"> : m_backendDispatcher(backendDispatcher) { }
</span><del>- virtual ~InspectorSupplementalBackendDispatcher() { }
</del><ins>+ virtual ~SupplementalBackendDispatcher() { }
</ins><span class="cx"> virtual void dispatch(long callId, const String& method, Ref<InspectorObject>&& message) = 0;
</span><span class="cx"> protected:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ Ref<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class JS_EXPORT_PRIVATE InspectorBackendDispatcher : public RefCounted<InspectorBackendDispatcher> {
</del><ins>+class JS_EXPORT_PRIVATE BackendDispatcher : public RefCounted<BackendDispatcher> {
</ins><span class="cx"> public:
</span><del>- static Ref<InspectorBackendDispatcher> create(InspectorFrontendChannel*);
</del><ins>+ static Ref<BackendDispatcher> create(FrontendChannel*);
</ins><span class="cx">
</span><span class="cx"> class JS_EXPORT_PRIVATE CallbackBase : public RefCounted<CallbackBase> {
</span><span class="cx"> public:
</span><del>- CallbackBase(Ref<InspectorBackendDispatcher>&&, int id);
</del><ins>+ CallbackBase(Ref<BackendDispatcher>&&, int id);
</ins><span class="cx">
</span><span class="cx"> bool isActive() const;
</span><span class="cx"> void sendFailure(const ErrorString&);
</span><span class="lines">@@ -63,13 +64,13 @@
</span><span class="cx"> void sendIfActive(RefPtr<InspectorObject>&& partialMessage, const ErrorString& invocationError);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ Ref<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> int m_id;
</span><span class="cx"> bool m_alreadySent;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- void clearFrontend() { m_inspectorFrontendChannel = nullptr; }
- bool isActive() const { return !!m_inspectorFrontendChannel; }
</del><ins>+ void clearFrontend() { m_frontendChannel = nullptr; }
+ bool isActive() const { return !!m_frontendChannel; }
</ins><span class="cx">
</span><span class="cx"> enum CommonErrorCode {
</span><span class="cx"> ParseError = 0,
</span><span class="lines">@@ -80,7 +81,7 @@
</span><span class="cx"> ServerError
</span><span class="cx"> };
</span><span class="cx">
</span><del>- void registerDispatcherForDomain(const String& domain, InspectorSupplementalBackendDispatcher*);
</del><ins>+ void registerDispatcherForDomain(const String& domain, SupplementalBackendDispatcher*);
</ins><span class="cx"> void dispatch(const String& message);
</span><span class="cx"> void sendResponse(long callId, RefPtr<InspectorObject>&& result, const ErrorString& invocationError);
</span><span class="cx"> void reportProtocolError(const long* const callId, CommonErrorCode, const String& errorMessage) const;
</span><span class="lines">@@ -95,10 +96,11 @@
</span><span class="cx"> static RefPtr<InspectorArray> getArray(InspectorObject*, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- InspectorBackendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
</del><ins>+ BackendDispatcher(FrontendChannel* FrontendChannel)
+ : m_frontendChannel(FrontendChannel) { }
</ins><span class="cx">
</span><del>- InspectorFrontendChannel* m_inspectorFrontendChannel;
- HashMap<String, InspectorSupplementalBackendDispatcher*> m_dispatchers;
</del><ins>+ FrontendChannel* m_frontendChannel;
+ HashMap<String, SupplementalBackendDispatcher*> m_dispatchers;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorFrontendChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorFrontendChannel.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorFrontendChannel.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/InspectorFrontendChannel.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -30,9 +30,9 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class InspectorFrontendChannel {
</del><ins>+class FrontendChannel {
</ins><span class="cx"> public:
</span><del>- virtual ~InspectorFrontendChannel() { }
</del><ins>+ virtual ~FrontendChannel() { }
</ins><span class="cx"> virtual bool sendMessageToFrontend(const String& message) = 0;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -60,7 +60,7 @@
</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><del>- , m_inspectorFrontendChannel(nullptr)
</del><ins>+ , m_frontendChannel(nullptr)
</ins><span class="cx"> , m_executionStopwatch(Stopwatch::create())
</span><span class="cx"> , m_includeNativeCallStackWithExceptions(true)
</span><span class="cx"> , m_isAutomaticInspection(false)
</span><span class="lines">@@ -95,22 +95,22 @@
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectInspectorController::globalObjectDestroyed()
</span><span class="cx"> {
</span><del>- disconnectFrontend(InspectorDisconnectReason::InspectedTargetDestroyed);
</del><ins>+ disconnectFrontend(DisconnectReason::InspectedTargetDestroyed);
</ins><span class="cx">
</span><span class="cx"> m_injectedScriptManager->disconnect();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectInspectorController::connectFrontend(InspectorFrontendChannel* frontendChannel, bool isAutomaticInspection)
</del><ins>+void JSGlobalObjectInspectorController::connectFrontend(FrontendChannel* frontendChannel, bool isAutomaticInspection)
</ins><span class="cx"> {
</span><del>- ASSERT(!m_inspectorFrontendChannel);
- ASSERT(!m_inspectorBackendDispatcher);
</del><ins>+ ASSERT(!m_frontendChannel);
+ ASSERT(!m_backendDispatcher);
</ins><span class="cx">
</span><span class="cx"> m_isAutomaticInspection = isAutomaticInspection;
</span><span class="cx">
</span><del>- m_inspectorFrontendChannel = frontendChannel;
- m_inspectorBackendDispatcher = InspectorBackendDispatcher::create(frontendChannel);
</del><ins>+ m_frontendChannel = frontendChannel;
+ m_backendDispatcher = BackendDispatcher::create(frontendChannel);
</ins><span class="cx">
</span><del>- m_agents.didCreateFrontendAndBackend(frontendChannel, m_inspectorBackendDispatcher.get());
</del><ins>+ m_agents.didCreateFrontendAndBackend(frontendChannel, 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">@@ -120,16 +120,16 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectInspectorController::disconnectFrontend(InspectorDisconnectReason reason)
</del><ins>+void JSGlobalObjectInspectorController::disconnectFrontend(DisconnectReason reason)
</ins><span class="cx"> {
</span><del>- if (!m_inspectorFrontendChannel)
</del><ins>+ if (!m_frontendChannel)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_agents.willDestroyFrontendAndBackend(reason);
</span><span class="cx">
</span><del>- m_inspectorBackendDispatcher->clearFrontend();
- m_inspectorBackendDispatcher.clear();
- m_inspectorFrontendChannel = nullptr;
</del><ins>+ m_backendDispatcher->clearFrontend();
+ m_backendDispatcher.clear();
+ m_frontendChannel = nullptr;
</ins><span class="cx">
</span><span class="cx"> m_isAutomaticInspection = false;
</span><span class="cx">
</span><span class="lines">@@ -141,8 +141,8 @@
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectInspectorController::dispatchMessageFromFrontend(const String& message)
</span><span class="cx"> {
</span><del>- if (m_inspectorBackendDispatcher)
- m_inspectorBackendDispatcher->dispatch(message);
</del><ins>+ if (m_backendDispatcher)
+ m_backendDispatcher->dispatch(message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectInspectorController::appendAPIBacktrace(ScriptCallStack* callStack)
</span><span class="lines">@@ -245,12 +245,12 @@
</span><span class="cx"> {
</span><span class="cx"> String domainName = agent->domainName();
</span><span class="cx">
</span><del>- if (m_inspectorFrontendChannel)
- agent->didCreateFrontendAndBackend(m_inspectorFrontendChannel, m_inspectorBackendDispatcher.get());
</del><ins>+ if (m_frontendChannel)
+ agent->didCreateFrontendAndBackend(m_frontendChannel, m_backendDispatcher.get());
</ins><span class="cx">
</span><span class="cx"> m_agents.appendExtraAgent(WTF::move(agent));
</span><span class="cx">
</span><del>- if (m_inspectorFrontendChannel)
</del><ins>+ if (m_frontendChannel)
</ins><span class="cx"> m_inspectorAgent->activateExtraDomain(domainName);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class BackendDispatcher;
+class FrontendChannel;
</ins><span class="cx"> class InjectedScriptManager;
</span><span class="cx"> class InspectorAgent;
</span><del>-class InspectorBackendDispatcher;
</del><span class="cx"> class InspectorConsoleAgent;
</span><span class="cx"> class InspectorDebuggerAgent;
</span><del>-class InspectorFrontendChannel;
</del><span class="cx"> class JSGlobalObjectConsoleClient;
</span><span class="cx"> class ScriptCallStack;
</span><span class="cx">
</span><span class="lines">@@ -71,8 +71,8 @@
</span><span class="cx"> JSGlobalObjectInspectorController(JSC::JSGlobalObject&);
</span><span class="cx"> ~JSGlobalObjectInspectorController();
</span><span class="cx">
</span><del>- void connectFrontend(InspectorFrontendChannel*, bool isAutomaticInspection);
- void disconnectFrontend(InspectorDisconnectReason reason);
</del><ins>+ void connectFrontend(FrontendChannel*, bool isAutomaticInspection);
+ void disconnectFrontend(DisconnectReason);
</ins><span class="cx"> void dispatchMessageFromFrontend(const String&);
</span><span class="cx">
</span><span class="cx"> void globalObjectDestroyed();
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> virtual AugmentableInspectorControllerClient* augmentableInspectorControllerClient() const override { return m_augmentingClient; }
</span><span class="cx"> virtual void setAugmentableInspectorControllerClient(AugmentableInspectorControllerClient* client) override { m_augmentingClient = client; }
</span><span class="cx">
</span><del>- virtual InspectorFrontendChannel* frontendChannel() const override { return m_inspectorFrontendChannel; }
</del><ins>+ virtual FrontendChannel* frontendChannel() const override { return m_frontendChannel; }
</ins><span class="cx"> virtual void appendExtraAgent(std::unique_ptr<InspectorAgentBase>) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -110,9 +110,9 @@
</span><span class="cx"> InspectorAgent* m_inspectorAgent;
</span><span class="cx"> InspectorConsoleAgent* m_consoleAgent;
</span><span class="cx"> InspectorDebuggerAgent* m_debuggerAgent;
</span><del>- InspectorAgentRegistry m_agents;
- InspectorFrontendChannel* m_inspectorFrontendChannel;
- RefPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher;
</del><ins>+ AgentRegistry m_agents;
+ FrontendChannel* m_frontendChannel;
+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> Ref<WTF::Stopwatch> m_executionStopwatch;
</span><span class="cx"> bool m_includeNativeCallStackWithExceptions;
</span><span class="cx"> bool m_isAutomaticInspection;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -48,13 +48,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::didCreateFrontendAndBackend(InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorAgent::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorInspectorFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorInspectorBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<InspectorFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = InspectorBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorAgent::willDestroyFrontendAndBackend(DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -38,22 +38,21 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class BackendDispatcher;
</ins><span class="cx"> class InspectorEnvironment;
</span><del>-class InspectorInspectorBackendDispatcher;
-class InspectorInspectorFrontendDispatchers;
</del><span class="cx"> class InspectorObject;
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class JS_EXPORT_PRIVATE InspectorAgent final : public InspectorAgentBase, public InspectorInspectorBackendDispatcherHandler {
</del><ins>+class JS_EXPORT_PRIVATE InspectorAgent final : public InspectorAgentBase, public InspectorBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> InspectorAgent(InspectorEnvironment&);
</span><span class="cx"> virtual ~InspectorAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason reason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span><span class="lines">@@ -69,8 +68,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> InspectorEnvironment& m_environment;
</span><del>- std::unique_ptr<InspectorInspectorFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorInspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<InspectorFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> Vector<String> m_pendingEvaluateTestCommands;
</span><span class="cx"> std::pair<RefPtr<Protocol::Runtime::RemoteObject>, RefPtr<InspectorObject>> m_pendingInspectData;
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -55,13 +55,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorConsoleAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorConsoleAgent::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorConsoleFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorConsoleBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<ConsoleFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = ConsoleBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorConsoleAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorConsoleAgent::willDestroyFrontendAndBackend(DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -48,15 +48,15 @@
</span><span class="cx"> class ScriptCallStack;
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class JS_EXPORT_PRIVATE InspectorConsoleAgent : public InspectorAgentBase, public InspectorConsoleBackendDispatcherHandler {
</del><ins>+class JS_EXPORT_PRIVATE InspectorConsoleAgent : public InspectorAgentBase, public ConsoleBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorConsoleAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> InspectorConsoleAgent(InjectedScriptManager*);
</span><span class="cx"> virtual ~InspectorConsoleAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span><span class="lines">@@ -81,8 +81,8 @@
</span><span class="cx"> void addConsoleMessage(std::unique_ptr<ConsoleMessage>);
</span><span class="cx">
</span><span class="cx"> InjectedScriptManager* m_injectedScriptManager;
</span><del>- std::unique_ptr<InspectorConsoleFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorConsoleBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<ConsoleFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<ConsoleBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> ConsoleMessage* m_previousMessage;
</span><span class="cx"> Vector<std::unique_ptr<ConsoleMessage>> m_consoleMessages;
</span><span class="cx"> int m_expiredConsoleMessageCount;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -68,18 +68,18 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::didCreateFrontendAndBackend(InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorDebuggerAgent::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorDebuggerFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorDebuggerBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<DebuggerFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = DebuggerBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason reason)
</del><ins>+void InspectorDebuggerAgent::willDestroyFrontendAndBackend(DisconnectReason reason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><del>- bool skipRecompile = reason == InspectorDisconnectReason::InspectedTargetDestroyed;
</del><ins>+ bool skipRecompile = reason == DisconnectReason::InspectedTargetDestroyed;
</ins><span class="cx"> disable(skipRecompile);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> void InspectorDebuggerAgent::handleConsoleAssert(const String& message)
</span><span class="cx"> {
</span><span class="cx"> if (scriptDebugServer().pauseOnExceptionsState() != JSC::Debugger::DontPauseOnExceptions)
</span><del>- breakProgram(InspectorDebuggerFrontendDispatcher::Reason::Assert, buildAssertPauseReason(message));
</del><ins>+ breakProgram(DebuggerFrontendDispatcher::Reason::Assert, buildAssertPauseReason(message));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Ref<InspectorObject> buildObjectForBreakpointCookie(const String& url, int lineNumber, int columnNumber, const String& condition, RefPtr<InspectorArray>& actions, bool isRegex, bool autoContinue)
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> injectedScript.getFunctionDetails(errorString, functionId, &details);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data)
</del><ins>+void InspectorDebuggerAgent::schedulePauseOnNextStatement(DebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data)
</ins><span class="cx"> {
</span><span class="cx"> if (m_javaScriptPauseScheduled)
</span><span class="cx"> return;
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::pause(ErrorString&)
</span><span class="cx"> {
</span><del>- schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason::PauseOnNextStatement, nullptr);
</del><ins>+ schedulePauseOnNextStatement(DebuggerFrontendDispatcher::Reason::PauseOnNextStatement, nullptr);
</ins><span class="cx">
</span><span class="cx"> m_javaScriptPauseScheduled = true;
</span><span class="cx"> }
</span><span class="lines">@@ -582,7 +582,7 @@
</span><span class="cx"> void InspectorDebuggerAgent::scriptExecutionBlockedByCSP(const String& directiveText)
</span><span class="cx"> {
</span><span class="cx"> if (scriptDebugServer().pauseOnExceptionsState() != JSC::Debugger::DontPauseOnExceptions)
</span><del>- breakProgram(InspectorDebuggerFrontendDispatcher::Reason::CSPViolation, buildCSPViolationPauseReason(directiveText));
</del><ins>+ breakProgram(DebuggerFrontendDispatcher::Reason::CSPViolation, buildCSPViolationPauseReason(directiveText));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> InspectorDebuggerAgent::currentCallFrames(InjectedScript injectedScript)
</span><span class="lines">@@ -664,22 +664,22 @@
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
</span><span class="cx">
</span><span class="cx"> // If a high level pause pause reason is not already set, try to infer a reason from the debugger.
</span><del>- if (m_breakReason == InspectorDebuggerFrontendDispatcher::Reason::Other) {
</del><ins>+ if (m_breakReason == DebuggerFrontendDispatcher::Reason::Other) {
</ins><span class="cx"> switch (scriptDebugServer().reasonForPause()) {
</span><span class="cx"> case JSC::Debugger::PausedForBreakpoint: {
</span><span class="cx"> JSC::BreakpointID debuggerBreakpointId = scriptDebugServer().pausingBreakpointID();
</span><span class="cx"> if (debuggerBreakpointId != m_continueToLocationBreakpointID) {
</span><del>- m_breakReason = InspectorDebuggerFrontendDispatcher::Reason::Breakpoint;
</del><ins>+ m_breakReason = DebuggerFrontendDispatcher::Reason::Breakpoint;
</ins><span class="cx"> m_breakAuxData = buildBreakpointPauseReason(debuggerBreakpointId);
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case JSC::Debugger::PausedForDebuggerStatement:
</span><del>- m_breakReason = InspectorDebuggerFrontendDispatcher::Reason::DebuggerStatement;
</del><ins>+ m_breakReason = DebuggerFrontendDispatcher::Reason::DebuggerStatement;
</ins><span class="cx"> m_breakAuxData = nullptr;
</span><span class="cx"> break;
</span><span class="cx"> case JSC::Debugger::PausedForException:
</span><del>- m_breakReason = InspectorDebuggerFrontendDispatcher::Reason::Exception;
</del><ins>+ m_breakReason = DebuggerFrontendDispatcher::Reason::Exception;
</ins><span class="cx"> m_breakAuxData = buildExceptionPauseReason(exceptionOrCaughtValue, injectedScript);
</span><span class="cx"> break;
</span><span class="cx"> case JSC::Debugger::PausedAtStatement:
</span><span class="lines">@@ -755,7 +755,7 @@
</span><span class="cx"> m_frontendDispatcher->resumed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::breakProgram(InspectorDebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data)
</del><ins>+void InspectorDebuggerAgent::breakProgram(DebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data)
</ins><span class="cx"> {
</span><span class="cx"> m_breakReason = breakReason;
</span><span class="cx"> m_breakAuxData = WTF::move(data);
</span><span class="lines">@@ -814,7 +814,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::clearBreakDetails()
</span><span class="cx"> {
</span><del>- m_breakReason = InspectorDebuggerFrontendDispatcher::Reason::Other;
</del><ins>+ m_breakReason = DebuggerFrontendDispatcher::Reason::Other;
</ins><span class="cx"> m_breakAuxData = nullptr;
</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 (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> class ScriptDebugServer;
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class JS_EXPORT_PRIVATE InspectorDebuggerAgent : public InspectorAgentBase, public ScriptDebugListener, public InspectorDebuggerBackendDispatcherHandler {
</del><ins>+class JS_EXPORT_PRIVATE InspectorDebuggerAgent : public InspectorAgentBase, public ScriptDebugListener, public DebuggerBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorDebuggerAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx">
</span><span class="cx"> virtual ~InspectorDebuggerAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span><span class="lines">@@ -91,9 +91,9 @@
</span><span class="cx">
</span><span class="cx"> void handleConsoleAssert(const String& message);
</span><span class="cx">
</span><del>- void schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data);
</del><ins>+ void schedulePauseOnNextStatement(DebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data);
</ins><span class="cx"> void cancelPauseOnNextStatement();
</span><del>- void breakProgram(InspectorDebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data);
</del><ins>+ void breakProgram(DebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data);
</ins><span class="cx"> void scriptExecutionBlockedByCSP(const String& directiveText);
</span><span class="cx">
</span><span class="cx"> class JS_EXPORT_PRIVATE Listener {
</span><span class="lines">@@ -155,8 +155,8 @@
</span><span class="cx"> typedef HashMap<JSC::BreakpointID, String> DebugServerBreakpointIDToBreakpointIdentifier;
</span><span class="cx">
</span><span class="cx"> InjectedScriptManager* m_injectedScriptManager;
</span><del>- std::unique_ptr<InspectorDebuggerFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorDebuggerBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<DebuggerFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<DebuggerBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> Listener* m_listener {nullptr};
</span><span class="cx"> JSC::ExecState* m_pausedScriptState {nullptr};
</span><span class="cx"> Deprecated::ScriptValue m_currentCallStack;
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> BreakpointIdentifierToBreakpointMap m_javaScriptBreakpoints;
</span><span class="cx"> DebugServerBreakpointIDToBreakpointIdentifier m_debuggerBreakpointIdentifierToInspectorBreakpointIdentifier;
</span><span class="cx"> JSC::BreakpointID m_continueToLocationBreakpointID;
</span><del>- InspectorDebuggerFrontendDispatcher::Reason m_breakReason;
</del><ins>+ DebuggerFrontendDispatcher::Reason m_breakReason;
</ins><span class="cx"> RefPtr<InspectorObject> m_breakAuxData;
</span><span class="cx"> bool m_enabled {false};
</span><span class="cx"> bool m_javaScriptPauseScheduled {false};
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -296,9 +296,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason reason)
</del><ins>+void InspectorRuntimeAgent::willDestroyFrontendAndBackend(DisconnectReason reason)
</ins><span class="cx"> {
</span><del>- if (reason != InspectorDisconnectReason::InspectedTargetDestroyed && m_isTypeProfilingEnabled)
</del><ins>+ if (reason != DisconnectReason::InspectedTargetDestroyed && m_isTypeProfilingEnabled)
</ins><span class="cx"> setTypeProfilerEnabledState(false);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx"> class ScriptDebugServer;
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class JS_EXPORT_PRIVATE InspectorRuntimeAgent : public InspectorAgentBase, public InspectorRuntimeBackendDispatcherHandler {
</del><ins>+class JS_EXPORT_PRIVATE InspectorRuntimeAgent : public InspectorAgentBase, public RuntimeBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorRuntimeAgent);
</span><span class="cx"> public:
</span><span class="cx"> virtual ~InspectorRuntimeAgent();
</span><span class="cx">
</span><del>- virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override;
</del><ins>+ virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> virtual void enable(ErrorString&) override { m_enabled = true; }
</span><span class="cx"> virtual void disable(ErrorString&) override { m_enabled = false; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -40,13 +40,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectRuntimeAgent::didCreateFrontendAndBackend(InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void JSGlobalObjectRuntimeAgent::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorRuntimeFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorRuntimeBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<RuntimeFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = RuntimeBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectRuntimeAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason reason)
</del><ins>+void JSGlobalObjectRuntimeAgent::willDestroyFrontendAndBackend(DisconnectReason reason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> public:
</span><span class="cx"> JSGlobalObjectRuntimeAgent(InjectedScriptManager*, JSC::JSGlobalObject&);
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> virtual JSC::VM& globalVM() override;
</span><span class="cx"> virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> virtual void unmuteConsole() override { }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- std::unique_ptr<InspectorRuntimeFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorRuntimeBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<RuntimeFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<RuntimeBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> JSC::JSGlobalObject& m_globalObject;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoraugmentableAlternateDispatchableAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/augmentable/AlternateDispatchableAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/augmentable/AlternateDispatchableAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/augmentable/AlternateDispatchableAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -35,32 +35,32 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-template<typename BackendDispatcher, typename AlternateDispatcher>
</del><ins>+template<typename TBackendDispatcher, typename TAlternateDispatcher>
</ins><span class="cx"> class AlternateDispatchableAgent final : public InspectorAgentBase {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- AlternateDispatchableAgent(const String& domainName, std::unique_ptr<AlternateDispatcher> alternateDispatcher)
</del><ins>+ AlternateDispatchableAgent(const String& domainName, std::unique_ptr<TAlternateDispatcher> alternateDispatcher)
</ins><span class="cx"> : InspectorAgentBase(domainName)
</span><span class="cx"> , m_alternateDispatcher(WTF::move(alternateDispatcher))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher* backendDispatcher) override
</del><ins>+ virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher* backendDispatcher) override
</ins><span class="cx"> {
</span><del>- m_backendDispatcher = BackendDispatcher::create(backendDispatcher, nullptr);
</del><ins>+ m_backendDispatcher = TBackendDispatcher::create(backendDispatcher, nullptr);
</ins><span class="cx"> m_backendDispatcher->setAlternateDispatcher(m_alternateDispatcher.get());
</span><span class="cx"> m_alternateDispatcher->setBackendDispatcher(backendDispatcher);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override
</del><ins>+ virtual void willDestroyFrontendAndBackend(DisconnectReason) override
</ins><span class="cx"> {
</span><span class="cx"> m_backendDispatcher = nullptr;
</span><span class="cx"> m_alternateDispatcher->setBackendDispatcher(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- std::unique_ptr<AlternateDispatcher> m_alternateDispatcher;
- RefPtr<BackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<TAlternateDispatcher> m_alternateDispatcher;
+ RefPtr<TBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoraugmentableAugmentableInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/augmentable/AugmentableInspectorController.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/augmentable/AugmentableInspectorController.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/augmentable/AugmentableInspectorController.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> virtual AugmentableInspectorControllerClient* augmentableInspectorControllerClient() const = 0;
</span><span class="cx"> virtual void setAugmentableInspectorControllerClient(AugmentableInspectorControllerClient*) = 0;
</span><span class="cx">
</span><del>- virtual InspectorFrontendChannel* frontendChannel() const = 0;
</del><ins>+ virtual FrontendChannel* frontendChannel() const = 0;
</ins><span class="cx"> virtual void appendExtraAgent(std::unique_ptr<InspectorAgentBase>) = 0;
</span><span class="cx">
</span><span class="cx"> bool connected() const { return !!frontendChannel(); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorDebuggableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggable.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -34,7 +34,8 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class InspectorFrontendChannel;
</del><ins>+class FrontendChannel;
+
</ins><span class="cx"> struct RemoteInspectorDebuggableInfo;
</span><span class="cx">
</span><span class="cx"> class JS_EXPORT_PRIVATE RemoteInspectorDebuggable {
</span><span class="lines">@@ -62,7 +63,7 @@
</span><span class="cx"> virtual String url() const { return String(); } // Web
</span><span class="cx"> virtual bool hasLocalDebugger() const = 0;
</span><span class="cx">
</span><del>- virtual void connect(InspectorFrontendChannel*, bool isAutomaticInspection) = 0;
</del><ins>+ virtual void connect(FrontendChannel*, bool isAutomaticInspection) = 0;
</ins><span class="cx"> virtual void disconnect() = 0;
</span><span class="cx"> virtual void dispatchMessageFromRemoteFrontend(const String& message) = 0;
</span><span class="cx"> virtual void setIndicating(bool) { } // Default is to do nothing.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorDebuggableConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggableConnection.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggableConnection.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorDebuggableConnection.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> typedef Vector<RemoteInspectorBlock> RemoteInspectorQueue;
</span><span class="cx">
</span><del>-class RemoteInspectorDebuggableConnection final : public ThreadSafeRefCounted<RemoteInspectorDebuggableConnection>, public InspectorFrontendChannel {
</del><ins>+class RemoteInspectorDebuggableConnection final : public ThreadSafeRefCounted<RemoteInspectorDebuggableConnection>, public FrontendChannel {
</ins><span class="cx"> public:
</span><span class="cx"> RemoteInspectorDebuggableConnection(RemoteInspectorDebuggable*, NSString *connectionIdentifier, NSString *destination, RemoteInspectorDebuggable::DebuggableType);
</span><span class="cx"> virtual ~RemoteInspectorDebuggableConnection();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> return '%s*' % cpp_name
</span><span class="cx"> if isinstance(_type, EnumType):
</span><span class="cx"> if _type.is_anonymous:
</span><del>- return 'Inspector%sBackendDispatcherHandler::%s*' % (_type.type_domain().domain_name, ucfirst(parameter.parameter_name))
</del><ins>+ return '%sBackendDispatcherHandler::%s*' % (_type.type_domain().domain_name, ucfirst(parameter.parameter_name))
</ins><span class="cx"> else:
</span><span class="cx"> return 'Inspector::Protocol::%s::%s*' % (_type.type_domain().domain_name, _type.raw_name())
</span><span class="cx">
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> return cpp_name
</span><span class="cx"> if isinstance(_type, EnumType):
</span><span class="cx"> if _type.is_anonymous:
</span><del>- return 'Inspector%sBackendDispatcherHandler::%s' % (_type.type_domain().domain_name, ucfirst(parameter.parameter_name))
</del><ins>+ return '%sBackendDispatcherHandler::%s' % (_type.type_domain().domain_name, ucfirst(parameter.parameter_name))
</ins><span class="cx"> else:
</span><span class="cx"> return 'Inspector::Protocol::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
</span><span class="cx">
</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 (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -66,12 +66,12 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx"> """)
</span><span class="cx">
</span><span class="lines">@@ -83,61 +83,61 @@
</span><span class="cx"> #endif // !defined(${headerGuardString})""")
</span><span class="cx">
</span><span class="cx"> AlternateBackendDispatcherHeaderDomainHandlerInterfaceDeclaration = (
</span><del>- """class AlternateInspector${domainName}BackendDispatcher : public AlternateInspectorBackendDispatcher {
</del><ins>+ """class Alternate${domainName}BackendDispatcher : public AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- virtual ~AlternateInspector${domainName}BackendDispatcher() { }
</del><ins>+ virtual ~Alternate${domainName}BackendDispatcher() { }
</ins><span class="cx"> ${commandDeclarations}
</span><span class="cx"> };""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherHeaderDomainHandlerDeclaration = (
</span><del>- """${classAndExportMacro} Inspector${domainName}BackendDispatcherHandler {
</del><ins>+ """${classAndExportMacro} ${domainName}BackendDispatcherHandler {
</ins><span class="cx"> public:
</span><span class="cx"> ${commandDeclarations}
</span><span class="cx"> protected:
</span><del>- virtual ~Inspector${domainName}BackendDispatcherHandler();
</del><ins>+ virtual ~${domainName}BackendDispatcherHandler();
</ins><span class="cx"> };""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherHeaderDomainDispatcherDeclaration = (
</span><del>- """${classAndExportMacro} Inspector${domainName}BackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</del><ins>+ """${classAndExportMacro} ${domainName}BackendDispatcher final : public SupplementalBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- static Ref<Inspector${domainName}BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, Inspector${domainName}BackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static Ref<${domainName}BackendDispatcher> create(BackendDispatcher*, ${domainName}BackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, Ref<InspectorObject>&& message) override;
</ins><span class="cx"> ${commandDeclarations}
</span><span class="cx"> private:
</span><del>- Inspector${domainName}BackendDispatcher(Inspector::InspectorBackendDispatcher&, Inspector${domainName}BackendDispatcherHandler*);
- Inspector${domainName}BackendDispatcherHandler* m_agent;
</del><ins>+ ${domainName}BackendDispatcher(BackendDispatcher&, ${domainName}BackendDispatcherHandler*);
+ ${domainName}BackendDispatcherHandler* m_agent;
</ins><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><del>- void setAlternateDispatcher(AlternateInspector${domainName}BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</del><ins>+ void setAlternateDispatcher(Alternate${domainName}BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</ins><span class="cx"> private:
</span><del>- AlternateInspector${domainName}BackendDispatcher* m_alternateDispatcher;
</del><ins>+ Alternate${domainName}BackendDispatcher* m_alternateDispatcher;
</ins><span class="cx"> #endif
</span><span class="cx"> };""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherHeaderAsyncCommandDeclaration = (
</span><del>- """ ${classAndExportMacro} ${callbackName} : public Inspector::InspectorBackendDispatcher::CallbackBase {
</del><ins>+ """ ${classAndExportMacro} ${callbackName} : public BackendDispatcher::CallbackBase {
</ins><span class="cx"> public:
</span><del>- ${callbackName}(Ref<Inspector::InspectorBackendDispatcher>&&, int id);
</del><ins>+ ${callbackName}(Ref<BackendDispatcher>&&, int id);
</ins><span class="cx"> void sendSuccess(${outParameters});
</span><span class="cx"> };
</span><span class="cx"> virtual void ${commandName}(${inParameters}) = 0;""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherImplementationSmallSwitch = (
</span><del>- """void Inspector${domainName}BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+ """void ${domainName}BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</ins><span class="cx"> {
</span><del>- Ref<Inspector${domainName}BackendDispatcher> protect(*this);
</del><ins>+ Ref<${domainName}BackendDispatcher> protect(*this);
</ins><span class="cx">
</span><span class="cx"> ${dispatchCases}
</span><span class="cx"> else
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\\'', "${domainName}", '.', method, "' was not found"));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::MethodNotFound, makeString('\\'', "${domainName}", '.', method, "' was not found"));
</ins><span class="cx"> }""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherImplementationLargeSwitch = (
</span><del>-"""void Inspector${domainName}BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+"""void ${domainName}BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</ins><span class="cx"> {
</span><del>- Ref<Inspector${domainName}BackendDispatcher> protect(*this);
</del><ins>+ Ref<${domainName}BackendDispatcher> protect(*this);
</ins><span class="cx">
</span><del>- typedef void (Inspector${domainName}BackendDispatcher::*CallHandler)(long callId, const Inspector::InspectorObject& message);
</del><ins>+ typedef void (${domainName}BackendDispatcher::*CallHandler)(long callId, const InspectorObject& message);
</ins><span class="cx"> typedef HashMap<String, CallHandler> DispatchMap;
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(DispatchMap, dispatchMap, ());
</span><span class="cx"> if (dispatchMap.isEmpty()) {
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> HashMap<String, CallHandler>::iterator it = dispatchMap.find(method);
</span><span class="cx"> if (it == dispatchMap.end()) {
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\\'', "${domainName}", '.', method, "' was not found"));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::MethodNotFound, makeString('\\'', "${domainName}", '.', method, "' was not found"));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -162,13 +162,13 @@
</span><span class="cx"> }""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherImplementationDomainConstructor = (
</span><del>- """Ref<Inspector${domainName}BackendDispatcher> Inspector${domainName}BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, Inspector${domainName}BackendDispatcherHandler* agent)
</del><ins>+ """Ref<${domainName}BackendDispatcher> ${domainName}BackendDispatcher::create(BackendDispatcher* backendDispatcher, ${domainName}BackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new Inspector${domainName}BackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new ${domainName}BackendDispatcher(*backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Inspector${domainName}BackendDispatcher::Inspector${domainName}BackendDispatcher(InspectorBackendDispatcher& backendDispatcher, Inspector${domainName}BackendDispatcherHandler* agent)
- : InspectorSupplementalBackendDispatcher(backendDispatcher)
</del><ins>+${domainName}BackendDispatcher::${domainName}BackendDispatcher(BackendDispatcher& backendDispatcher, ${domainName}BackendDispatcherHandler* agent)
+ : SupplementalBackendDispatcher(backendDispatcher)
</ins><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> , m_alternateDispatcher(nullptr)
</span><span class="lines">@@ -184,15 +184,15 @@
</span><span class="cx"> ${inParameterDeclarations}
</span><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method \'%s\' can't be processed", "${domainName}.${commandName}");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> """)
</span><span class="cx">
</span><span class="cx"> BackendDispatcherImplementationAsyncCommand = (
</span><del>-"""Inspector${domainName}BackendDispatcherHandler::${callbackName}::${callbackName}(Ref<InspectorBackendDispatcher>&& backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(WTF::move(backendDispatcher), id) { }
</del><ins>+"""${domainName}BackendDispatcherHandler::${callbackName}::${callbackName}(Ref<BackendDispatcher>&& backendDispatcher, int id) : BackendDispatcher::CallbackBase(WTF::move(backendDispatcher), id) { }
</ins><span class="cx">
</span><del>-void Inspector${domainName}BackendDispatcherHandler::${callbackName}::sendSuccess(${formalParameters})
</del><ins>+void ${domainName}BackendDispatcherHandler::${callbackName}::sendSuccess(${formalParameters})
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> ${outParameterAssignments}
</span><span class="lines">@@ -200,26 +200,26 @@
</span><span class="cx"> }""")
</span><span class="cx">
</span><span class="cx"> FrontendDispatcherDomainDispatcherDeclaration = (
</span><del>-"""${classAndExportMacro} Inspector${domainName}FrontendDispatcher {
</del><ins>+"""${classAndExportMacro} ${domainName}FrontendDispatcher {
</ins><span class="cx"> public:
</span><del>- Inspector${domainName}FrontendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
</del><ins>+ ${domainName}FrontendDispatcher(FrontendChannel* frontendChannel) : m_frontendChannel(frontendChannel) { }
</ins><span class="cx"> ${eventDeclarations}
</span><span class="cx"> private:
</span><del>- InspectorFrontendChannel* m_inspectorFrontendChannel;
</del><ins>+ FrontendChannel* m_frontendChannel;
</ins><span class="cx"> };""")
</span><span class="cx">
</span><span class="cx"> ProtocolObjectBuilderDeclarationPrelude = (
</span><span class="cx"> """ template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*${objectType}*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*${objectType}*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -232,9 +232,9 @@
</span><span class="cx"> Ref<${objectType}> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(${objectType}) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(${objectType}) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<${objectType}>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -245,19 +245,19 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }""")
</span><span class="cx">
</span><span class="cx"> ProtocolObjectRuntimeCast = (
</span><del>-"""RefPtr<${objectType}> BindingTraits<${objectType}>::runtimeCast(RefPtr<Inspector::InspectorValue>&& value)
</del><ins>+"""RefPtr<${objectType}> BindingTraits<${objectType}>::runtimeCast(RefPtr<InspectorValue>&& value)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::InspectorObject> result;
</del><ins>+ RefPtr<InspectorObject> result;
</ins><span class="cx"> bool castSucceeded = value->asObject(result);
</span><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> BindingTraits<${objectType}>::assertValueHasExpectedType(result.get());
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><del>- COMPILE_ASSERT(sizeof(${objectType}) == sizeof(Inspector::InspectorObjectBase), type_cast_problem);
- return static_cast<${objectType}*>(static_cast<Inspector::InspectorObjectBase*>(result.get()));
</del><ins>+ COMPILE_ASSERT(sizeof(${objectType}) == sizeof(InspectorObjectBase), type_cast_problem);
+ return static_cast<${objectType}*>(static_cast<InspectorObjectBase*>(result.get()));
</ins><span class="cx"> }
</span><span class="cx"> """)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_backend_dispatcher_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> lines = []
</span><span class="cx"> lines.append('#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)')
</span><span class="cx"> for domain in domains:
</span><del>- lines.append(self.wrap_with_guard_for_domain(domain, 'class AlternateInspector%sBackendDispatcher;' % domain.domain_name))
</del><ins>+ lines.append(self.wrap_with_guard_for_domain(domain, 'class Alternate%sBackendDispatcher;' % domain.domain_name))
</ins><span class="cx"> lines.append('#endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)')
</span><span class="cx"> return '\n'.join(lines)
</span><span class="cx">
</span><span class="lines">@@ -197,4 +197,4 @@
</span><span class="cx"> return self.wrap_with_guard_for_domain(domain, Template(CppTemplates.BackendDispatcherHeaderDomainDispatcherDeclaration).substitute(None, **handler_args))
</span><span class="cx">
</span><span class="cx"> def _generate_dispatcher_declaration_for_command(self, command):
</span><del>- return " void %s(long callId, const Inspector::InspectorObject& message);" % command.command_name
</del><ins>+ return " void %s(long callId, const InspectorObject& message);" % command.command_name
</ins></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 (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> destructor_args = {
</span><span class="cx"> 'domainName': domain.domain_name
</span><span class="cx"> }
</span><del>- destructor = 'Inspector%(domainName)sBackendDispatcherHandler::~Inspector%(domainName)sBackendDispatcherHandler() { }' % destructor_args
</del><ins>+ destructor = '%(domainName)sBackendDispatcherHandler::~%(domainName)sBackendDispatcherHandler() { }' % destructor_args
</ins><span class="cx"> return self.wrap_with_guard_for_domain(domain, destructor)
</span><span class="cx">
</span><span class="cx"> def _generate_dispatcher_implementations_for_domain(self, domain):
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> 'domainName': domain.domain_name,
</span><span class="cx"> 'commandName': command.command_name
</span><span class="cx"> }
</span><del>- cases.append(' { "%(commandName)s", &Inspector%(domainName)sBackendDispatcher::%(commandName)s },' % args)
</del><ins>+ cases.append(' { "%(commandName)s", &%(domainName)sBackendDispatcher::%(commandName)s },' % args)
</ins><span class="cx">
</span><span class="cx"> switch_args = {
</span><span class="cx"> 'domainName': domain.domain_name,
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> 'successOutParam': out_success_argument
</span><span class="cx"> }
</span><span class="cx">
</span><del>- in_parameter_declarations.append(' %(parameterType)s in_%(parameterName)s = InspectorBackendDispatcher::%(keyedGetMethod)s(paramsContainer.get(), ASCIILiteral("%(parameterName)s"), %(successOutParam)s, protocolErrors.get());' % param_args)
</del><ins>+ in_parameter_declarations.append(' %(parameterType)s in_%(parameterName)s = BackendDispatcher::%(keyedGetMethod)s(paramsContainer.get(), ASCIILiteral("%(parameterName)s"), %(successOutParam)s, protocolErrors.get());' % param_args)
</ins><span class="cx">
</span><span class="cx"> if parameter.is_optional:
</span><span class="cx"> optional_in_parameter_string = '%(parameterName)s_valueFound ? %(parameterExpression)s : nullptr' % param_args
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> out_parameter_assignments.append(' callback->disable();')
</span><del>- out_parameter_assignments.append(' m_backendDispatcher->reportProtocolError(&callId, Inspector::InspectorBackendDispatcher::ServerError, error);')
</del><ins>+ out_parameter_assignments.append(' m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::ServerError, error);')
</ins><span class="cx"> out_parameter_assignments.append(' return;')
</span><span class="cx"> method_parameters.append('callback.copyRef()')
</span><span class="cx">
</span><span class="lines">@@ -251,9 +251,9 @@
</span><span class="cx">
</span><span class="cx"> lines = []
</span><span class="cx"> if len(command.call_parameters) == 0:
</span><del>- lines.append('void Inspector%(domainName)sBackendDispatcher::%(commandName)s(long callId, const InspectorObject&)' % command_args)
</del><ins>+ lines.append('void %(domainName)sBackendDispatcher::%(commandName)s(long callId, const InspectorObject&)' % command_args)
</ins><span class="cx"> else:
</span><del>- lines.append('void Inspector%(domainName)sBackendDispatcher::%(commandName)s(long callId, const InspectorObject& message)' % command_args)
</del><ins>+ lines.append('void %(domainName)sBackendDispatcher::%(commandName)s(long callId, const InspectorObject& message)' % command_args)
</ins><span class="cx"> lines.append('{')
</span><span class="cx">
</span><span class="cx"> if len(command.call_parameters) > 0:
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> lines.append(' ErrorString error;')
</span><span class="cx"> lines.append(' Ref<InspectorObject> result = InspectorObject::create();')
</span><span class="cx"> if command.is_async:
</span><del>- lines.append(' Ref<Inspector%(domainName)sBackendDispatcherHandler::%(callbackName)s> callback = adoptRef(*new Inspector%(domainName)sBackendDispatcherHandler::%(callbackName)s(m_backendDispatcher.copyRef(), callId));' % command_args)
</del><ins>+ lines.append(' Ref<%(domainName)sBackendDispatcherHandler::%(callbackName)s> callback = adoptRef(*new %(domainName)sBackendDispatcherHandler::%(callbackName)s(m_backendDispatcher.copyRef(), callId));' % command_args)
</ins><span class="cx"> if len(command.return_parameters) > 0:
</span><span class="cx"> lines.extend(out_parameter_declarations)
</span><span class="cx"> lines.append(' m_agent->%(commandName)s(%(invocationParameters)s);' % command_args)
</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 (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> 'formalParameters': ", ".join(formal_parameters)
</span><span class="cx"> }
</span><span class="cx">
</span><del>- lines.append('void Inspector%(domainName)sFrontendDispatcher::%(eventName)s(%(formalParameters)s)' % event_args)
</del><ins>+ lines.append('void %(domainName)sFrontendDispatcher::%(eventName)s(%(formalParameters)s)' % event_args)
</ins><span class="cx"> lines.append('{')
</span><span class="cx"> lines.append(' Ref<InspectorObject> jsonMessage = InspectorObject::create();')
</span><span class="cx"> lines.append(' jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("%(domainName)s.%(eventName)s"));' % event_args)
</span><span class="lines">@@ -116,6 +116,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_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());')
</del><ins>+ lines.append(' m_frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());')
</ins><span class="cx"> lines.append('}')
</span><span class="cx"> return "\n".join(lines)
</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 (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> lines = []
</span><span class="cx"> lines.append(self._generate_event_signature(domain, event))
</span><span class="cx"> lines.append('{')
</span><del>- lines.append(' InspectorFrontendChannel* frontendChannel = _controller->frontendChannel();')
</del><ins>+ lines.append(' FrontendChannel* frontendChannel = _controller->frontendChannel();')
</ins><span class="cx"> lines.append(' if (!frontendChannel)')
</span><span class="cx"> lines.append(' return;')
</span><span class="cx"> lines.append('')
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenobjc_generator_templatespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator_templates.py (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator_templates.py 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/objc_generator_templates.py 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -93,14 +93,14 @@
</span><span class="cx"> """""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherHeaderDomainHandlerInterfaceDeclaration = (
</span><del>- """class AlternateInspector${domainName}BackendDispatcher : public AlternateInspectorBackendDispatcher {
</del><ins>+ """class Alternate${domainName}BackendDispatcher : public AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- virtual ~AlternateInspector${domainName}BackendDispatcher() { }
</del><ins>+ virtual ~Alternate${domainName}BackendDispatcher() { }
</ins><span class="cx"> ${commandDeclarations}
</span><span class="cx"> };""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherHeaderDomainHandlerObjCDeclaration = (
</span><del>- """class ObjCInspector${domainName}BackendDispatcher final : public AlternateInspector${domainName}BackendDispatcher {
</del><ins>+ """class ObjCInspector${domainName}BackendDispatcher final : public Alternate${domainName}BackendDispatcher {
</ins><span class="cx"> public:
</span><span class="cx"> ObjCInspector${domainName}BackendDispatcher(id<${objcPrefix}${domainName}DomainHandler> handler) { m_delegate = handler; }
</span><span class="cx"> ${commandDeclarations}
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> _${variableNamePrefix}Handler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspector${domainName}BackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<Inspector${domainName}BackendDispatcher, AlternateInspector${domainName}BackendDispatcher>>(ASCIILiteral("${domainName}"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<${domainName}BackendDispatcher, Alternate${domainName}BackendDispatcher>>(ASCIILiteral("${domainName}"), WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,18 +39,18 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><del>-class AlternateInspectorDatabaseBackendDispatcher : public AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateDatabaseBackendDispatcher : public AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- virtual ~AlternateInspectorDatabaseBackendDispatcher() { }
</del><ins>+ virtual ~AlternateDatabaseBackendDispatcher() { }
</ins><span class="cx"> virtual void executeSQLSyncOptionalReturnValues(long callId, int in_databaseId, const String& in_query) = 0;
</span><span class="cx"> virtual void executeSQLAsyncOptionalReturnValues(long callId, int in_databaseId, const String& in_query) = 0;
</span><span class="cx"> virtual void executeSQLSync(long callId, int in_databaseId, const String& in_query) = 0;
</span><span class="lines">@@ -148,10 +148,10 @@
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><del>-class AlternateInspectorDatabaseBackendDispatcher;
</del><ins>+class AlternateDatabaseBackendDispatcher;
</ins><span class="cx"> #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><del>-class InspectorDatabaseBackendDispatcherHandler {
</del><ins>+class DatabaseBackendDispatcherHandler {
</ins><span class="cx"> public:
</span><span class="cx"> // Named after parameter 'screenColor' while generating command/event executeSQLSyncOptionalReturnValues.
</span><span class="cx"> enum class ScreenColor {
</span><span class="lines">@@ -166,41 +166,41 @@
</span><span class="cx"> Yellow = 5,
</span><span class="cx"> Black = 6,
</span><span class="cx"> }; // enum class PrintColor
</span><del>- virtual void executeSQLSyncOptionalReturnValues(ErrorString&, int in_databaseId, const String& in_query, RefPtr<Inspector::Protocol::Array<String>>& opt_out_columnNames, Inspector::Protocol::OptOutput<String>* opt_out_notes, Inspector::Protocol::OptOutput<double>* opt_out_timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::Protocol::OptOutput<int>* opt_out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& opt_out_sqlError, Inspector::Protocol::Database::PrimaryColors* opt_out_screenColor, RefPtr<Inspector::Protocol::Database::ColorList>& opt_out_alternateColors, InspectorDatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
- class ExecuteSQLAsyncOptionalReturnValuesCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
</del><ins>+ virtual void executeSQLSyncOptionalReturnValues(ErrorString&, int in_databaseId, const String& in_query, RefPtr<Inspector::Protocol::Array<String>>& opt_out_columnNames, Inspector::Protocol::OptOutput<String>* opt_out_notes, Inspector::Protocol::OptOutput<double>* opt_out_timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::Protocol::OptOutput<int>* opt_out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& opt_out_sqlError, Inspector::Protocol::Database::PrimaryColors* opt_out_screenColor, RefPtr<Inspector::Protocol::Database::ColorList>& opt_out_alternateColors, DatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
+ class ExecuteSQLAsyncOptionalReturnValuesCallback : public BackendDispatcher::CallbackBase {
</ins><span class="cx"> public:
</span><del>- ExecuteSQLAsyncOptionalReturnValuesCallback(Ref<Inspector::InspectorBackendDispatcher>&&, int id);
</del><ins>+ ExecuteSQLAsyncOptionalReturnValuesCallback(Ref<BackendDispatcher>&&, int id);
</ins><span class="cx"> void sendSuccess(RefPtr<Inspector::Protocol::Array<String>>&& columnNames, Inspector::Protocol::OptOutput<String>* notes, Inspector::Protocol::OptOutput<double>* timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* payload, Inspector::Protocol::OptOutput<int>* databaseId, RefPtr<Inspector::Protocol::Database::Error>&& sqlError, Inspector::Protocol::OptOutput<String>* screenColor, RefPtr<Inspector::Protocol::Database::ColorList>&& alternateColors, Inspector::Protocol::OptOutput<String>* printColor);
</span><span class="cx"> };
</span><span class="cx"> virtual void executeSQLAsyncOptionalReturnValues(ErrorString&, int in_databaseId, const String& in_query, Ref<ExecuteSQLAsyncOptionalReturnValuesCallback>&& callback) = 0;
</span><del>- virtual void executeSQLSync(ErrorString&, int in_databaseId, const String& in_query, RefPtr<Inspector::Protocol::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& out_sqlError, RefPtr<Inspector::Protocol::Database::ColorList>& out_alternateColors, Inspector::Protocol::Database::PrimaryColors* out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* out_printColor) = 0;
- class ExecuteSQLAsyncCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
</del><ins>+ virtual void executeSQLSync(ErrorString&, int in_databaseId, const String& in_query, RefPtr<Inspector::Protocol::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& out_sqlError, RefPtr<Inspector::Protocol::Database::ColorList>& out_alternateColors, Inspector::Protocol::Database::PrimaryColors* out_screenColor, DatabaseBackendDispatcherHandler::PrintColor* out_printColor) = 0;
+ class ExecuteSQLAsyncCallback : public BackendDispatcher::CallbackBase {
</ins><span class="cx"> public:
</span><del>- ExecuteSQLAsyncCallback(Ref<Inspector::InspectorBackendDispatcher>&&, int id);
</del><ins>+ ExecuteSQLAsyncCallback(Ref<BackendDispatcher>&&, int id);
</ins><span class="cx"> void sendSuccess(RefPtr<Inspector::Protocol::Array<String>>&& columnNames, const String& notes, double timestamp, Inspector::InspectorObject values, Inspector::InspectorValue payload, int databaseId, RefPtr<Inspector::Protocol::Database::Error>&& sqlError, const String& screenColor, RefPtr<Inspector::Protocol::Database::ColorList>&& alternateColors, const String& printColor);
</span><span class="cx"> };
</span><span class="cx"> virtual void executeSQLAsync(ErrorString&, int in_databaseId, const String& in_query, Ref<ExecuteSQLAsyncCallback>&& callback) = 0;
</span><span class="cx"> protected:
</span><del>- virtual ~InspectorDatabaseBackendDispatcherHandler();
</del><ins>+ virtual ~DatabaseBackendDispatcherHandler();
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class InspectorDatabaseBackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</del><ins>+class DatabaseBackendDispatcher final : public SupplementalBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- static Ref<InspectorDatabaseBackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static Ref<DatabaseBackendDispatcher> create(BackendDispatcher*, DatabaseBackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, Ref<InspectorObject>&& message) override;
</ins><span class="cx"> private:
</span><del>- void executeSQLSyncOptionalReturnValues(long callId, const Inspector::InspectorObject& message);
- void executeSQLAsyncOptionalReturnValues(long callId, const Inspector::InspectorObject& message);
- void executeSQLSync(long callId, const Inspector::InspectorObject& message);
- void executeSQLAsync(long callId, const Inspector::InspectorObject& message);
</del><ins>+ void executeSQLSyncOptionalReturnValues(long callId, const InspectorObject& message);
+ void executeSQLAsyncOptionalReturnValues(long callId, const InspectorObject& message);
+ void executeSQLSync(long callId, const InspectorObject& message);
+ void executeSQLAsync(long callId, const InspectorObject& message);
</ins><span class="cx"> private:
</span><del>- InspectorDatabaseBackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorDatabaseBackendDispatcherHandler*);
- InspectorDatabaseBackendDispatcherHandler* m_agent;
</del><ins>+ DatabaseBackendDispatcher(BackendDispatcher&, DatabaseBackendDispatcherHandler*);
+ DatabaseBackendDispatcherHandler* m_agent;
</ins><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><del>- void setAlternateDispatcher(AlternateInspectorDatabaseBackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</del><ins>+ void setAlternateDispatcher(AlternateDatabaseBackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</ins><span class="cx"> private:
</span><del>- AlternateInspectorDatabaseBackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateDatabaseBackendDispatcher* m_alternateDispatcher;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -253,15 +253,15 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-InspectorDatabaseBackendDispatcherHandler::~InspectorDatabaseBackendDispatcherHandler() { }
</del><ins>+DatabaseBackendDispatcherHandler::~DatabaseBackendDispatcherHandler() { }
</ins><span class="cx">
</span><del>-Ref<InspectorDatabaseBackendDispatcher> InspectorDatabaseBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
</del><ins>+Ref<DatabaseBackendDispatcher> DatabaseBackendDispatcher::create(BackendDispatcher* backendDispatcher, DatabaseBackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorDatabaseBackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new DatabaseBackendDispatcher(*backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDatabaseBackendDispatcher::InspectorDatabaseBackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
- : InspectorSupplementalBackendDispatcher(backendDispatcher)
</del><ins>+DatabaseBackendDispatcher::DatabaseBackendDispatcher(BackendDispatcher& backendDispatcher, DatabaseBackendDispatcherHandler* agent)
+ : SupplementalBackendDispatcher(backendDispatcher)
</ins><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> , m_alternateDispatcher(nullptr)
</span><span class="lines">@@ -270,9 +270,9 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Database"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void DatabaseBackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</ins><span class="cx"> {
</span><del>- Ref<InspectorDatabaseBackendDispatcher> protect(*this);
</del><ins>+ Ref<DatabaseBackendDispatcher> protect(*this);
</ins><span class="cx">
</span><span class="cx"> if (method == "executeSQLSyncOptionalReturnValues")
</span><span class="cx"> executeSQLSyncOptionalReturnValues(callId, message);
</span><span class="lines">@@ -283,19 +283,19 @@
</span><span class="cx"> else if (method == "executeSQLAsync")
</span><span class="cx"> executeSQLAsync(callId, message);
</span><span class="cx"> else
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\'', "Database", '.', method, "' was not found"));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::MethodNotFound, makeString('\'', "Database", '.', method, "' was not found"));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcher::executeSQLSyncOptionalReturnValues(long callId, const InspectorObject& message)
</del><ins>+void DatabaseBackendDispatcher::executeSQLSyncOptionalReturnValues(long callId, const InspectorObject& message)
</ins><span class="cx"> {
</span><span class="cx"> auto protocolErrors = Inspector::Protocol::Array<String>::create();
</span><span class="cx"> RefPtr<InspectorObject> paramsContainer;
</span><span class="cx"> message.getObject(ASCIILiteral("params"), paramsContainer);
</span><del>- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
- String in_query = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</del><ins>+ int in_databaseId = BackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
+ String in_query = BackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeSQLSyncOptionalReturnValues");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
</span><span class="cx"> Inspector::Protocol::Database::PrimaryColors out_screenColor;
</span><span class="cx"> RefPtr<Inspector::Protocol::Database::ColorList> out_alternateColors;
</span><del>- InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
</del><ins>+ DatabaseBackendDispatcherHandler::PrintColor out_printColor;
</ins><span class="cx"> m_agent->executeSQLSyncOptionalReturnValues(error, in_databaseId, in_query, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, &out_screenColor, out_alternateColors, &out_printColor);
</span><span class="cx">
</span><span class="cx"> if (!error.length()) {
</span><span class="lines">@@ -345,9 +345,9 @@
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::ExecuteSQLAsyncOptionalReturnValuesCallback(Ref<InspectorBackendDispatcher>&& backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(WTF::move(backendDispatcher), id) { }
</del><ins>+DatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::ExecuteSQLAsyncOptionalReturnValuesCallback(Ref<BackendDispatcher>&& backendDispatcher, int id) : BackendDispatcher::CallbackBase(WTF::move(backendDispatcher), id) { }
</ins><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::sendSuccess(RefPtr<Inspector::Protocol::Array<String>>&& columnNames, Inspector::Protocol::OptOutput<String>* notes, Inspector::Protocol::OptOutput<double>* timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* payload, Inspector::Protocol::OptOutput<int>* databaseId, RefPtr<Inspector::Protocol::Database::Error>&& sqlError, Inspector::Protocol::OptOutput<String>* screenColor, RefPtr<Inspector::Protocol::Database::ColorList>&& alternateColors, Inspector::Protocol::OptOutput<String>* printColor)
</del><ins>+void DatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::sendSuccess(RefPtr<Inspector::Protocol::Array<String>>&& columnNames, Inspector::Protocol::OptOutput<String>* notes, Inspector::Protocol::OptOutput<double>* timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* payload, Inspector::Protocol::OptOutput<int>* databaseId, RefPtr<Inspector::Protocol::Database::Error>&& sqlError, Inspector::Protocol::OptOutput<String>* screenColor, RefPtr<Inspector::Protocol::Database::ColorList>&& alternateColors, Inspector::Protocol::OptOutput<String>* printColor)
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> if (columnNames)
</span><span class="lines">@@ -373,16 +373,16 @@
</span><span class="cx"> sendIfActive(WTF::move(jsonMessage), ErrorString());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcher::executeSQLAsyncOptionalReturnValues(long callId, const InspectorObject& message)
</del><ins>+void DatabaseBackendDispatcher::executeSQLAsyncOptionalReturnValues(long callId, const InspectorObject& message)
</ins><span class="cx"> {
</span><span class="cx"> auto protocolErrors = Inspector::Protocol::Array<String>::create();
</span><span class="cx"> RefPtr<InspectorObject> paramsContainer;
</span><span class="cx"> message.getObject(ASCIILiteral("params"), paramsContainer);
</span><del>- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
- String in_query = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</del><ins>+ int in_databaseId = BackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
+ String in_query = BackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeSQLAsyncOptionalReturnValues");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -395,26 +395,26 @@
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><span class="cx"> Ref<InspectorObject> result = InspectorObject::create();
</span><del>- Ref<InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback> callback = adoptRef(*new InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback(m_backendDispatcher.copyRef(), callId));
</del><ins>+ Ref<DatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback> callback = adoptRef(*new DatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback(m_backendDispatcher.copyRef(), callId));
</ins><span class="cx"> m_agent->executeSQLAsyncOptionalReturnValues(error, in_databaseId, in_query, callback.copyRef());
</span><span class="cx">
</span><span class="cx"> if (error.length()) {
</span><span class="cx"> callback->disable();
</span><del>- m_backendDispatcher->reportProtocolError(&callId, Inspector::InspectorBackendDispatcher::ServerError, error);
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::ServerError, error);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcher::executeSQLSync(long callId, const InspectorObject& message)
</del><ins>+void DatabaseBackendDispatcher::executeSQLSync(long callId, const InspectorObject& message)
</ins><span class="cx"> {
</span><span class="cx"> auto protocolErrors = Inspector::Protocol::Array<String>::create();
</span><span class="cx"> RefPtr<InspectorObject> paramsContainer;
</span><span class="cx"> message.getObject(ASCIILiteral("params"), paramsContainer);
</span><del>- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
- String in_query = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</del><ins>+ int in_databaseId = BackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
+ String in_query = BackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeSQLSync");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
</span><span class="cx"> RefPtr<Inspector::Protocol::Database::ColorList> out_alternateColors;
</span><span class="cx"> Inspector::Protocol::Database::PrimaryColors out_screenColor;
</span><del>- InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
</del><ins>+ DatabaseBackendDispatcherHandler::PrintColor out_printColor;
</ins><span class="cx"> m_agent->executeSQLSync(error, in_databaseId, in_query, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, out_alternateColors, &out_screenColor, &out_printColor);
</span><span class="cx">
</span><span class="cx"> if (!error.length()) {
</span><span class="lines">@@ -454,9 +454,9 @@
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::ExecuteSQLAsyncCallback(Ref<InspectorBackendDispatcher>&& backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(WTF::move(backendDispatcher), id) { }
</del><ins>+DatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::ExecuteSQLAsyncCallback(Ref<BackendDispatcher>&& backendDispatcher, int id) : BackendDispatcher::CallbackBase(WTF::move(backendDispatcher), id) { }
</ins><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::sendSuccess(RefPtr<Inspector::Protocol::Array<String>>&& columnNames, const String& notes, double timestamp, Inspector::InspectorObject values, Inspector::InspectorValue payload, int databaseId, RefPtr<Inspector::Protocol::Database::Error>&& sqlError, const String& screenColor, RefPtr<Inspector::Protocol::Database::ColorList>&& alternateColors, const String& printColor)
</del><ins>+void DatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::sendSuccess(RefPtr<Inspector::Protocol::Array<String>>&& columnNames, const String& notes, double timestamp, Inspector::InspectorObject values, Inspector::InspectorValue payload, int databaseId, RefPtr<Inspector::Protocol::Database::Error>&& sqlError, const String& screenColor, RefPtr<Inspector::Protocol::Database::ColorList>&& alternateColors, const String& printColor)
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setArray(ASCIILiteral("columnNames"), columnNames);
</span><span class="lines">@@ -472,16 +472,16 @@
</span><span class="cx"> sendIfActive(WTF::move(jsonMessage), ErrorString());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcher::executeSQLAsync(long callId, const InspectorObject& message)
</del><ins>+void DatabaseBackendDispatcher::executeSQLAsync(long callId, const InspectorObject& message)
</ins><span class="cx"> {
</span><span class="cx"> auto protocolErrors = Inspector::Protocol::Array<String>::create();
</span><span class="cx"> RefPtr<InspectorObject> paramsContainer;
</span><span class="cx"> message.getObject(ASCIILiteral("params"), paramsContainer);
</span><del>- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
- String in_query = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</del><ins>+ int in_databaseId = BackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
+ String in_query = BackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeSQLAsync");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -494,12 +494,12 @@
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><span class="cx"> Ref<InspectorObject> result = InspectorObject::create();
</span><del>- Ref<InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback> callback = adoptRef(*new InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback(m_backendDispatcher.copyRef(), callId));
</del><ins>+ Ref<DatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback> callback = adoptRef(*new DatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback(m_backendDispatcher.copyRef(), callId));
</ins><span class="cx"> m_agent->executeSQLAsync(error, in_databaseId, in_query, callback.copyRef());
</span><span class="cx">
</span><span class="cx"> if (error.length()) {
</span><span class="cx"> callback->disable();
</span><del>- m_backendDispatcher->reportProtocolError(&callId, Inspector::InspectorBackendDispatcher::ServerError, error);
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::ServerError, error);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -684,14 +684,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*Error*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*Error*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -716,9 +716,9 @@
</span><span class="cx"> Ref<Error> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(Error) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(Error) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<Error>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -732,7 +732,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -848,7 +848,7 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx">
</span><del>-class ObjCInspectorDatabaseBackendDispatcher final : public AlternateInspectorDatabaseBackendDispatcher {
</del><ins>+class ObjCInspectorDatabaseBackendDispatcher final : public AlternateDatabaseBackendDispatcher {
</ins><span class="cx"> public:
</span><span class="cx"> ObjCInspectorDatabaseBackendDispatcher(id<RWIProtocolDatabaseDomainHandler> handler) { m_delegate = handler; }
</span><span class="cx"> virtual void executeSQLSyncOptionalReturnValues(long callId, int in_databaseId, const String& in_query) override;
</span><span class="lines">@@ -937,7 +937,7 @@
</span><span class="cx"> _databaseHandler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorDatabaseBackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<InspectorDatabaseBackendDispatcher, AlternateInspectorDatabaseBackendDispatcher>>(ASCIILiteral("Database"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<DatabaseBackendDispatcher, AlternateDatabaseBackendDispatcher>>(ASCIILiteral("Database"), WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,18 +39,18 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><del>-class AlternateInspectorDatabaseBackendDispatcher : public AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateDatabaseBackendDispatcher : public AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- virtual ~AlternateInspectorDatabaseBackendDispatcher() { }
</del><ins>+ virtual ~AlternateDatabaseBackendDispatcher() { }
</ins><span class="cx"> virtual void executeAllOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String* in_screenColor, const RefPtr<Inspector::InspectorArray>&& in_alternateColors, const String* in_printColor) = 0;
</span><span class="cx"> virtual void executeNoOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String& in_screenColor, const RefPtr<Inspector::InspectorArray>&& in_alternateColors, const String& in_printColor) = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -143,10 +143,10 @@
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><del>-class AlternateInspectorDatabaseBackendDispatcher;
</del><ins>+class AlternateDatabaseBackendDispatcher;
</ins><span class="cx"> #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><del>-class InspectorDatabaseBackendDispatcherHandler {
</del><ins>+class DatabaseBackendDispatcherHandler {
</ins><span class="cx"> public:
</span><span class="cx"> // Named after parameter 'screenColor' while generating command/event executeAllOptionalParameters.
</span><span class="cx"> enum class ScreenColor {
</span><span class="lines">@@ -161,27 +161,27 @@
</span><span class="cx"> Yellow = 5,
</span><span class="cx"> Black = 6,
</span><span class="cx"> }; // enum class PrintColor
</span><del>- virtual void executeAllOptionalParameters(ErrorString&, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String* in_screenColor, const RefPtr<Inspector::InspectorArray>&& in_alternateColors, const String* in_printColor, RefPtr<Inspector::Protocol::Array<String>>& opt_out_columnNames, Inspector::Protocol::OptOutput<String>* opt_out_notes, Inspector::Protocol::OptOutput<double>* opt_out_timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::Protocol::OptOutput<int>* opt_out_databaseId, RefPtr<I
nspector::Protocol::Database::Error>& opt_out_sqlError, Inspector::Protocol::Database::PrimaryColors* opt_out_screenColor, RefPtr<Inspector::Protocol::Database::ColorList>& opt_out_alternateColors, InspectorDatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
- virtual void executeNoOptionalParameters(ErrorString&, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String& in_screenColor, const RefPtr<Inspector::InspectorArray>&& in_alternateColors, const String& in_printColor, RefPtr<Inspector::Protocol::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& out_sqlError, Inspector::Protocol::Database::PrimaryColors* out_screenColor, RefPtr<Inspector::Protocol::Database::ColorList>& out_alternateColors, InspectorDatabaseBackendDispatche
rHandler::PrintColor* out_printColor) = 0;
</del><ins>+ virtual void executeAllOptionalParameters(ErrorString&, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String* in_screenColor, const RefPtr<Inspector::InspectorArray>&& in_alternateColors, const String* in_printColor, RefPtr<Inspector::Protocol::Array<String>>& opt_out_columnNames, Inspector::Protocol::OptOutput<String>* opt_out_notes, Inspector::Protocol::OptOutput<double>* opt_out_timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::Protocol::OptOutput<int>* opt_out_databaseId, RefPtr<In
spector::Protocol::Database::Error>& opt_out_sqlError, Inspector::Protocol::Database::PrimaryColors* opt_out_screenColor, RefPtr<Inspector::Protocol::Database::ColorList>& opt_out_alternateColors, DatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
+ virtual void executeNoOptionalParameters(ErrorString&, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String& in_screenColor, const RefPtr<Inspector::InspectorArray>&& in_alternateColors, const String& in_printColor, RefPtr<Inspector::Protocol::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& out_sqlError, Inspector::Protocol::Database::PrimaryColors* out_screenColor, RefPtr<Inspector::Protocol::Database::ColorList>& out_alternateColors, DatabaseBackendDispatcherHandler:
:PrintColor* out_printColor) = 0;
</ins><span class="cx"> protected:
</span><del>- virtual ~InspectorDatabaseBackendDispatcherHandler();
</del><ins>+ virtual ~DatabaseBackendDispatcherHandler();
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class InspectorDatabaseBackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</del><ins>+class DatabaseBackendDispatcher final : public SupplementalBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- static Ref<InspectorDatabaseBackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static Ref<DatabaseBackendDispatcher> create(BackendDispatcher*, DatabaseBackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, Ref<InspectorObject>&& message) override;
</ins><span class="cx"> private:
</span><del>- void executeAllOptionalParameters(long callId, const Inspector::InspectorObject& message);
- void executeNoOptionalParameters(long callId, const Inspector::InspectorObject& message);
</del><ins>+ void executeAllOptionalParameters(long callId, const InspectorObject& message);
+ void executeNoOptionalParameters(long callId, const InspectorObject& message);
</ins><span class="cx"> private:
</span><del>- InspectorDatabaseBackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorDatabaseBackendDispatcherHandler*);
- InspectorDatabaseBackendDispatcherHandler* m_agent;
</del><ins>+ DatabaseBackendDispatcher(BackendDispatcher&, DatabaseBackendDispatcherHandler*);
+ DatabaseBackendDispatcherHandler* m_agent;
</ins><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><del>- void setAlternateDispatcher(AlternateInspectorDatabaseBackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</del><ins>+ void setAlternateDispatcher(AlternateDatabaseBackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</ins><span class="cx"> private:
</span><del>- AlternateInspectorDatabaseBackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateDatabaseBackendDispatcher* m_alternateDispatcher;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -234,15 +234,15 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-InspectorDatabaseBackendDispatcherHandler::~InspectorDatabaseBackendDispatcherHandler() { }
</del><ins>+DatabaseBackendDispatcherHandler::~DatabaseBackendDispatcherHandler() { }
</ins><span class="cx">
</span><del>-Ref<InspectorDatabaseBackendDispatcher> InspectorDatabaseBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
</del><ins>+Ref<DatabaseBackendDispatcher> DatabaseBackendDispatcher::create(BackendDispatcher* backendDispatcher, DatabaseBackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorDatabaseBackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new DatabaseBackendDispatcher(*backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDatabaseBackendDispatcher::InspectorDatabaseBackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
- : InspectorSupplementalBackendDispatcher(backendDispatcher)
</del><ins>+DatabaseBackendDispatcher::DatabaseBackendDispatcher(BackendDispatcher& backendDispatcher, DatabaseBackendDispatcherHandler* agent)
+ : SupplementalBackendDispatcher(backendDispatcher)
</ins><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> , m_alternateDispatcher(nullptr)
</span><span class="lines">@@ -251,46 +251,46 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Database"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void DatabaseBackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</ins><span class="cx"> {
</span><del>- Ref<InspectorDatabaseBackendDispatcher> protect(*this);
</del><ins>+ Ref<DatabaseBackendDispatcher> protect(*this);
</ins><span class="cx">
</span><span class="cx"> if (method == "executeAllOptionalParameters")
</span><span class="cx"> executeAllOptionalParameters(callId, message);
</span><span class="cx"> else if (method == "executeNoOptionalParameters")
</span><span class="cx"> executeNoOptionalParameters(callId, message);
</span><span class="cx"> else
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\'', "Database", '.', method, "' was not found"));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::MethodNotFound, makeString('\'', "Database", '.', method, "' was not found"));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcher::executeAllOptionalParameters(long callId, const InspectorObject& message)
</del><ins>+void DatabaseBackendDispatcher::executeAllOptionalParameters(long callId, const InspectorObject& message)
</ins><span class="cx"> {
</span><span class="cx"> auto protocolErrors = Inspector::Protocol::Array<String>::create();
</span><span class="cx"> RefPtr<InspectorObject> paramsContainer;
</span><span class="cx"> message.getObject(ASCIILiteral("params"), paramsContainer);
</span><span class="cx"> bool columnNames_valueFound = false;
</span><del>- RefPtr<Inspector::InspectorArray> in_columnNames = InspectorBackendDispatcher::getArray(paramsContainer.get(), ASCIILiteral("columnNames"), &columnNames_valueFound, protocolErrors.get());
</del><ins>+ RefPtr<Inspector::InspectorArray> in_columnNames = BackendDispatcher::getArray(paramsContainer.get(), ASCIILiteral("columnNames"), &columnNames_valueFound, protocolErrors.get());
</ins><span class="cx"> bool notes_valueFound = false;
</span><del>- String in_notes = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("notes"), &notes_valueFound, protocolErrors.get());
</del><ins>+ String in_notes = BackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("notes"), &notes_valueFound, protocolErrors.get());
</ins><span class="cx"> bool timestamp_valueFound = false;
</span><del>- Inspector::Protocol::OptOutput<double> in_timestamp = InspectorBackendDispatcher::getDouble(paramsContainer.get(), ASCIILiteral("timestamp"), &timestamp_valueFound, protocolErrors.get());
</del><ins>+ Inspector::Protocol::OptOutput<double> in_timestamp = BackendDispatcher::getDouble(paramsContainer.get(), ASCIILiteral("timestamp"), &timestamp_valueFound, protocolErrors.get());
</ins><span class="cx"> bool values_valueFound = false;
</span><del>- RefPtr<Inspector::InspectorObject> in_values = InspectorBackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("values"), &values_valueFound, protocolErrors.get());
</del><ins>+ RefPtr<Inspector::InspectorObject> in_values = BackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("values"), &values_valueFound, protocolErrors.get());
</ins><span class="cx"> bool payload_valueFound = false;
</span><del>- RefPtr<Inspector::InspectorValue> in_payload = InspectorBackendDispatcher::getValue(paramsContainer.get(), ASCIILiteral("payload"), &payload_valueFound, protocolErrors.get());
</del><ins>+ RefPtr<Inspector::InspectorValue> in_payload = BackendDispatcher::getValue(paramsContainer.get(), ASCIILiteral("payload"), &payload_valueFound, protocolErrors.get());
</ins><span class="cx"> bool databaseId_valueFound = false;
</span><del>- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), &databaseId_valueFound, protocolErrors.get());
</del><ins>+ int in_databaseId = BackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), &databaseId_valueFound, protocolErrors.get());
</ins><span class="cx"> bool sqlError_valueFound = false;
</span><del>- RefPtr<Inspector::InspectorObject> in_sqlError = InspectorBackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("sqlError"), &sqlError_valueFound, protocolErrors.get());
</del><ins>+ RefPtr<Inspector::InspectorObject> in_sqlError = BackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("sqlError"), &sqlError_valueFound, protocolErrors.get());
</ins><span class="cx"> bool screenColor_valueFound = false;
</span><del>- String in_screenColor = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("screenColor"), &screenColor_valueFound, protocolErrors.get());
</del><ins>+ String in_screenColor = BackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("screenColor"), &screenColor_valueFound, protocolErrors.get());
</ins><span class="cx"> bool alternateColors_valueFound = false;
</span><del>- RefPtr<Inspector::InspectorArray> in_alternateColors = InspectorBackendDispatcher::getArray(paramsContainer.get(), ASCIILiteral("alternateColors"), &alternateColors_valueFound, protocolErrors.get());
</del><ins>+ RefPtr<Inspector::InspectorArray> in_alternateColors = BackendDispatcher::getArray(paramsContainer.get(), ASCIILiteral("alternateColors"), &alternateColors_valueFound, protocolErrors.get());
</ins><span class="cx"> bool printColor_valueFound = false;
</span><del>- String in_printColor = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("printColor"), &printColor_valueFound, protocolErrors.get());
</del><ins>+ String in_printColor = BackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("printColor"), &printColor_valueFound, protocolErrors.get());
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeAllOptionalParameters");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
</span><span class="cx"> Inspector::Protocol::Database::PrimaryColors out_screenColor;
</span><span class="cx"> RefPtr<Inspector::Protocol::Database::ColorList> out_alternateColors;
</span><del>- InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
</del><ins>+ DatabaseBackendDispatcherHandler::PrintColor out_printColor;
</ins><span class="cx"> m_agent->executeAllOptionalParameters(error, columnNames_valueFound ? in_columnNames.copyRef() : nullptr, notes_valueFound ? &in_notes : nullptr, timestamp_valueFound ? &in_timestamp : nullptr, values_valueFound ? in_values.copyRef() : nullptr, payload_valueFound ? in_payload.copyRef() : nullptr, databaseId_valueFound ? &in_databaseId : nullptr, sqlError_valueFound ? in_sqlError.copyRef() : nullptr, screenColor_valueFound ? &in_screenColor : nullptr, alternateColors_valueFound ? in_alternateColors.copyRef() : nullptr, printColor_valueFound ? &in_printColor : nullptr, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, &out_screenColor, out_alternateColors, &out_printColor);
</span><span class="cx">
</span><span class="cx"> if (!error.length()) {
</span><span class="lines">@@ -340,24 +340,24 @@
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcher::executeNoOptionalParameters(long callId, const InspectorObject& message)
</del><ins>+void DatabaseBackendDispatcher::executeNoOptionalParameters(long callId, const InspectorObject& message)
</ins><span class="cx"> {
</span><span class="cx"> auto protocolErrors = Inspector::Protocol::Array<String>::create();
</span><span class="cx"> RefPtr<InspectorObject> paramsContainer;
</span><span class="cx"> message.getObject(ASCIILiteral("params"), paramsContainer);
</span><del>- RefPtr<Inspector::InspectorArray> in_columnNames = InspectorBackendDispatcher::getArray(paramsContainer.get(), ASCIILiteral("columnNames"), nullptr, protocolErrors.get());
- String in_notes = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("notes"), nullptr, protocolErrors.get());
- double in_timestamp = InspectorBackendDispatcher::getDouble(paramsContainer.get(), ASCIILiteral("timestamp"), nullptr, protocolErrors.get());
- RefPtr<Inspector::InspectorObject> in_values = InspectorBackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("values"), nullptr, protocolErrors.get());
- RefPtr<Inspector::InspectorValue> in_payload = InspectorBackendDispatcher::getValue(paramsContainer.get(), ASCIILiteral("payload"), nullptr, protocolErrors.get());
- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
- RefPtr<Inspector::InspectorObject> in_sqlError = InspectorBackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("sqlError"), nullptr, protocolErrors.get());
- String in_screenColor = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("screenColor"), nullptr, protocolErrors.get());
- RefPtr<Inspector::InspectorArray> in_alternateColors = InspectorBackendDispatcher::getArray(paramsContainer.get(), ASCIILiteral("alternateColors"), nullptr, protocolErrors.get());
- String in_printColor = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("printColor"), nullptr, protocolErrors.get());
</del><ins>+ RefPtr<Inspector::InspectorArray> in_columnNames = BackendDispatcher::getArray(paramsContainer.get(), ASCIILiteral("columnNames"), nullptr, protocolErrors.get());
+ String in_notes = BackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("notes"), nullptr, protocolErrors.get());
+ double in_timestamp = BackendDispatcher::getDouble(paramsContainer.get(), ASCIILiteral("timestamp"), nullptr, protocolErrors.get());
+ RefPtr<Inspector::InspectorObject> in_values = BackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("values"), nullptr, protocolErrors.get());
+ RefPtr<Inspector::InspectorValue> in_payload = BackendDispatcher::getValue(paramsContainer.get(), ASCIILiteral("payload"), nullptr, protocolErrors.get());
+ int in_databaseId = BackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
+ RefPtr<Inspector::InspectorObject> in_sqlError = BackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("sqlError"), nullptr, protocolErrors.get());
+ String in_screenColor = BackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("screenColor"), nullptr, protocolErrors.get());
+ RefPtr<Inspector::InspectorArray> in_alternateColors = BackendDispatcher::getArray(paramsContainer.get(), ASCIILiteral("alternateColors"), nullptr, protocolErrors.get());
+ String in_printColor = BackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("printColor"), nullptr, protocolErrors.get());
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeNoOptionalParameters");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
</span><span class="cx"> Inspector::Protocol::Database::PrimaryColors out_screenColor;
</span><span class="cx"> RefPtr<Inspector::Protocol::Database::ColorList> out_alternateColors;
</span><del>- InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
</del><ins>+ DatabaseBackendDispatcherHandler::PrintColor out_printColor;
</ins><span class="cx"> m_agent->executeNoOptionalParameters(error, in_columnNames.copyRef(), in_notes, in_timestamp, in_values.copyRef(), in_payload.copyRef(), in_databaseId, in_sqlError.copyRef(), in_screenColor, in_alternateColors.copyRef(), in_printColor, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, &out_screenColor, out_alternateColors, &out_printColor);
</span><span class="cx">
</span><span class="cx"> if (!error.length()) {
</span><span class="lines">@@ -577,14 +577,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*Error*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*Error*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -609,9 +609,9 @@
</span><span class="cx"> Ref<Error> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(Error) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(Error) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<Error>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -625,7 +625,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -741,7 +741,7 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx">
</span><del>-class ObjCInspectorDatabaseBackendDispatcher final : public AlternateInspectorDatabaseBackendDispatcher {
</del><ins>+class ObjCInspectorDatabaseBackendDispatcher final : public AlternateDatabaseBackendDispatcher {
</ins><span class="cx"> public:
</span><span class="cx"> ObjCInspectorDatabaseBackendDispatcher(id<RWIProtocolDatabaseDomainHandler> handler) { m_delegate = handler; }
</span><span class="cx"> virtual void executeAllOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String* in_screenColor, const RefPtr<Inspector::InspectorArray>&& in_alternateColors, const String* in_printColor) override;
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> _databaseHandler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorDatabaseBackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<InspectorDatabaseBackendDispatcher, AlternateInspectorDatabaseBackendDispatcher>>(ASCIILiteral("Database"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<DatabaseBackendDispatcher, AlternateDatabaseBackendDispatcher>>(ASCIILiteral("Database"), WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpecteddomainswithvaryingcommandsizesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,23 +39,23 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><del>-class AlternateInspectorNetwork1BackendDispatcher : public AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateNetwork1BackendDispatcher : public AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- virtual ~AlternateInspectorNetwork1BackendDispatcher() { }
</del><ins>+ virtual ~AlternateNetwork1BackendDispatcher() { }
</ins><span class="cx"> virtual void loadResource1(long callId) = 0;
</span><span class="cx"> };
</span><del>-class AlternateInspectorNetwork3BackendDispatcher : public AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateNetwork3BackendDispatcher : public AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- virtual ~AlternateInspectorNetwork3BackendDispatcher() { }
</del><ins>+ virtual ~AlternateNetwork3BackendDispatcher() { }
</ins><span class="cx"> virtual void loadResource1(long callId) = 0;
</span><span class="cx"> virtual void loadResource2(long callId) = 0;
</span><span class="cx"> virtual void loadResource3(long callId) = 0;
</span><span class="lines">@@ -161,18 +161,18 @@
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><del>-class AlternateInspectorNetwork1BackendDispatcher;
-class AlternateInspectorNetwork3BackendDispatcher;
</del><ins>+class AlternateNetwork1BackendDispatcher;
+class AlternateNetwork3BackendDispatcher;
</ins><span class="cx"> #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><del>-class InspectorNetwork1BackendDispatcherHandler {
</del><ins>+class Network1BackendDispatcherHandler {
</ins><span class="cx"> public:
</span><span class="cx"> virtual void loadResource1(ErrorString&) = 0;
</span><span class="cx"> protected:
</span><del>- virtual ~InspectorNetwork1BackendDispatcherHandler();
</del><ins>+ virtual ~Network1BackendDispatcherHandler();
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class InspectorNetwork3BackendDispatcherHandler {
</del><ins>+class Network3BackendDispatcherHandler {
</ins><span class="cx"> public:
</span><span class="cx"> virtual void loadResource1(ErrorString&) = 0;
</span><span class="cx"> virtual void loadResource2(ErrorString&) = 0;
</span><span class="lines">@@ -182,46 +182,46 @@
</span><span class="cx"> virtual void loadResource6(ErrorString&) = 0;
</span><span class="cx"> virtual void loadResource7(ErrorString&) = 0;
</span><span class="cx"> protected:
</span><del>- virtual ~InspectorNetwork3BackendDispatcherHandler();
</del><ins>+ virtual ~Network3BackendDispatcherHandler();
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class InspectorNetwork1BackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</del><ins>+class Network1BackendDispatcher final : public SupplementalBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- static Ref<InspectorNetwork1BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorNetwork1BackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static Ref<Network1BackendDispatcher> create(BackendDispatcher*, Network1BackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, Ref<InspectorObject>&& message) override;
</ins><span class="cx"> private:
</span><del>- void loadResource1(long callId, const Inspector::InspectorObject& message);
</del><ins>+ void loadResource1(long callId, const InspectorObject& message);
</ins><span class="cx"> private:
</span><del>- InspectorNetwork1BackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorNetwork1BackendDispatcherHandler*);
- InspectorNetwork1BackendDispatcherHandler* m_agent;
</del><ins>+ Network1BackendDispatcher(BackendDispatcher&, Network1BackendDispatcherHandler*);
+ Network1BackendDispatcherHandler* m_agent;
</ins><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><del>- void setAlternateDispatcher(AlternateInspectorNetwork1BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</del><ins>+ void setAlternateDispatcher(AlternateNetwork1BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</ins><span class="cx"> private:
</span><del>- AlternateInspectorNetwork1BackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateNetwork1BackendDispatcher* m_alternateDispatcher;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class InspectorNetwork3BackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</del><ins>+class Network3BackendDispatcher final : public SupplementalBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- static Ref<InspectorNetwork3BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorNetwork3BackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static Ref<Network3BackendDispatcher> create(BackendDispatcher*, Network3BackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, Ref<InspectorObject>&& message) override;
</ins><span class="cx"> private:
</span><del>- void loadResource1(long callId, const Inspector::InspectorObject& message);
- void loadResource2(long callId, const Inspector::InspectorObject& message);
- void loadResource3(long callId, const Inspector::InspectorObject& message);
- void loadResource4(long callId, const Inspector::InspectorObject& message);
- void loadResource5(long callId, const Inspector::InspectorObject& message);
- void loadResource6(long callId, const Inspector::InspectorObject& message);
- void loadResource7(long callId, const Inspector::InspectorObject& message);
</del><ins>+ void loadResource1(long callId, const InspectorObject& message);
+ void loadResource2(long callId, const InspectorObject& message);
+ void loadResource3(long callId, const InspectorObject& message);
+ void loadResource4(long callId, const InspectorObject& message);
+ void loadResource5(long callId, const InspectorObject& message);
+ void loadResource6(long callId, const InspectorObject& message);
+ void loadResource7(long callId, const InspectorObject& message);
</ins><span class="cx"> private:
</span><del>- InspectorNetwork3BackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorNetwork3BackendDispatcherHandler*);
- InspectorNetwork3BackendDispatcherHandler* m_agent;
</del><ins>+ Network3BackendDispatcher(BackendDispatcher&, Network3BackendDispatcherHandler*);
+ Network3BackendDispatcherHandler* m_agent;
</ins><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><del>- void setAlternateDispatcher(AlternateInspectorNetwork3BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</del><ins>+ void setAlternateDispatcher(AlternateNetwork3BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</ins><span class="cx"> private:
</span><del>- AlternateInspectorNetwork3BackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateNetwork3BackendDispatcher* m_alternateDispatcher;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -274,16 +274,16 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-InspectorNetwork1BackendDispatcherHandler::~InspectorNetwork1BackendDispatcherHandler() { }
-InspectorNetwork3BackendDispatcherHandler::~InspectorNetwork3BackendDispatcherHandler() { }
</del><ins>+Network1BackendDispatcherHandler::~Network1BackendDispatcherHandler() { }
+Network3BackendDispatcherHandler::~Network3BackendDispatcherHandler() { }
</ins><span class="cx">
</span><del>-Ref<InspectorNetwork1BackendDispatcher> InspectorNetwork1BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
</del><ins>+Ref<Network1BackendDispatcher> Network1BackendDispatcher::create(BackendDispatcher* backendDispatcher, Network1BackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorNetwork1BackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new Network1BackendDispatcher(*backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorNetwork1BackendDispatcher::InspectorNetwork1BackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
- : InspectorSupplementalBackendDispatcher(backendDispatcher)
</del><ins>+Network1BackendDispatcher::Network1BackendDispatcher(BackendDispatcher& backendDispatcher, Network1BackendDispatcherHandler* agent)
+ : SupplementalBackendDispatcher(backendDispatcher)
</ins><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> , m_alternateDispatcher(nullptr)
</span><span class="lines">@@ -292,17 +292,17 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Network1"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork1BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void Network1BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</ins><span class="cx"> {
</span><del>- Ref<InspectorNetwork1BackendDispatcher> protect(*this);
</del><ins>+ Ref<Network1BackendDispatcher> protect(*this);
</ins><span class="cx">
</span><span class="cx"> if (method == "loadResource1")
</span><span class="cx"> loadResource1(callId, message);
</span><span class="cx"> else
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\'', "Network1", '.', method, "' was not found"));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::MethodNotFound, makeString('\'', "Network1", '.', method, "' was not found"));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork1BackendDispatcher::loadResource1(long callId, const InspectorObject&)
</del><ins>+void Network1BackendDispatcher::loadResource1(long callId, const InspectorObject&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><span class="lines">@@ -318,13 +318,13 @@
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorNetwork3BackendDispatcher> InspectorNetwork3BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork3BackendDispatcherHandler* agent)
</del><ins>+Ref<Network3BackendDispatcher> Network3BackendDispatcher::create(BackendDispatcher* backendDispatcher, Network3BackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorNetwork3BackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new Network3BackendDispatcher(*backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorNetwork3BackendDispatcher::InspectorNetwork3BackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorNetwork3BackendDispatcherHandler* agent)
- : InspectorSupplementalBackendDispatcher(backendDispatcher)
</del><ins>+Network3BackendDispatcher::Network3BackendDispatcher(BackendDispatcher& backendDispatcher, Network3BackendDispatcherHandler* agent)
+ : SupplementalBackendDispatcher(backendDispatcher)
</ins><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> , m_alternateDispatcher(nullptr)
</span><span class="lines">@@ -333,11 +333,11 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Network3"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork3BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void Network3BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</ins><span class="cx"> {
</span><del>- Ref<InspectorNetwork3BackendDispatcher> protect(*this);
</del><ins>+ Ref<Network3BackendDispatcher> protect(*this);
</ins><span class="cx">
</span><del>- typedef void (InspectorNetwork3BackendDispatcher::*CallHandler)(long callId, const Inspector::InspectorObject& message);
</del><ins>+ typedef void (Network3BackendDispatcher::*CallHandler)(long callId, const InspectorObject& message);
</ins><span class="cx"> typedef HashMap<String, CallHandler> DispatchMap;
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(DispatchMap, dispatchMap, ());
</span><span class="cx"> if (dispatchMap.isEmpty()) {
</span><span class="lines">@@ -345,13 +345,13 @@
</span><span class="cx"> const char* name;
</span><span class="cx"> CallHandler handler;
</span><span class="cx"> } commands[] = {
</span><del>- { "loadResource1", &InspectorNetwork3BackendDispatcher::loadResource1 },
- { "loadResource2", &InspectorNetwork3BackendDispatcher::loadResource2 },
- { "loadResource3", &InspectorNetwork3BackendDispatcher::loadResource3 },
- { "loadResource4", &InspectorNetwork3BackendDispatcher::loadResource4 },
- { "loadResource5", &InspectorNetwork3BackendDispatcher::loadResource5 },
- { "loadResource6", &InspectorNetwork3BackendDispatcher::loadResource6 },
- { "loadResource7", &InspectorNetwork3BackendDispatcher::loadResource7 },
</del><ins>+ { "loadResource1", &Network3BackendDispatcher::loadResource1 },
+ { "loadResource2", &Network3BackendDispatcher::loadResource2 },
+ { "loadResource3", &Network3BackendDispatcher::loadResource3 },
+ { "loadResource4", &Network3BackendDispatcher::loadResource4 },
+ { "loadResource5", &Network3BackendDispatcher::loadResource5 },
+ { "loadResource6", &Network3BackendDispatcher::loadResource6 },
+ { "loadResource7", &Network3BackendDispatcher::loadResource7 },
</ins><span class="cx"> };
</span><span class="cx"> size_t length = WTF_ARRAY_LENGTH(commands);
</span><span class="cx"> for (size_t i = 0; i < length; ++i)
</span><span class="lines">@@ -360,14 +360,14 @@
</span><span class="cx">
</span><span class="cx"> HashMap<String, CallHandler>::iterator it = dispatchMap.find(method);
</span><span class="cx"> if (it == dispatchMap.end()) {
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\'', "Network3", '.', method, "' was not found"));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::MethodNotFound, makeString('\'', "Network3", '.', method, "' was not found"));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ((*this).*it->value)(callId, message.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork3BackendDispatcher::loadResource1(long callId, const InspectorObject&)
</del><ins>+void Network3BackendDispatcher::loadResource1(long callId, const InspectorObject&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork3BackendDispatcher::loadResource2(long callId, const InspectorObject&)
</del><ins>+void Network3BackendDispatcher::loadResource2(long callId, const InspectorObject&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork3BackendDispatcher::loadResource3(long callId, const InspectorObject&)
</del><ins>+void Network3BackendDispatcher::loadResource3(long callId, const InspectorObject&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork3BackendDispatcher::loadResource4(long callId, const InspectorObject&)
</del><ins>+void Network3BackendDispatcher::loadResource4(long callId, const InspectorObject&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork3BackendDispatcher::loadResource5(long callId, const InspectorObject&)
</del><ins>+void Network3BackendDispatcher::loadResource5(long callId, const InspectorObject&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork3BackendDispatcher::loadResource6(long callId, const InspectorObject&)
</del><ins>+void Network3BackendDispatcher::loadResource6(long callId, const InspectorObject&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork3BackendDispatcher::loadResource7(long callId, const InspectorObject&)
</del><ins>+void Network3BackendDispatcher::loadResource7(long callId, const InspectorObject&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><span class="lines">@@ -736,7 +736,7 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx">
</span><del>-class ObjCInspectorNetwork1BackendDispatcher final : public AlternateInspectorNetwork1BackendDispatcher {
</del><ins>+class ObjCInspectorNetwork1BackendDispatcher final : public AlternateNetwork1BackendDispatcher {
</ins><span class="cx"> public:
</span><span class="cx"> ObjCInspectorNetwork1BackendDispatcher(id<RWIProtocolNetwork1DomainHandler> handler) { m_delegate = handler; }
</span><span class="cx"> virtual void loadResource1(long callId) override;
</span><span class="lines">@@ -746,7 +746,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class ObjCInspectorNetwork3BackendDispatcher final : public AlternateInspectorNetwork3BackendDispatcher {
</del><ins>+class ObjCInspectorNetwork3BackendDispatcher final : public AlternateNetwork3BackendDispatcher {
</ins><span class="cx"> public:
</span><span class="cx"> ObjCInspectorNetwork3BackendDispatcher(id<RWIProtocolNetwork3DomainHandler> handler) { m_delegate = handler; }
</span><span class="cx"> virtual void loadResource1(long callId) override;
</span><span class="lines">@@ -840,7 +840,7 @@
</span><span class="cx"> _network1Handler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorNetwork1BackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<InspectorNetwork1BackendDispatcher, AlternateInspectorNetwork1BackendDispatcher>>(ASCIILiteral("Network1"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<Network1BackendDispatcher, AlternateNetwork1BackendDispatcher>>(ASCIILiteral("Network1"), WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -858,7 +858,7 @@
</span><span class="cx"> _network3Handler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorNetwork3BackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<InspectorNetwork3BackendDispatcher, AlternateInspectorNetwork3BackendDispatcher>>(ASCIILiteral("Network3"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<Network3BackendDispatcher, AlternateNetwork3BackendDispatcher>>(ASCIILiteral("Network3"), WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,18 +39,18 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><del>-class AlternateInspectorCommandDomainBackendDispatcher : public AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateCommandDomainBackendDispatcher : public AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- virtual ~AlternateInspectorCommandDomainBackendDispatcher() { }
</del><ins>+ virtual ~AlternateCommandDomainBackendDispatcher() { }
</ins><span class="cx"> virtual void commandWithEnumReturnValue(long callId) = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -149,10 +149,10 @@
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><del>-class AlternateInspectorCommandDomainBackendDispatcher;
</del><ins>+class AlternateCommandDomainBackendDispatcher;
</ins><span class="cx"> #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><del>-class InspectorCommandDomainBackendDispatcherHandler {
</del><ins>+class CommandDomainBackendDispatcherHandler {
</ins><span class="cx"> public:
</span><span class="cx"> // Named after parameter 'returnValue' while generating command/event commandWithEnumReturnValue.
</span><span class="cx"> enum class ReturnValue {
</span><span class="lines">@@ -161,25 +161,25 @@
</span><span class="cx"> Magenta = 7,
</span><span class="cx"> Yellow = 8,
</span><span class="cx"> }; // enum class ReturnValue
</span><del>- virtual void commandWithEnumReturnValue(ErrorString&, InspectorCommandDomainBackendDispatcherHandler::ReturnValue* out_returnValue) = 0;
</del><ins>+ virtual void commandWithEnumReturnValue(ErrorString&, CommandDomainBackendDispatcherHandler::ReturnValue* out_returnValue) = 0;
</ins><span class="cx"> protected:
</span><del>- virtual ~InspectorCommandDomainBackendDispatcherHandler();
</del><ins>+ virtual ~CommandDomainBackendDispatcherHandler();
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-class InspectorCommandDomainBackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</del><ins>+class CommandDomainBackendDispatcher final : public SupplementalBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- static Ref<InspectorCommandDomainBackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorCommandDomainBackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static Ref<CommandDomainBackendDispatcher> create(BackendDispatcher*, CommandDomainBackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, Ref<InspectorObject>&& message) override;
</ins><span class="cx"> private:
</span><del>- void commandWithEnumReturnValue(long callId, const Inspector::InspectorObject& message);
</del><ins>+ void commandWithEnumReturnValue(long callId, const InspectorObject& message);
</ins><span class="cx"> private:
</span><del>- InspectorCommandDomainBackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorCommandDomainBackendDispatcherHandler*);
- InspectorCommandDomainBackendDispatcherHandler* m_agent;
</del><ins>+ CommandDomainBackendDispatcher(BackendDispatcher&, CommandDomainBackendDispatcherHandler*);
+ CommandDomainBackendDispatcherHandler* m_agent;
</ins><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><del>- void setAlternateDispatcher(AlternateInspectorCommandDomainBackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</del><ins>+ void setAlternateDispatcher(AlternateCommandDomainBackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</ins><span class="cx"> private:
</span><del>- AlternateInspectorCommandDomainBackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateCommandDomainBackendDispatcher* m_alternateDispatcher;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -232,15 +232,15 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-InspectorCommandDomainBackendDispatcherHandler::~InspectorCommandDomainBackendDispatcherHandler() { }
</del><ins>+CommandDomainBackendDispatcherHandler::~CommandDomainBackendDispatcherHandler() { }
</ins><span class="cx">
</span><del>-Ref<InspectorCommandDomainBackendDispatcher> InspectorCommandDomainBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorCommandDomainBackendDispatcherHandler* agent)
</del><ins>+Ref<CommandDomainBackendDispatcher> CommandDomainBackendDispatcher::create(BackendDispatcher* backendDispatcher, CommandDomainBackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorCommandDomainBackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new CommandDomainBackendDispatcher(*backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorCommandDomainBackendDispatcher::InspectorCommandDomainBackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorCommandDomainBackendDispatcherHandler* agent)
- : InspectorSupplementalBackendDispatcher(backendDispatcher)
</del><ins>+CommandDomainBackendDispatcher::CommandDomainBackendDispatcher(BackendDispatcher& backendDispatcher, CommandDomainBackendDispatcherHandler* agent)
+ : SupplementalBackendDispatcher(backendDispatcher)
</ins><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> , m_alternateDispatcher(nullptr)
</span><span class="lines">@@ -249,17 +249,17 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("CommandDomain"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCommandDomainBackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void CommandDomainBackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</ins><span class="cx"> {
</span><del>- Ref<InspectorCommandDomainBackendDispatcher> protect(*this);
</del><ins>+ Ref<CommandDomainBackendDispatcher> protect(*this);
</ins><span class="cx">
</span><span class="cx"> if (method == "commandWithEnumReturnValue")
</span><span class="cx"> commandWithEnumReturnValue(callId, message);
</span><span class="cx"> else
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\'', "CommandDomain", '.', method, "' was not found"));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::MethodNotFound, makeString('\'', "CommandDomain", '.', method, "' was not found"));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCommandDomainBackendDispatcher::commandWithEnumReturnValue(long callId, const InspectorObject&)
</del><ins>+void CommandDomainBackendDispatcher::commandWithEnumReturnValue(long callId, const InspectorObject&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><span class="cx"> Ref<InspectorObject> result = InspectorObject::create();
</span><del>- InspectorCommandDomainBackendDispatcherHandler::ReturnValue out_returnValue;
</del><ins>+ CommandDomainBackendDispatcherHandler::ReturnValue out_returnValue;
</ins><span class="cx"> m_agent->commandWithEnumReturnValue(error, &out_returnValue);
</span><span class="cx">
</span><span class="cx"> if (!error.length())
</span><span class="lines">@@ -326,9 +326,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class InspectorEventDomainFrontendDispatcher {
</del><ins>+class EventDomainFrontendDispatcher {
</ins><span class="cx"> public:
</span><del>- InspectorEventDomainFrontendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
</del><ins>+ EventDomainFrontendDispatcher(FrontendChannel* frontendChannel) : m_frontendChannel(frontendChannel) { }
</ins><span class="cx"> // Named after parameter 'parameter' while generating command/event eventWithEnumParameter.
</span><span class="cx"> enum class Parameter {
</span><span class="cx"> Shared = 0,
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> }; // enum class Parameter
</span><span class="cx"> void eventWithEnumParameter(Parameter parameter);
</span><span class="cx"> private:
</span><del>- InspectorFrontendChannel* m_inspectorFrontendChannel;
</del><ins>+ FrontendChannel* m_frontendChannel;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-void InspectorEventDomainFrontendDispatcher::eventWithEnumParameter(Parameter parameter)
</del><ins>+void EventDomainFrontendDispatcher::eventWithEnumParameter(Parameter parameter)
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("EventDomain.eventWithEnumParameter"));
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx"> paramsObject->setString(ASCIILiteral("parameter"), Inspector::Protocol::getEnumConstantValue(parameter));
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("params"), WTF::move(paramsObject));
</span><span class="cx">
</span><del>- m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ m_frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -581,7 +581,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class ObjCInspectorCommandDomainBackendDispatcher final : public AlternateInspectorCommandDomainBackendDispatcher {
</del><ins>+class ObjCInspectorCommandDomainBackendDispatcher final : public AlternateCommandDomainBackendDispatcher {
</ins><span class="cx"> public:
</span><span class="cx"> ObjCInspectorCommandDomainBackendDispatcher(id<RWIProtocolCommandDomainDomainHandler> handler) { m_delegate = handler; }
</span><span class="cx"> virtual void commandWithEnumReturnValue(long callId) override;
</span><span class="lines">@@ -671,7 +671,7 @@
</span><span class="cx"> _commandDomainHandler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorCommandDomainBackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<InspectorCommandDomainBackendDispatcher, AlternateInspectorCommandDomainBackendDispatcher>>(ASCIILiteral("CommandDomain"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<CommandDomainBackendDispatcher, AlternateCommandDomainBackendDispatcher>>(ASCIILiteral("CommandDomain"), WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -988,7 +988,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)eventWithEnumParameterWithParameter:(RWIProtocolEventDomainEventWithEnumParameterParameter)parameter
</span><span class="cx"> {
</span><del>- InspectorFrontendChannel* frontendChannel = _controller->frontendChannel();
</del><ins>+ FrontendChannel* frontendChannel = _controller->frontendChannel();
</ins><span class="cx"> if (!frontendChannel)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -237,13 +237,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class InspectorDatabaseFrontendDispatcher {
</del><ins>+class DatabaseFrontendDispatcher {
</ins><span class="cx"> public:
</span><del>- InspectorDatabaseFrontendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
</del><ins>+ DatabaseFrontendDispatcher(FrontendChannel* frontendChannel) : m_frontendChannel(frontendChannel) { }
</ins><span class="cx"> void didExecuteOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String* const notes, const double* const timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors* const screenColor, RefPtr<Inspector::Protocol::Database::ColorList> alternateColors, const String* const printColor);
</span><span class="cx"> void didExecuteNoOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors& screenColor, RefPtr<Inspector::Protocol::Database::ColorList> alternateColors, const String& printColor);
</span><span class="cx"> private:
</span><del>- InspectorFrontendChannel* m_inspectorFrontendChannel;
</del><ins>+ FrontendChannel* m_frontendChannel;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-void InspectorDatabaseFrontendDispatcher::didExecuteOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String* const notes, const double* const timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors* const screenColor, RefPtr<Inspector::Protocol::Database::ColorList> alternateColors, const String* const printColor)
</del><ins>+void DatabaseFrontendDispatcher::didExecuteOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String* const notes, const double* const timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors* const screenColor, RefPtr<Inspector::Protocol::Database::ColorList> alternateColors, const String* const printColor)
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Database.didExecuteOptionalParameters"));
</span><span class="lines">@@ -314,10 +314,10 @@
</span><span class="cx"> paramsObject->setString(ASCIILiteral("printColor"), *printColor);
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("params"), WTF::move(paramsObject));
</span><span class="cx">
</span><del>- m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ m_frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseFrontendDispatcher::didExecuteNoOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors& screenColor, RefPtr<Inspector::Protocol::Database::ColorList> alternateColors, const String& printColor)
</del><ins>+void DatabaseFrontendDispatcher::didExecuteNoOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors& screenColor, RefPtr<Inspector::Protocol::Database::ColorList> alternateColors, const String& printColor)
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Database.didExecuteNoOptionalParameters"));
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> paramsObject->setString(ASCIILiteral("printColor"), printColor);
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("params"), WTF::move(paramsObject));
</span><span class="cx">
</span><del>- m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ m_frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -420,14 +420,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*Error*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*Error*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -452,9 +452,9 @@
</span><span class="cx"> Ref<Error> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(Error) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(Error) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<Error>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -849,7 +849,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)didExecuteOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(RWIProtocolJSONObject **)values payload:(RWIProtocolJSONObject **)payload sqlError:(RWIProtocolDatabaseError **)sqlError screenColor:(NSString **)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(NSString **)printColor
</span><span class="cx"> {
</span><del>- InspectorFrontendChannel* frontendChannel = _controller->frontendChannel();
</del><ins>+ FrontendChannel* frontendChannel = _controller->frontendChannel();
</ins><span class="cx"> if (!frontendChannel)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -889,7 +889,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)didExecuteNoOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload sqlError:(RWIProtocolDatabaseError *)sqlError screenColor:(NSString *)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(NSString *)printColor
</span><span class="cx"> {
</span><del>- InspectorFrontendChannel* frontendChannel = _controller->frontendChannel();
</del><ins>+ FrontendChannel* frontendChannel = _controller->frontendChannel();
</ins><span class="cx"> if (!frontendChannel)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,19 +39,19 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><del>-class AlternateInspectorNetwork1BackendDispatcher : public AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateNetwork1BackendDispatcher : public AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- virtual ~AlternateInspectorNetwork1BackendDispatcher() { }
</del><ins>+ virtual ~AlternateNetwork1BackendDispatcher() { }
</ins><span class="cx"> virtual void loadResource(long callId) = 0;
</span><span class="cx"> };
</span><span class="cx"> #endif // PLATFORM(WEB_COMMANDS)
</span><span class="lines">@@ -148,34 +148,34 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><del>-class AlternateInspectorNetwork1BackendDispatcher;
</del><ins>+class AlternateNetwork1BackendDispatcher;
</ins><span class="cx"> #endif // PLATFORM(WEB_COMMANDS)
</span><span class="cx"> #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><del>-class InspectorNetwork1BackendDispatcherHandler {
</del><ins>+class Network1BackendDispatcherHandler {
</ins><span class="cx"> public:
</span><span class="cx"> virtual void loadResource(ErrorString&) = 0;
</span><span class="cx"> protected:
</span><del>- virtual ~InspectorNetwork1BackendDispatcherHandler();
</del><ins>+ virtual ~Network1BackendDispatcherHandler();
</ins><span class="cx"> };
</span><span class="cx"> #endif // PLATFORM(WEB_COMMANDS)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><del>-class InspectorNetwork1BackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</del><ins>+class Network1BackendDispatcher final : public SupplementalBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- static Ref<InspectorNetwork1BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorNetwork1BackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static Ref<Network1BackendDispatcher> create(BackendDispatcher*, Network1BackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, Ref<InspectorObject>&& message) override;
</ins><span class="cx"> private:
</span><del>- void loadResource(long callId, const Inspector::InspectorObject& message);
</del><ins>+ void loadResource(long callId, const InspectorObject& message);
</ins><span class="cx"> private:
</span><del>- InspectorNetwork1BackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorNetwork1BackendDispatcherHandler*);
- InspectorNetwork1BackendDispatcherHandler* m_agent;
</del><ins>+ Network1BackendDispatcher(BackendDispatcher&, Network1BackendDispatcherHandler*);
+ Network1BackendDispatcherHandler* m_agent;
</ins><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><del>- void setAlternateDispatcher(AlternateInspectorNetwork1BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</del><ins>+ void setAlternateDispatcher(AlternateNetwork1BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</ins><span class="cx"> private:
</span><del>- AlternateInspectorNetwork1BackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateNetwork1BackendDispatcher* m_alternateDispatcher;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> #endif // PLATFORM(WEB_COMMANDS)
</span><span class="lines">@@ -230,17 +230,17 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><del>-InspectorNetwork1BackendDispatcherHandler::~InspectorNetwork1BackendDispatcherHandler() { }
</del><ins>+Network1BackendDispatcherHandler::~Network1BackendDispatcherHandler() { }
</ins><span class="cx"> #endif // PLATFORM(WEB_COMMANDS)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><del>-Ref<InspectorNetwork1BackendDispatcher> InspectorNetwork1BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
</del><ins>+Ref<Network1BackendDispatcher> Network1BackendDispatcher::create(BackendDispatcher* backendDispatcher, Network1BackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorNetwork1BackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new Network1BackendDispatcher(*backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorNetwork1BackendDispatcher::InspectorNetwork1BackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
- : InspectorSupplementalBackendDispatcher(backendDispatcher)
</del><ins>+Network1BackendDispatcher::Network1BackendDispatcher(BackendDispatcher& backendDispatcher, Network1BackendDispatcherHandler* agent)
+ : SupplementalBackendDispatcher(backendDispatcher)
</ins><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> , m_alternateDispatcher(nullptr)
</span><span class="lines">@@ -249,17 +249,17 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Network1"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork1BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void Network1BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</ins><span class="cx"> {
</span><del>- Ref<InspectorNetwork1BackendDispatcher> protect(*this);
</del><ins>+ Ref<Network1BackendDispatcher> protect(*this);
</ins><span class="cx">
</span><span class="cx"> if (method == "loadResource")
</span><span class="cx"> loadResource(callId, message);
</span><span class="cx"> else
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\'', "Network1", '.', method, "' was not found"));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, BackendDispatcher::MethodNotFound, makeString('\'', "Network1", '.', method, "' was not found"));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork1BackendDispatcher::loadResource(long callId, const InspectorObject&)
</del><ins>+void Network1BackendDispatcher::loadResource(long callId, const InspectorObject&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><span class="lines">@@ -324,12 +324,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WEB_EVENTS)
</span><del>-class InspectorNetwork3FrontendDispatcher {
</del><ins>+class Network3FrontendDispatcher {
</ins><span class="cx"> public:
</span><del>- InspectorNetwork3FrontendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
</del><ins>+ Network3FrontendDispatcher(FrontendChannel* frontendChannel) : m_frontendChannel(frontendChannel) { }
</ins><span class="cx"> void resourceLoaded();
</span><span class="cx"> private:
</span><del>- InspectorFrontendChannel* m_inspectorFrontendChannel;
</del><ins>+ FrontendChannel* m_frontendChannel;
</ins><span class="cx"> };
</span><span class="cx"> #endif // PLATFORM(WEB_EVENTS)
</span><span class="cx">
</span><span class="lines">@@ -377,12 +377,12 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WEB_EVENTS)
</span><del>-void InspectorNetwork3FrontendDispatcher::resourceLoaded()
</del><ins>+void Network3FrontendDispatcher::resourceLoaded()
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Network3.resourceLoaded"));
</span><span class="cx">
</span><del>- m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ m_frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(WEB_EVENTS)
</span><span class="cx">
</span><span class="lines">@@ -465,14 +465,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*NetworkError*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*NetworkError*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -497,9 +497,9 @@
</span><span class="cx"> Ref<NetworkError> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(NetworkError) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(NetworkError) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<NetworkError>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -624,7 +624,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><del>-class ObjCInspectorNetwork1BackendDispatcher final : public AlternateInspectorNetwork1BackendDispatcher {
</del><ins>+class ObjCInspectorNetwork1BackendDispatcher final : public AlternateNetwork1BackendDispatcher {
</ins><span class="cx"> public:
</span><span class="cx"> ObjCInspectorNetwork1BackendDispatcher(id<RWIProtocolNetwork1DomainHandler> handler) { m_delegate = handler; }
</span><span class="cx"> virtual void loadResource(long callId) override;
</span><span class="lines">@@ -717,7 +717,7 @@
</span><span class="cx"> _network1Handler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorNetwork1BackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<InspectorNetwork1BackendDispatcher, AlternateInspectorNetwork1BackendDispatcher>>(ASCIILiteral("Network1"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<Network1BackendDispatcher, AlternateNetwork1BackendDispatcher>>(ASCIILiteral("Network1"), WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -954,7 +954,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)resourceLoaded
</span><span class="cx"> {
</span><del>- InspectorFrontendChannel* frontendChannel = _controller->frontendChannel();
</del><ins>+ FrontendChannel* frontendChannel = _controller->frontendChannel();
</ins><span class="cx"> if (!frontendChannel)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedsametypeiddifferentdomainjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedshadowedoptionaltypesettersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -356,14 +356,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*KeyPath*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*KeyPath*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -381,9 +381,9 @@
</span><span class="cx"> Ref<KeyPath> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(KeyPath) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(KeyPath) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<KeyPath>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setString(const String& value)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationaliasedprimitivetypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationarraytypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationenumtypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -363,14 +363,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*Error*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*Error*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -395,9 +395,9 @@
</span><span class="cx"> Ref<Error> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(Error) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(Error) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<Error>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -425,14 +425,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*OptionalParameterBundle*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*OptionalParameterBundle*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -443,9 +443,9 @@
</span><span class="cx"> Ref<OptionalParameterBundle> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(OptionalParameterBundle) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(OptionalParameterBundle) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<OptionalParameterBundle>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setColumnNames(RefPtr<Inspector::Protocol::Array<String>> value)
</span><span class="lines">@@ -513,14 +513,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*ParameterBundle*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*ParameterBundle*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -580,9 +580,9 @@
</span><span class="cx"> Ref<ParameterBundle> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(ParameterBundle) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(ParameterBundle) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<ParameterBundle>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -601,7 +601,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -621,14 +621,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*ObjectWithPropertyNameConflicts*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*ObjectWithPropertyNameConflicts*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -674,9 +674,9 @@
</span><span class="cx"> Ref<ObjectWithPropertyNameConflicts> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(ObjectWithPropertyNameConflicts) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(ObjectWithPropertyNameConflicts) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<ObjectWithPropertyNameConflicts>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -693,7 +693,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -716,14 +716,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*ParameterBundle*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*ParameterBundle*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -776,9 +776,9 @@
</span><span class="cx"> Ref<ParameterBundle> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(ParameterBundle) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(ParameterBundle) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<ParameterBundle>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -796,7 +796,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,12 +39,12 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-class AlternateInspectorBackendDispatcher {
</del><ins>+class AlternateBackendDispatcher {
</ins><span class="cx"> public:
</span><del>- void setBackendDispatcher(RefPtr<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(RefPtr<BackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
+ BackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -367,14 +367,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*TypeNeedingCast*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*TypeNeedingCast*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -420,9 +420,9 @@
</span><span class="cx"> Ref<TypeNeedingCast> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(TypeNeedingCast) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(TypeNeedingCast) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<TypeNeedingCast>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -439,7 +439,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -467,14 +467,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*RecursiveObject1*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*RecursiveObject1*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -485,9 +485,9 @@
</span><span class="cx"> Ref<RecursiveObject1> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(RecursiveObject1) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(RecursiveObject1) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<RecursiveObject1>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setObj(RefPtr<Inspector::Protocol::Test::RecursiveObject2> value)
</span><span class="lines">@@ -518,14 +518,14 @@
</span><span class="cx"> template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><del>- RefPtr<Inspector::InspectorObject> m_result;
</del><ins>+ RefPtr<InspectorObject> m_result;
</ins><span class="cx">
</span><span class="cx"> template<int STEP> Builder<STATE | STEP>& castState()
</span><span class="cx"> {
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*RecursiveObject2*/Inspector::InspectorObject>&& object)
</del><ins>+ Builder(Ref</*RecursiveObject2*/InspectorObject>&& object)
</ins><span class="cx"> : m_result(WTF::move(object))
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><span class="lines">@@ -536,9 +536,9 @@
</span><span class="cx"> Ref<RecursiveObject2> release()
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><del>- COMPILE_ASSERT(sizeof(RecursiveObject2) == sizeof(Inspector::InspectorObject), cannot_cast);
</del><ins>+ COMPILE_ASSERT(sizeof(RecursiveObject2) == sizeof(InspectorObject), cannot_cast);
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
</del><ins>+ Ref<InspectorObject> result = m_result.releaseNonNull();
</ins><span class="cx"> return WTF::move(*reinterpret_cast<Ref<RecursiveObject2>*>(&result));
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -550,7 +550,7 @@
</span><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><del>- return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</del><ins>+ return Builder<NoFieldsSet>(InspectorObject::create());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setObj(RefPtr<Inspector::Protocol::Test::RecursiveObject1> value)
</span><span class="lines">@@ -696,16 +696,16 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::Test::TypeNeedingCast> BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::runtimeCast(RefPtr<Inspector::InspectorValue>&& value)
</del><ins>+RefPtr<Inspector::Protocol::Test::TypeNeedingCast> BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::runtimeCast(RefPtr<InspectorValue>&& value)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::InspectorObject> result;
</del><ins>+ RefPtr<InspectorObject> result;
</ins><span class="cx"> bool castSucceeded = value->asObject(result);
</span><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::assertValueHasExpectedType(result.get());
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><del>- COMPILE_ASSERT(sizeof(Inspector::Protocol::Test::TypeNeedingCast) == sizeof(Inspector::InspectorObjectBase), type_cast_problem);
- return static_cast<Inspector::Protocol::Test::TypeNeedingCast*>(static_cast<Inspector::InspectorObjectBase*>(result.get()));
</del><ins>+ COMPILE_ASSERT(sizeof(Inspector::Protocol::Test::TypeNeedingCast) == sizeof(InspectorObjectBase), type_cast_problem);
+ return static_cast<Inspector::Protocol::Test::TypeNeedingCast*>(static_cast<InspectorObjectBase*>(result.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectDebuggablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> return name.isEmpty() ? ASCIILiteral("JSContext") : name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectDebuggable::connect(InspectorFrontendChannel* frontendChannel, bool automaticInspection)
</del><ins>+void JSGlobalObjectDebuggable::connect(FrontendChannel* frontendChannel, bool automaticInspection)
</ins><span class="cx"> {
</span><span class="cx"> JSLockHolder locker(&m_globalObject.vm());
</span><span class="cx">
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSLockHolder locker(&m_globalObject.vm());
</span><span class="cx">
</span><del>- m_globalObject.inspectorController().disconnectFrontend(InspectorDisconnectReason::InspectorDestroyed);
</del><ins>+ m_globalObject.inspectorController().disconnectFrontend(DisconnectReason::InspectorDestroyed);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectDebuggable::dispatchMessageFromRemoteFrontend(const String& message)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectDebuggableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectDebuggable.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -33,7 +33,8 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><del>-enum class InspectorDisconnectReason;
</del><ins>+class FrontendChannel;
+enum class DisconnectReason;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -51,7 +52,7 @@
</span><span class="cx"> virtual String name() const override;
</span><span class="cx"> virtual bool hasLocalDebugger() const override { return false; }
</span><span class="cx">
</span><del>- virtual void connect(Inspector::InspectorFrontendChannel*, bool automaticInspection) override;
</del><ins>+ virtual void connect(Inspector::FrontendChannel*, bool automaticInspection) override;
</ins><span class="cx"> virtual void disconnect() override;
</span><span class="cx"> virtual void dispatchMessageFromRemoteFrontend(const String& message) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/ChangeLog 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -1,3 +1,109 @@
</span><ins>+2015-02-09 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove some unnecessary Inspector prefixes from class names in Inspector namespace
+ https://bugs.webkit.org/show_bug.cgi?id=141372
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebCore.exp.in:
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ (WebCore::InspectorApplicationCacheAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorApplicationCacheAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorApplicationCacheAgent.h:
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorCSSAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorCSSAgent.h:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ (WebCore::InspectorController::inspectedPageDestroyed):
+ (WebCore::InspectorController::connectFrontend):
+ (WebCore::InspectorController::disconnectFrontend):
+ (WebCore::InspectorController::show):
+ (WebCore::InspectorController::close):
+ (WebCore::InspectorController::dispatchMessageFromFrontend):
+ * inspector/InspectorController.h:
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorDOMAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDOMDebuggerAgent.cpp:
+ (WebCore::InspectorDOMDebuggerAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorDOMDebuggerAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorDOMDebuggerAgent::didInvalidateStyleAttr):
+ (WebCore::InspectorDOMDebuggerAgent::willInsertDOMNode):
+ (WebCore::InspectorDOMDebuggerAgent::willRemoveDOMNode):
+ (WebCore::InspectorDOMDebuggerAgent::willModifyDOMAttr):
+ (WebCore::InspectorDOMDebuggerAgent::pauseOnNativeEventIfNeeded):
+ (WebCore::InspectorDOMDebuggerAgent::willSendXMLHttpRequest):
+ * inspector/InspectorDOMDebuggerAgent.h:
+ * inspector/InspectorDOMStorageAgent.cpp:
+ (WebCore::InspectorDOMStorageAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorDOMStorageAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorDOMStorageAgent.h:
+ * inspector/InspectorDatabaseAgent.cpp:
+ (WebCore::InspectorDatabaseAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorDatabaseAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorDatabaseAgent.h:
+ * inspector/InspectorDatabaseResource.cpp:
+ (WebCore::InspectorDatabaseResource::bind):
+ * inspector/InspectorDatabaseResource.h:
+ * inspector/InspectorForwarding.h:
+ * inspector/InspectorIndexedDBAgent.cpp:
+ (WebCore::InspectorIndexedDBAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorIndexedDBAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorIndexedDBAgent.h:
+ * inspector/InspectorLayerTreeAgent.cpp:
+ (WebCore::InspectorLayerTreeAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorLayerTreeAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorLayerTreeAgent.h:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorPageAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorPageAgent::getScriptExecutionStatus):
+ * inspector/InspectorPageAgent.h:
+ * inspector/InspectorReplayAgent.cpp:
+ (WebCore::InspectorReplayAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorReplayAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorReplayAgent.h:
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorResourceAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorResourceAgent.h:
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyle::styleWithProperties):
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorTimelineAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/InspectorWorkerAgent.cpp:
+ (WebCore::InspectorWorkerAgent::WorkerFrontendChannel::WorkerFrontendChannel):
+ (WebCore::InspectorWorkerAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorWorkerAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorWorkerAgent.h:
+ * inspector/PageRuntimeAgent.cpp:
+ (WebCore::PageRuntimeAgent::didCreateFrontendAndBackend):
+ (WebCore::PageRuntimeAgent::willDestroyFrontendAndBackend):
+ * inspector/PageRuntimeAgent.h:
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::~WorkerInspectorController):
+ (WebCore::WorkerInspectorController::connectFrontend):
+ (WebCore::WorkerInspectorController::disconnectFrontend):
+ * inspector/WorkerInspectorController.h:
+ * inspector/WorkerRuntimeAgent.cpp:
+ (WebCore::WorkerRuntimeAgent::didCreateFrontendAndBackend):
+ (WebCore::WorkerRuntimeAgent::willDestroyFrontendAndBackend):
+ * inspector/WorkerRuntimeAgent.h:
+ * loader/EmptyClients.h:
+ * page/PageDebuggable.cpp:
+ (WebCore::PageDebuggable::connect):
+ (WebCore::PageDebuggable::disconnect):
+ * page/PageDebuggable.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::closeDummyInspectorFrontend):
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::disconnectFromInspector):
+
</ins><span class="cx"> 2015-02-14 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r180082): WebCore Debug builds fail on Mavericks due to weak export symbols
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -840,8 +840,8 @@
</span><span class="cx"> __ZN7WebCore19AnimationController21pauseTransitionAtTimeEPNS_13RenderElementERKN3WTF6StringEd
</span><span class="cx"> __ZN7WebCore19AnimationController36setAllowsNewAnimationsWhileSuspendedEb
</span><span class="cx"> __ZN7WebCore19HTMLTextAreaElement8setValueERKN3WTF6StringE
</span><del>-__ZN7WebCore19InspectorController15connectFrontendEPN9Inspector24InspectorFrontendChannelEb
-__ZN7WebCore19InspectorController18disconnectFrontendEN9Inspector25InspectorDisconnectReasonE
</del><ins>+__ZN7WebCore19InspectorController15connectFrontendEPN9Inspector15FrontendChannelEb
+__ZN7WebCore19InspectorController18disconnectFrontendEN9Inspector16DisconnectReasonE
</ins><span class="cx"> __ZN7WebCore19InspectorController18setProfilerEnabledEb
</span><span class="cx"> __ZN7WebCore19InspectorController25evaluateForTestInFrontendERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore19InspectorController26setInspectorFrontendClientEPNS_23InspectorFrontendClientE
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -49,13 +49,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorApplicationCacheAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorApplicationCacheAgent::didCreateFrontendAndBackend(FrontendChannel* frontendChannel, BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorApplicationCacheFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorApplicationCacheBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::ApplicationCacheFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = Inspector::ApplicationCacheBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorApplicationCacheAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorApplicationCacheAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><del>-class InspectorApplicationCacheFrontendDispatcher;
</del><ins>+class ApplicationCacheFrontendDispatcher;
</ins><span class="cx"> class InspectorObject;
</span><span class="cx"> class InspectorValue;
</span><span class="cx"> }
</span><span class="lines">@@ -47,14 +47,14 @@
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class InspectorApplicationCacheAgent final : public InspectorAgentBase, public Inspector::InspectorApplicationCacheBackendDispatcherHandler {
</del><ins>+class InspectorApplicationCacheAgent final : public InspectorAgentBase, public Inspector::ApplicationCacheBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorApplicationCacheAgent); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> InspectorApplicationCacheAgent(InstrumentingAgents*, InspectorPageAgent*);
</span><span class="cx"> virtual ~InspectorApplicationCacheAgent() { }
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> void updateApplicationCacheStatus(Frame*);
</span><span class="cx"> void networkStateChanged();
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx"> DocumentLoader* assertFrameWithDocumentLoader(ErrorString&, String frameId);
</span><span class="cx">
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><del>- std::unique_ptr<Inspector::InspectorApplicationCacheFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorApplicationCacheBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::ApplicationCacheFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::ApplicationCacheBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -351,13 +351,13 @@
</span><span class="cx"> reset();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorCSSAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorCSSFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorCSSBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<CSSFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = CSSBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorCSSAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><del>-class InspectorCSSFrontendDispatcher;
</del><ins>+class CSSFrontendDispatcher;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> class InspectorCSSAgent final
</span><span class="cx"> : public InspectorAgentBase
</span><span class="cx"> , public InspectorDOMAgent::DOMListener
</span><del>- , public Inspector::InspectorCSSBackendDispatcherHandler
</del><ins>+ , public Inspector::CSSBackendDispatcherHandler
</ins><span class="cx"> , public InspectorStyleSheet::Listener {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorCSSAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -91,8 +91,8 @@
</span><span class="cx">
</span><span class="cx"> static CSSStyleRule* asCSSStyleRule(CSSRule&);
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx"> virtual void discardAgent() override;
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span><span class="lines">@@ -163,8 +163,8 @@
</span><span class="cx">
</span><span class="cx"> void resetPseudoStates();
</span><span class="cx">
</span><del>- std::unique_ptr<Inspector::InspectorCSSFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorCSSBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::CSSFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::CSSBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> InspectorDOMAgent* m_domAgent;
</span><span class="cx">
</span><span class="cx"> IdToInspectorStyleSheet m_idToInspectorStyleSheet;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> : m_instrumentingAgents(InstrumentingAgents::create(*this))
</span><span class="cx"> , m_injectedScriptManager(std::make_unique<WebInjectedScriptManager>(*this, WebInjectedScriptHost::create()))
</span><span class="cx"> , m_overlay(std::make_unique<InspectorOverlay>(page, inspectorClient))
</span><del>- , m_inspectorFrontendChannel(nullptr)
</del><ins>+ , m_frontendChannel(nullptr)
</ins><span class="cx"> , m_executionStopwatch(Stopwatch::create())
</span><span class="cx"> , m_page(page)
</span><span class="cx"> , m_inspectorClient(inspectorClient)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorController::inspectedPageDestroyed()
</span><span class="cx"> {
</span><del>- disconnectFrontend(InspectorDisconnectReason::InspectedTargetDestroyed);
</del><ins>+ disconnectFrontend(DisconnectReason::InspectedTargetDestroyed);
</ins><span class="cx"> m_injectedScriptManager->disconnect();
</span><span class="cx"> m_inspectorClient->inspectorDestroyed();
</span><span class="cx"> m_inspectorClient = nullptr;
</span><span class="lines">@@ -232,19 +232,19 @@
</span><span class="cx"> m_inspectorFrontendClient->windowObjectCleared();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorController::connectFrontend(InspectorFrontendChannel* frontendChannel, bool isAutomaticInspection)
</del><ins>+void InspectorController::connectFrontend(Inspector::FrontendChannel* frontendChannel, bool isAutomaticInspection)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(frontendChannel);
</span><span class="cx"> ASSERT(m_inspectorClient);
</span><del>- ASSERT(!m_inspectorFrontendChannel);
- ASSERT(!m_inspectorBackendDispatcher);
</del><ins>+ ASSERT(!m_frontendChannel);
+ ASSERT(!m_backendDispatcher);
</ins><span class="cx">
</span><span class="cx"> m_isAutomaticInspection = isAutomaticInspection;
</span><span class="cx">
</span><del>- m_inspectorFrontendChannel = frontendChannel;
- m_inspectorBackendDispatcher = InspectorBackendDispatcher::create(frontendChannel);
</del><ins>+ m_frontendChannel = frontendChannel;
+ m_backendDispatcher = BackendDispatcher::create(frontendChannel);
</ins><span class="cx">
</span><del>- m_agents.didCreateFrontendAndBackend(frontendChannel, m_inspectorBackendDispatcher.get());
</del><ins>+ m_agents.didCreateFrontendAndBackend(frontendChannel, m_backendDispatcher.get());
</ins><span class="cx">
</span><span class="cx"> InspectorInstrumentation::registerInstrumentingAgents(*m_instrumentingAgents);
</span><span class="cx"> InspectorInstrumentation::frontendCreated();
</span><span class="lines">@@ -255,16 +255,16 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorController::disconnectFrontend(InspectorDisconnectReason reason)
</del><ins>+void InspectorController::disconnectFrontend(DisconnectReason reason)
</ins><span class="cx"> {
</span><del>- if (!m_inspectorFrontendChannel)
</del><ins>+ if (!m_frontendChannel)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_agents.willDestroyFrontendAndBackend(reason);
</span><span class="cx">
</span><del>- m_inspectorBackendDispatcher->clearFrontend();
- m_inspectorBackendDispatcher.clear();
- m_inspectorFrontendChannel = nullptr;
</del><ins>+ m_backendDispatcher->clearFrontend();
+ m_backendDispatcher.clear();
+ m_frontendChannel = nullptr;
</ins><span class="cx">
</span><span class="cx"> m_isAutomaticInspection = false;
</span><span class="cx">
</span><span class="lines">@@ -286,10 +286,10 @@
</span><span class="cx"> if (!enabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_inspectorFrontendChannel)
</del><ins>+ if (m_frontendChannel)
</ins><span class="cx"> m_inspectorClient->bringFrontendToFront();
</span><span class="cx"> else {
</span><del>- if (InspectorFrontendChannel* frontendChannel = m_inspectorClient->openInspectorFrontend(this)) {
</del><ins>+ if (Inspector::FrontendChannel* frontendChannel = m_inspectorClient->openInspectorFrontend(this)) {
</ins><span class="cx"> bool isAutomaticInspection = false;
</span><span class="cx"> connectFrontend(frontendChannel, isAutomaticInspection);
</span><span class="cx"> }
</span><span class="lines">@@ -298,9 +298,9 @@
</span><span class="cx">
</span><span class="cx"> void InspectorController::close()
</span><span class="cx"> {
</span><del>- if (!m_inspectorFrontendChannel)
</del><ins>+ if (!m_frontendChannel)
</ins><span class="cx"> return;
</span><del>- disconnectFrontend(InspectorDisconnectReason::InspectorDestroyed);
</del><ins>+ disconnectFrontend(DisconnectReason::InspectorDestroyed);
</ins><span class="cx"> m_inspectorClient->closeInspectorFrontend();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -352,8 +352,8 @@
</span><span class="cx">
</span><span class="cx"> void InspectorController::dispatchMessageFromFrontend(const String& message)
</span><span class="cx"> {
</span><del>- if (m_inspectorBackendDispatcher)
- m_inspectorBackendDispatcher->dispatch(message);
</del><ins>+ if (m_backendDispatcher)
+ m_backendDispatcher->dispatch(message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorController::hideHighlight()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><ins>+class BackendDispatcher;
+class FrontendChannel;
</ins><span class="cx"> class InspectorAgent;
</span><del>-class InspectorBackendDispatcher;
-class InspectorFrontendChannel;
</del><span class="cx"> class InspectorObject;
</span><span class="cx">
</span><span class="cx"> namespace Protocol {
</span><span class="lines">@@ -94,12 +94,12 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void dispatchMessageFromFrontend(const String& message);
</span><span class="cx">
</span><del>- bool hasFrontend() const { return !!m_inspectorFrontendChannel; }
</del><ins>+ bool hasFrontend() const { return !!m_frontendChannel; }
</ins><span class="cx"> bool hasLocalFrontend() const;
</span><span class="cx"> bool hasRemoteFrontend() const;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void connectFrontend(Inspector::InspectorFrontendChannel*, bool isAutomaticInspection);
- WEBCORE_EXPORT void disconnectFrontend(Inspector::InspectorDisconnectReason);
</del><ins>+ WEBCORE_EXPORT void connectFrontend(Inspector::FrontendChannel*, bool isAutomaticInspection);
+ WEBCORE_EXPORT void disconnectFrontend(Inspector::DisconnectReason);
</ins><span class="cx"> void setProcessId(long);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="lines">@@ -152,13 +152,13 @@
</span><span class="cx"> InspectorDOMDebuggerAgent* m_domDebuggerAgent;
</span><span class="cx"> InspectorTimelineAgent* m_timelineAgent;
</span><span class="cx">
</span><del>- RefPtr<Inspector::InspectorBackendDispatcher> m_inspectorBackendDispatcher;
- Inspector::InspectorFrontendChannel* m_inspectorFrontendChannel;
</del><ins>+ RefPtr<Inspector::BackendDispatcher> m_backendDispatcher;
+ Inspector::FrontendChannel* m_frontendChannel;
</ins><span class="cx"> Ref<WTF::Stopwatch> m_executionStopwatch;
</span><span class="cx"> Page& m_page;
</span><span class="cx"> InspectorClient* m_inspectorClient;
</span><span class="cx"> InspectorFrontendClient* m_inspectorFrontendClient;
</span><del>- Inspector::InspectorAgentRegistry m_agents;
</del><ins>+ Inspector::AgentRegistry m_agents;
</ins><span class="cx"> Vector<InspectorInstrumentationCookie, 2> m_injectedScriptInstrumentationCookies;
</span><span class="cx"> bool m_isUnderTest;
</span><span class="cx"> bool m_isAutomaticInspection;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -221,10 +221,10 @@
</span><span class="cx"> ASSERT(!m_searchingForNode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::didCreateFrontendAndBackend(InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorDOMAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorDOMFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorDOMBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::DOMFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = Inspector::DOMBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx">
</span><span class="cx"> m_history = std::make_unique<InspectorHistory>();
</span><span class="cx"> m_domEditor = std::make_unique<DOMEditor>(m_history.get());
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> focusNode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorDOMAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> const EventListenerVector eventListenerVector;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class InspectorDOMAgent final : public InspectorAgentBase, public Inspector::InspectorDOMBackendDispatcherHandler {
</del><ins>+class InspectorDOMAgent final : public InspectorAgentBase, public Inspector::DOMBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorDOMAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -109,8 +109,8 @@
</span><span class="cx">
</span><span class="cx"> static String toErrorString(const ExceptionCode&);
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> Vector<Document*> documents();
</span><span class="cx"> void reset();
</span><span class="lines">@@ -246,8 +246,8 @@
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> Inspector::InjectedScriptManager* m_injectedScriptManager;
</span><span class="cx"> InspectorOverlay* m_overlay;
</span><del>- std::unique_ptr<Inspector::InspectorDOMFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorDOMBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::DOMFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::DOMBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> DOMListener* m_domListener;
</span><span class="cx"> NodeToIdMap m_documentNodeToIdMap;
</span><span class="cx"> typedef HashMap<RefPtr<Node>, BackendNodeId> NodeToBackendIdMap;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -102,12 +102,12 @@
</span><span class="cx"> clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorDOMDebuggerAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_backendDispatcher = InspectorDOMDebuggerBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_backendDispatcher = Inspector::DOMDebuggerBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorDOMDebuggerAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> if (hasBreakpoint(&node, AttributeModified)) {
</span><span class="cx"> Ref<InspectorObject> eventData = InspectorObject::create();
</span><span class="cx"> descriptionForDOMEvent(node, AttributeModified, false, eventData.get());
</span><del>- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</del><ins>+ m_debuggerAgent->breakProgram(Inspector::DebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> if (hasBreakpoint(&parent, SubtreeModified)) {
</span><span class="cx"> Ref<InspectorObject> eventData = InspectorObject::create();
</span><span class="cx"> descriptionForDOMEvent(parent, SubtreeModified, true, eventData.get());
</span><del>- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</del><ins>+ m_debuggerAgent->breakProgram(Inspector::DebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -280,11 +280,11 @@
</span><span class="cx"> if (hasBreakpoint(&node, NodeRemoved)) {
</span><span class="cx"> Ref<InspectorObject> eventData = InspectorObject::create();
</span><span class="cx"> descriptionForDOMEvent(node, NodeRemoved, false, eventData.get());
</span><del>- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</del><ins>+ m_debuggerAgent->breakProgram(Inspector::DebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</ins><span class="cx"> } else if (parentNode && hasBreakpoint(parentNode, SubtreeModified)) {
</span><span class="cx"> Ref<InspectorObject> eventData = InspectorObject::create();
</span><span class="cx"> descriptionForDOMEvent(node, SubtreeModified, false, eventData.get());
</span><del>- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</del><ins>+ m_debuggerAgent->breakProgram(Inspector::DebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> if (hasBreakpoint(&element, AttributeModified)) {
</span><span class="cx"> Ref<InspectorObject> eventData = InspectorObject::create();
</span><span class="cx"> descriptionForDOMEvent(element, AttributeModified, false, eventData.get());
</span><del>- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</del><ins>+ m_debuggerAgent->breakProgram(Inspector::DebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -367,9 +367,9 @@
</span><span class="cx"> Ref<InspectorObject> eventData = InspectorObject::create();
</span><span class="cx"> eventData->setString("eventName", fullEventName);
</span><span class="cx"> if (synchronous)
</span><del>- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::EventListener, WTF::move(eventData));
</del><ins>+ m_debuggerAgent->breakProgram(Inspector::DebuggerFrontendDispatcher::Reason::EventListener, WTF::move(eventData));
</ins><span class="cx"> else
</span><del>- m_debuggerAgent->schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason::EventListener, WTF::move(eventData));
</del><ins>+ m_debuggerAgent->schedulePauseOnNextStatement(Inspector::DebuggerFrontendDispatcher::Reason::EventListener, WTF::move(eventData));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMDebuggerAgent::setXHRBreakpoint(ErrorString&, const String& url)
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> Ref<InspectorObject> eventData = InspectorObject::create();
</span><span class="cx"> eventData->setString("breakpointURL", breakpointURL);
</span><span class="cx"> eventData->setString("url", url);
</span><del>- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::XHR, WTF::move(eventData));
</del><ins>+ m_debuggerAgent->breakProgram(Inspector::DebuggerFrontendDispatcher::Reason::XHR, WTF::move(eventData));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMDebuggerAgent::clear()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class InspectorDOMDebuggerAgent final : public InspectorAgentBase, public Inspector::InspectorDebuggerAgent::Listener, public Inspector::InspectorDOMDebuggerBackendDispatcherHandler {
</del><ins>+class InspectorDOMDebuggerAgent final : public InspectorAgentBase, public Inspector::InspectorDebuggerAgent::Listener, public Inspector::DOMDebuggerBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorDOMDebuggerAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -78,8 +78,8 @@
</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::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx"> virtual void discardAgent() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> InspectorDOMAgent* m_domAgent;
</span><span class="cx"> Inspector::InspectorDebuggerAgent* m_debuggerAgent;
</span><del>- RefPtr<Inspector::InspectorDOMDebuggerBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<Inspector::DOMDebuggerBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> HashMap<Node*, uint32_t> m_domBreakpoints;
</span><span class="cx"> HashSet<String> m_eventListenerBreakpoints;
</span><span class="cx"> HashSet<String> m_xhrBreakpoints;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -66,13 +66,13 @@
</span><span class="cx"> m_instrumentingAgents = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMStorageAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorDOMStorageAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorDOMStorageFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorDOMStorageBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::DOMStorageFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = Inspector::DOMStorageBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMStorageAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorDOMStorageAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><ins>+class DOMStorageFrontendDispatcher;
</ins><span class="cx"> class InspectorArray;
</span><del>-class InspectorDOMStorageFrontendDispatcher;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -51,14 +51,14 @@
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class InspectorDOMStorageAgent final : public InspectorAgentBase, public Inspector::InspectorDOMStorageBackendDispatcherHandler {
</del><ins>+class InspectorDOMStorageAgent final : public InspectorAgentBase, public Inspector::DOMStorageBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> InspectorDOMStorageAgent(InstrumentingAgents*, InspectorPageAgent*);
</span><span class="cx"> virtual ~InspectorDOMStorageAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> // Called from the front-end.
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="lines">@@ -78,8 +78,8 @@
</span><span class="cx"> RefPtr<StorageArea> findStorageArea(ErrorString&, const RefPtr<Inspector::InspectorObject>&&, Frame*&);
</span><span class="cx">
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><del>- std::unique_ptr<Inspector::InspectorDOMStorageFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorDOMStorageBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::DOMStorageFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::DOMStorageBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> bool m_enabled;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-typedef Inspector::InspectorDatabaseBackendDispatcherHandler::ExecuteSQLCallback ExecuteSQLCallback;
</del><ins>+typedef Inspector::DatabaseBackendDispatcherHandler::ExecuteSQLCallback ExecuteSQLCallback;
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="lines">@@ -222,13 +222,13 @@
</span><span class="cx"> m_instrumentingAgents->setInspectorDatabaseAgent(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorDatabaseAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorDatabaseFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorDatabaseBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::DatabaseFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = Inspector::DatabaseBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorDatabaseAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -47,14 +47,14 @@
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class InspectorDatabaseAgent final : public InspectorAgentBase, public Inspector::InspectorDatabaseBackendDispatcherHandler {
</del><ins>+class InspectorDatabaseAgent final : public InspectorAgentBase, public Inspector::DatabaseBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> explicit InspectorDatabaseAgent(InstrumentingAgents*);
</span><span class="cx"> virtual ~InspectorDatabaseAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> void clearResources();
</span><span class="cx">
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx"> Database* databaseForId(const String& databaseId);
</span><span class="cx"> InspectorDatabaseResource* findByFileName(const String& fileName);
</span><span class="cx">
</span><del>- std::unique_ptr<Inspector::InspectorDatabaseFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorDatabaseBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::DatabaseFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::DatabaseBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> typedef HashMap<String, RefPtr<InspectorDatabaseResource>> DatabaseResourcesMap;
</span><span class="cx"> DatabaseResourcesMap m_resources;
</span><span class="cx"> bool m_enabled;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseResource::bind(InspectorDatabaseFrontendDispatcher* databaseFrontendDispatcher)
</del><ins>+void InspectorDatabaseResource::bind(Inspector::DatabaseFrontendDispatcher* databaseFrontendDispatcher)
</ins><span class="cx"> {
</span><span class="cx"> auto jsonObject = Inspector::Protocol::Database::Database::create()
</span><span class="cx"> .setId(m_id)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseResource.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseResource.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseResource.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<InspectorDatabaseResource> create(RefPtr<Database>&&, const String& domain, const String& name, const String& version);
</span><span class="cx">
</span><del>- void bind(Inspector::InspectorDatabaseFrontendDispatcher*);
</del><ins>+ void bind(Inspector::DatabaseFrontendDispatcher*);
</ins><span class="cx"> Database* database() { return m_database.get(); }
</span><span class="cx"> void setDatabase(RefPtr<Database>&& database) { m_database = database; }
</span><span class="cx"> String id() const { return m_id; }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorForwardingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorForwarding.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorForwarding.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorForwarding.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-typedef Inspector::InspectorFrontendChannel InspectorFrontendChannel;
</del><ins>+typedef Inspector::FrontendChannel InspectorFrontendChannel;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorForwarding_h)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -77,11 +77,11 @@
</span><span class="cx"> using Inspector::Protocol::IndexedDB::ObjectStore;
</span><span class="cx"> using Inspector::Protocol::IndexedDB::ObjectStoreIndex;
</span><span class="cx">
</span><del>-typedef Inspector::InspectorBackendDispatcher::CallbackBase RequestCallback;
-typedef Inspector::InspectorIndexedDBBackendDispatcherHandler::RequestDatabaseNamesCallback RequestDatabaseNamesCallback;
-typedef Inspector::InspectorIndexedDBBackendDispatcherHandler::RequestDatabaseCallback RequestDatabaseCallback;
-typedef Inspector::InspectorIndexedDBBackendDispatcherHandler::RequestDataCallback RequestDataCallback;
-typedef Inspector::InspectorIndexedDBBackendDispatcherHandler::ClearObjectStoreCallback ClearObjectStoreCallback;
</del><ins>+typedef Inspector::BackendDispatcher::CallbackBase RequestCallback;
+typedef Inspector::IndexedDBBackendDispatcherHandler::RequestDatabaseNamesCallback RequestDatabaseNamesCallback;
+typedef Inspector::IndexedDBBackendDispatcherHandler::RequestDatabaseCallback RequestDatabaseCallback;
+typedef Inspector::IndexedDBBackendDispatcherHandler::RequestDataCallback RequestDataCallback;
+typedef Inspector::IndexedDBBackendDispatcherHandler::ClearObjectStoreCallback ClearObjectStoreCallback;
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="lines">@@ -575,12 +575,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorIndexedDBAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_backendDispatcher = InspectorIndexedDBBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_backendDispatcher = Inspector::IndexedDBBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorIndexedDBAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -47,13 +47,13 @@
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class InspectorIndexedDBAgent final : public InspectorAgentBase, public Inspector::InspectorIndexedDBBackendDispatcherHandler {
</del><ins>+class InspectorIndexedDBAgent final : public InspectorAgentBase, public Inspector::IndexedDBBackendDispatcherHandler {
</ins><span class="cx"> public:
</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::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> // Called from the front-end.
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> private:
</span><span class="cx"> Inspector::InjectedScriptManager* m_injectedScriptManager;
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><del>- RefPtr<Inspector::InspectorIndexedDBBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<Inspector::IndexedDBBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -56,13 +56,13 @@
</span><span class="cx"> reset();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorLayerTreeAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorLayerTreeFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorLayerTreeBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::LayerTreeFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = Inspector::LayerTreeBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorLayerTreeAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -44,14 +44,14 @@
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class InspectorLayerTreeAgent final : public InspectorAgentBase, public Inspector::InspectorLayerTreeBackendDispatcherHandler {
</del><ins>+class InspectorLayerTreeAgent final : public InspectorAgentBase, public Inspector::LayerTreeBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> explicit InspectorLayerTreeAgent(InstrumentingAgents*);
</span><span class="cx"> virtual ~InspectorLayerTreeAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx"> void reset();
</span><span class="cx">
</span><span class="cx"> // InspectorInstrumentation callbacks.
</span><span class="lines">@@ -81,8 +81,8 @@
</span><span class="cx"> String bindPseudoElement(PseudoElement*);
</span><span class="cx"> void unbindPseudoElement(PseudoElement*);
</span><span class="cx">
</span><del>- std::unique_ptr<Inspector::InspectorLayerTreeFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorLayerTreeBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::LayerTreeFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::LayerTreeBackendDispatcher> m_backendDispatcher;
</ins><span class="cx">
</span><span class="cx"> HashMap<const RenderLayer*, String> m_documentLayerToIdMap;
</span><span class="cx"> HashMap<String, const RenderLayer*> m_idToLayer;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -337,13 +337,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorPageAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorPageFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorPageBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::PageFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = Inspector::PageBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorPageAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="lines">@@ -657,7 +657,7 @@
</span><span class="cx"> m_overlay->setShowingPaintRects(show);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::getScriptExecutionStatus(ErrorString&, InspectorPageBackendDispatcherHandler::Result* status)
</del><ins>+void InspectorPageAgent::getScriptExecutionStatus(ErrorString&, Inspector::PageBackendDispatcherHandler::Result* status)
</ins><span class="cx"> {
</span><span class="cx"> bool disabledByScriptController = false;
</span><span class="cx"> bool disabledInSettings = false;
</span><span class="lines">@@ -668,14 +668,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!disabledByScriptController) {
</span><del>- *status = InspectorPageBackendDispatcherHandler::Result::Allowed;
</del><ins>+ *status = Inspector::PageBackendDispatcherHandler::Result::Allowed;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (disabledInSettings)
</span><del>- *status = InspectorPageBackendDispatcherHandler::Result::Disabled;
</del><ins>+ *status = Inspector::PageBackendDispatcherHandler::Result::Disabled;
</ins><span class="cx"> else
</span><del>- *status = InspectorPageBackendDispatcherHandler::Result::Forbidden;
</del><ins>+ *status = Inspector::PageBackendDispatcherHandler::Result::Forbidden;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorPageAgent::setScriptExecutionDisabled(ErrorString&, bool value)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class InspectorPageAgent final : public InspectorAgentBase, public Inspector::InspectorPageBackendDispatcherHandler {
</del><ins>+class InspectorPageAgent final : public InspectorAgentBase, public Inspector::PageBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorPageAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> virtual void searchInResources(ErrorString&, const String&, const bool* caseSensitive, const bool* isRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>>&) override;
</span><span class="cx"> virtual void setDocumentContent(ErrorString&, const String& frameId, const String& html) override;
</span><span class="cx"> virtual void setShowPaintRects(ErrorString&, bool show) override;
</span><del>- virtual void getScriptExecutionStatus(ErrorString&, Inspector::InspectorPageBackendDispatcherHandler::Result*) override;
</del><ins>+ virtual void getScriptExecutionStatus(ErrorString&, Inspector::PageBackendDispatcherHandler::Result*) override;
</ins><span class="cx"> virtual void setScriptExecutionDisabled(ErrorString&, bool) override;
</span><span class="cx"> virtual void setTouchEmulationEnabled(ErrorString&, bool) override;
</span><span class="cx"> virtual void setEmulatedMedia(ErrorString&, const String&) override;
</span><span class="lines">@@ -139,8 +139,8 @@
</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::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> // Cross-agents API
</span><span class="cx"> Page* page() { return m_page; }
</span><span class="lines">@@ -168,8 +168,8 @@
</span><span class="cx"> Ref<Inspector::Protocol::Page::FrameResourceTree> buildObjectForFrameTree(Frame*);
</span><span class="cx"> Page* m_page;
</span><span class="cx"> InspectorClient* m_client;
</span><del>- std::unique_ptr<Inspector::InspectorPageFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorPageBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::PageFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::PageBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> InspectorOverlay* m_overlay;
</span><span class="cx"> long m_lastScriptIdentifier;
</span><span class="cx"> String m_pendingScriptToEvaluateOnLoadOnce;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -167,10 +167,10 @@
</span><span class="cx"> return m_page.replayController().sessionState();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::didCreateFrontendAndBackend(InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorReplayAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorReplayFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorReplayBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::ReplayFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = Inspector::ReplayBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx">
</span><span class="cx"> m_instrumentingAgents->setInspectorReplayAgent(this);
</span><span class="cx"> ASSERT(sessionState() == WebCore::SessionState::Inactive);
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> m_segmentsMap.add((*it)->identifier(), *it);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorReplayAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -58,14 +58,14 @@
</span><span class="cx">
</span><span class="cx"> class InspectorReplayAgent final
</span><span class="cx"> : public InspectorAgentBase
</span><del>- , public Inspector::InspectorReplayBackendDispatcherHandler {
</del><ins>+ , public Inspector::ReplayBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorReplayAgent);
</span><span class="cx"> public:
</span><span class="cx"> InspectorReplayAgent(InstrumentingAgents*, InspectorPageAgent*);
</span><span class="cx"> virtual ~InspectorReplayAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> // InspectorInstrumentation callbacks.
</span><span class="cx"> void frameNavigated(DocumentLoader*);
</span><span class="lines">@@ -114,8 +114,8 @@
</span><span class="cx"> RefPtr<ReplaySessionSegment> findSegment(ErrorString&, SegmentIdentifier);
</span><span class="cx"> WebCore::SessionState sessionState() const;
</span><span class="cx">
</span><del>- std::unique_ptr<Inspector::InspectorReplayFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorReplayBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::ReplayFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::ReplayBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> Page& m_page;
</span><span class="cx">
</span><span class="cx"> HashMap<int, RefPtr<ReplaySession>, WTF::IntHash<int>, WTF::UnsignedWithZeroKeyHashTraits<int>> m_sessionsMap;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><del>-typedef Inspector::InspectorNetworkBackendDispatcherHandler::LoadResourceCallback LoadResourceCallback;
</del><ins>+typedef Inspector::NetworkBackendDispatcherHandler::LoadResourceCallback LoadResourceCallback;
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -173,13 +173,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorResourceAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorNetworkFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorNetworkBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::NetworkFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = Inspector::NetworkBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorResourceAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -73,14 +73,14 @@
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class InspectorResourceAgent final : public InspectorAgentBase, public Inspector::InspectorNetworkBackendDispatcherHandler {
</del><ins>+class InspectorResourceAgent final : public InspectorAgentBase, public Inspector::NetworkBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> InspectorResourceAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorClient*);
</span><span class="cx"> virtual ~InspectorResourceAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> // InspectorInstrumentation callbacks.
</span><span class="cx"> void willRecalculateStyle();
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx">
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> InspectorClient* m_client;
</span><del>- std::unique_ptr<Inspector::InspectorNetworkFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorNetworkBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::NetworkFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::NetworkBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> std::unique_ptr<NetworkResourcesData> m_resourcesData;
</span><span class="cx"> bool m_enabled;
</span><span class="cx"> bool m_cacheDisabled;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx">
</span><span class="cx"> // Visual Studio disagrees with other compilers as to whether 'class' is needed here.
</span><span class="cx"> #if COMPILER(MSVC)
</span><del>- enum class Inspector::Protocol::CSS::CSSPropertyStatus status;
</del><ins>+ enum class Protocol::CSS::CSSPropertyStatus status;
</ins><span class="cx"> #else
</span><span class="cx"> enum Inspector::Protocol::CSS::CSSPropertyStatus status;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -62,10 +62,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorTimelineAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorTimelineFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorTimelineBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::TimelineFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = Inspector::TimelineBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx">
</span><span class="cx"> m_instrumentingAgents->setPersistentInspectorTimelineAgent(this);
</span><span class="cx">
</span><span class="lines">@@ -73,14 +73,14 @@
</span><span class="cx"> m_scriptDebugServer->recompileAllJSFunctions();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason reason)
</del><ins>+void InspectorTimelineAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason reason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><span class="cx"> m_instrumentingAgents->setPersistentInspectorTimelineAgent(nullptr);
</span><span class="cx">
</span><del>- if (reason != InspectorDisconnectReason::InspectedTargetDestroyed) {
</del><ins>+ if (reason != Inspector::DisconnectReason::InspectedTargetDestroyed) {
</ins><span class="cx"> if (m_scriptDebugServer)
</span><span class="cx"> m_scriptDebugServer->recompileAllJSFunctions();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> class InspectorTimelineAgent final
</span><span class="cx"> : public InspectorAgentBase
</span><del>- , public Inspector::InspectorTimelineBackendDispatcherHandler
</del><ins>+ , public Inspector::TimelineBackendDispatcherHandler
</ins><span class="cx"> , public Inspector::ScriptDebugListener {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorTimelineAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -117,8 +117,8 @@
</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::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> virtual void start(ErrorString&, const int* maxCallStackDepth = nullptr) override;
</span><span class="cx"> virtual void stop(ErrorString&) override;
</span><span class="lines">@@ -229,8 +229,8 @@
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> PageScriptDebugServer* m_scriptDebugServer;
</span><span class="cx">
</span><del>- std::unique_ptr<Inspector::InspectorTimelineFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorTimelineBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::TimelineFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::TimelineBackendDispatcher> m_backendDispatcher;
</ins><span class="cx">
</span><span class="cx"> Vector<TimelineRecordEntry> m_recordStack;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> class InspectorWorkerAgent::WorkerFrontendChannel : public WorkerGlobalScopeProxy::PageInspector {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- explicit WorkerFrontendChannel(InspectorWorkerFrontendDispatcher* frontendDispatcher, WorkerGlobalScopeProxy* proxy)
</del><ins>+ explicit WorkerFrontendChannel(Inspector::WorkerFrontendDispatcher* frontendDispatcher, WorkerGlobalScopeProxy* proxy)
</ins><span class="cx"> : m_frontendDispatcher(frontendDispatcher)
</span><span class="cx"> , m_proxy(proxy)
</span><span class="cx"> , m_id(s_nextId++)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> m_frontendDispatcher->dispatchMessageFromWorker(m_id, messageObject);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InspectorWorkerFrontendDispatcher* m_frontendDispatcher;
</del><ins>+ Inspector::WorkerFrontendDispatcher* m_frontendDispatcher;
</ins><span class="cx"> WorkerGlobalScopeProxy* m_proxy;
</span><span class="cx"> int m_id;
</span><span class="cx"> bool m_connected;
</span><span class="lines">@@ -114,13 +114,13 @@
</span><span class="cx"> m_instrumentingAgents->setInspectorWorkerAgent(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorWorkerAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorWorkerAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorWorkerFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorWorkerBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::WorkerFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = Inspector::WorkerBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorWorkerAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</del><ins>+void InspectorWorkerAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason)
</ins><span class="cx"> {
</span><span class="cx"> m_shouldPauseDedicatedWorkerOnStart = false;
</span><span class="cx"> ErrorString unused;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx"> class InspectorObject;
</span><del>-class InspectorWorkerFrontendDispatcher;
</del><ins>+class WorkerFrontendDispatcher;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -48,14 +48,14 @@
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-class InspectorWorkerAgent final : public InspectorAgentBase, public Inspector::InspectorWorkerBackendDispatcherHandler {
</del><ins>+class InspectorWorkerAgent final : public InspectorAgentBase, public Inspector::WorkerBackendDispatcherHandler {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> explicit InspectorWorkerAgent(InstrumentingAgents*);
</span><span class="cx"> virtual ~InspectorWorkerAgent();
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> // Called from InspectorInstrumentation
</span><span class="cx"> bool shouldPauseDedicatedWorkerOnStart() const;
</span><span class="lines">@@ -76,8 +76,8 @@
</span><span class="cx"> void createWorkerFrontendChannel(WorkerGlobalScopeProxy*, const String& url);
</span><span class="cx"> void destroyWorkerFrontendChannels();
</span><span class="cx">
</span><del>- std::unique_ptr<Inspector::InspectorWorkerFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorWorkerBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::WorkerFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::WorkerBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> bool m_enabled;
</span><span class="cx"> bool m_shouldPauseDedicatedWorkerOnStart;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -59,13 +59,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageRuntimeAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void PageRuntimeAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_frontendDispatcher = std::make_unique<InspectorRuntimeFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorRuntimeBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_frontendDispatcher = std::make_unique<Inspector::RuntimeFrontendDispatcher>(frontendChannel);
+ m_backendDispatcher = Inspector::RuntimeBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PageRuntimeAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason reason)
</del><ins>+void PageRuntimeAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason reason)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -56,8 +56,8 @@
</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::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span><span class="cx">
</span><span class="lines">@@ -74,8 +74,8 @@
</span><span class="cx">
</span><span class="cx"> Page* m_inspectedPage;
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><del>- std::unique_ptr<Inspector::InspectorRuntimeFrontendDispatcher> m_frontendDispatcher;
- RefPtr<Inspector::InspectorRuntimeBackendDispatcher> m_backendDispatcher;
</del><ins>+ std::unique_ptr<Inspector::RuntimeFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::RuntimeBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> bool m_mainWorldContextCreated;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -108,18 +108,18 @@
</span><span class="cx"> WorkerInspectorController::~WorkerInspectorController()
</span><span class="cx"> {
</span><span class="cx"> m_instrumentingAgents->reset();
</span><del>- disconnectFrontend(InspectorDisconnectReason::InspectedTargetDestroyed);
</del><ins>+ disconnectFrontend(Inspector::DisconnectReason::InspectedTargetDestroyed);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerInspectorController::connectFrontend()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_frontendChannel);
</span><span class="cx"> m_frontendChannel = std::make_unique<PageInspectorProxy>(m_workerGlobalScope);
</span><del>- m_backendDispatcher = InspectorBackendDispatcher::create(m_frontendChannel.get());
</del><ins>+ m_backendDispatcher = BackendDispatcher::create(m_frontendChannel.get());
</ins><span class="cx"> m_agents.didCreateFrontendAndBackend(m_frontendChannel.get(), m_backendDispatcher.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerInspectorController::disconnectFrontend(InspectorDisconnectReason reason)
</del><ins>+void WorkerInspectorController::disconnectFrontend(Inspector::DisconnectReason reason)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_frontendChannel)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -41,10 +41,6 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-namespace Inspector {
-class InspectorBackendDispatcher;
-}
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class InspectorInstrumentation;
</span><span class="lines">@@ -61,7 +57,7 @@
</span><span class="cx"> virtual ~WorkerInspectorController();
</span><span class="cx">
</span><span class="cx"> void connectFrontend();
</span><del>- void disconnectFrontend(Inspector::InspectorDisconnectReason);
</del><ins>+ void disconnectFrontend(Inspector::DisconnectReason);
</ins><span class="cx"> void dispatchMessageFromFrontend(const String&);
</span><span class="cx"> void resume();
</span><span class="cx">
</span><span class="lines">@@ -81,10 +77,10 @@
</span><span class="cx"> RefPtr<InstrumentingAgents> m_instrumentingAgents;
</span><span class="cx"> std::unique_ptr<WebInjectedScriptManager> m_injectedScriptManager;
</span><span class="cx"> WorkerRuntimeAgent* m_runtimeAgent;
</span><del>- Inspector::InspectorAgentRegistry m_agents;
- std::unique_ptr<InspectorFrontendChannel> m_frontendChannel;
</del><ins>+ Inspector::AgentRegistry m_agents;
+ std::unique_ptr<Inspector::FrontendChannel> m_frontendChannel;
</ins><span class="cx"> Ref<WTF::Stopwatch> m_executionStopwatch;
</span><del>- RefPtr<Inspector::InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<Inspector::BackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> Vector<InspectorInstrumentationCookie, 2> m_injectedScriptInstrumentationCookies;
</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 (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -52,12 +52,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerRuntimeAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void WorkerRuntimeAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><del>- m_backendDispatcher = InspectorRuntimeBackendDispatcher::create(backendDispatcher, this);
</del><ins>+ m_backendDispatcher = Inspector::RuntimeBackendDispatcher::create(backendDispatcher, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerRuntimeAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason reason)
</del><ins>+void WorkerRuntimeAgent::willDestroyFrontendAndBackend(Inspector::DisconnectReason reason)
</ins><span class="cx"> {
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> WorkerRuntimeAgent(Inspector::InjectedScriptManager*, WorkerGlobalScope*);
</span><span class="cx"> virtual ~WorkerRuntimeAgent() { }
</span><span class="cx">
</span><del>- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</del><ins>+ virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
+ virtual void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
</ins><span class="cx">
</span><span class="cx"> virtual void run(ErrorString&) override;
</span><span class="cx">
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> virtual void muteConsole() override;
</span><span class="cx"> virtual void unmuteConsole() override;
</span><span class="cx"> WorkerGlobalScope* m_workerGlobalScope;
</span><del>- RefPtr<Inspector::InspectorRuntimeBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<Inspector::RuntimeBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> bool m_paused;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -594,7 +594,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void inspectorDestroyed() override { }
</span><span class="cx">
</span><del>- virtual InspectorFrontendChannel* openInspectorFrontend(InspectorController*) override { return 0; }
</del><ins>+ virtual Inspector::FrontendChannel* openInspectorFrontend(InspectorController*) override { return 0; }
</ins><span class="cx"> virtual void closeInspectorFrontend() override { }
</span><span class="cx"> virtual void bringFrontendToFront() override { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageDebuggablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageDebuggable.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageDebuggable.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/page/PageDebuggable.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> return m_page.inspectorController().hasLocalFrontend();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageDebuggable::connect(Inspector::InspectorFrontendChannel* channel, bool isAutomaticInspection)
</del><ins>+void PageDebuggable::connect(Inspector::FrontendChannel* channel, bool isAutomaticInspection)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page.settings().developerExtrasEnabled()) {
</span><span class="cx"> m_forcedDeveloperExtrasEnabled = true;
</span><span class="lines">@@ -78,13 +78,13 @@
</span><span class="cx">
</span><span class="cx"> InspectorController& inspectorController = m_page.inspectorController();
</span><span class="cx"> inspectorController.setHasRemoteFrontend(true);
</span><del>- inspectorController.connectFrontend(reinterpret_cast<WebCore::InspectorFrontendChannel*>(channel), isAutomaticInspection);
</del><ins>+ inspectorController.connectFrontend(reinterpret_cast<Inspector::FrontendChannel*>(channel), isAutomaticInspection);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageDebuggable::disconnect()
</span><span class="cx"> {
</span><span class="cx"> InspectorController& inspectorController = m_page.inspectorController();
</span><del>- inspectorController.disconnectFrontend(InspectorDisconnectReason::InspectorDestroyed);
</del><ins>+ inspectorController.disconnectFrontend(Inspector::DisconnectReason::InspectorDestroyed);
</ins><span class="cx"> inspectorController.setHasRemoteFrontend(false);
</span><span class="cx">
</span><span class="cx"> if (m_forcedDeveloperExtrasEnabled) {
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageDebuggableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageDebuggable.h (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageDebuggable.h 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/page/PageDebuggable.h 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> virtual String url() const override;
</span><span class="cx"> virtual bool hasLocalDebugger() const override;
</span><span class="cx">
</span><del>- virtual void connect(Inspector::InspectorFrontendChannel*, bool isAutomaticInspection) override;
</del><ins>+ virtual void connect(Inspector::FrontendChannel*, bool isAutomaticInspection) override;
</ins><span class="cx"> virtual void disconnect() override;
</span><span class="cx"> virtual void dispatchMessageFromRemoteFrontend(const String& message) override;
</span><span class="cx"> virtual void setIndicating(bool) override;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -1558,7 +1558,7 @@
</span><span class="cx"> ASSERT(page);
</span><span class="cx"> ASSERT(m_frontendWindow);
</span><span class="cx">
</span><del>- page->inspectorController().disconnectFrontend(InspectorDisconnectReason::InspectorDestroyed);
</del><ins>+ page->inspectorController().disconnectFrontend(Inspector::DisconnectReason::InspectorDestroyed);
</ins><span class="cx">
</span><span class="cx"> m_frontendClient = nullptr;
</span><span class="cx"> m_frontendChannel = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return;
</span><span class="cx"> m_workerThread->runLoop().postTaskForMode([] (ScriptExecutionContext& context) {
</span><del>- downcast<WorkerGlobalScope>(context).workerInspectorController().disconnectFrontend(Inspector::InspectorDisconnectReason::InspectorDestroyed);
</del><ins>+ downcast<WorkerGlobalScope>(context).workerInspectorController().disconnectFrontend(Inspector::DisconnectReason::InspectorDestroyed);
</ins><span class="cx"> }, WorkerDebuggerAgent::debuggerTaskMode);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebKit/ChangeLog 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-02-09 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove some unnecessary Inspector prefixes from class names in Inspector namespace
+ https://bugs.webkit.org/show_bug.cgi?id=141372
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+
</ins><span class="cx"> 2015-02-11 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> symbolWithPointer(??1InspectorFrontendClientLocal@WebCore@@UAE@XZ, ??1InspectorFrontendClientLocal@WebCore@@UEAA@XZ)
</span><span class="cx"> symbolWithPointer(?changeAttachedWindowHeight@InspectorFrontendClientLocal@WebCore@@UAEXI@Z, ?changeAttachedWindowHeight@InspectorFrontendClientLocal@WebCore@@UEAAXI@Z)
</span><span class="cx"> symbolWithPointer(?changeAttachedWindowWidth@InspectorFrontendClientLocal@WebCore@@UAEXI@Z, ?changeAttachedWindowWidth@InspectorFrontendClientLocal@WebCore@@UEAAXI@Z)
</span><del>- symbolWithPointer(?connectFrontend@InspectorController@WebCore@@QAEXPAVInspectorFrontendChannel@Inspector@@_N@Z, ?connectFrontend@InspectorController@WebCore@@QEAAXPEAVInspectorFrontendChannel@Inspector@@_N@Z)
</del><ins>+ symbolWithPointer(?connectFrontend@InspectorController@WebCore@@QAEXPAVFrontendChannel@Inspector@@_N@Z, ?connectFrontend@InspectorController@WebCore@@QEAAXPEAVFrontendChannel@Inspector@@_N@Z)
</ins><span class="cx"> symbolWithPointer(?doDispatchMessageOnFrontendPage@InspectorClient@WebCore@@SA_NPAVPage@2@ABVString@WTF@@@Z, ?doDispatchMessageOnFrontendPage@InspectorClient@WebCore@@SA_NPEAVPage@2@AEBVString@WTF@@@Z)
</span><span class="cx"> symbolWithPointer(?frontendLoaded@InspectorFrontendClientLocal@WebCore@@UAEXXZ, ?frontendLoaded@InspectorFrontendClientLocal@WebCore@@UEAAXXZ)
</span><span class="cx"> symbolWithPointer(?getProperty@Settings@InspectorFrontendClientLocal@WebCore@@UAE?AVString@WTF@@ABV45@@Z, ?getProperty@Settings@InspectorFrontendClientLocal@WebCore@@UEAA?AVString@WTF@@AEBV45@@Z)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> symbolWithPointer(?windowObjectCleared@InspectorFrontendClientLocal@WebCore@@UAEXXZ, ?windowObjectCleared@InspectorFrontendClientLocal@WebCore@@UEAAXXZ)
</span><span class="cx"> symbolWithPointer(?pathByAppendingComponent@WebCore@@YA?AVString@WTF@@ABV23@0@Z, ?pathByAppendingComponent@WebCore@@YA?AVString@WTF@@AEBV23@0@Z)
</span><span class="cx"> symbolWithPointer(?setProfilerEnabled@InspectorController@WebCore@@QAEX_N@Z, ?setProfilerEnabled@InspectorController@WebCore@@QEAAX_N@Z)
</span><del>- symbolWithPointer(?disconnectFrontend@InspectorController@WebCore@@QAEXW4InspectorDisconnectReason@Inspector@@@Z, ?disconnectFrontend@InspectorController@WebCore@@QEAAXW4InspectorDisconnectReason@Inspector@@@Z)
</del><ins>+ symbolWithPointer(?disconnectFrontend@InspectorController@WebCore@@QAEXW4DisconnectReason@Inspector@@@Z, ?disconnectFrontend@InspectorController@WebCore@@QEAAXW4DisconnectReason@Inspector@@@Z)
</ins><span class="cx"> symbolWithPointer(?isActiveInsertionPoint@WebCore@@YA_NPBVNode@1@@Z, ?isActiveInsertionPoint@WebCore@@YA_NPEBVNode@1@@Z)
</span><span class="cx"> symbolWithPointer(?isPreloaded@CachedResourceLoader@WebCore@@QBE_NABVString@WTF@@@Z, ?isPreloaded@CachedResourceLoader@WebCore@@QEBA_NAEBVString@WTF@@@Z)
</span><span class="cx"> symbolWithPointer(?jsArray@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@V?$PassRefPtr@VDOMStringList@WebCore@@@WTF@@@Z, ?jsArray@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@V?$PassRefPtr@VDOMStringList@WebCore@@@WTF@@@Z)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-09 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove some unnecessary Inspector prefixes from class names in Inspector namespace
+ https://bugs.webkit.org/show_bug.cgi?id=141372
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebCoreSupport/WebInspectorClient.mm:
+ (-[WebInspectorWindowController destroyInspectorView:]):
+
</ins><span class="cx"> 2015-02-14 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> rel="noreferrer" should make window.opener null
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -730,7 +730,7 @@
</span><span class="cx">
</span><span class="cx"> if (notifyInspectorController) {
</span><span class="cx"> if (Page* inspectedPage = [_inspectedWebView.get() page])
</span><del>- inspectedPage->inspectorController().disconnectFrontend(Inspector::InspectorDisconnectReason::InspectorDestroyed);
</del><ins>+ inspectedPage->inspectorController().disconnectFrontend(Inspector::DisconnectReason::InspectorDestroyed);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> [_webView close];
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebKit/win/ChangeLog 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-09 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove some unnecessary Inspector prefixes from class names in Inspector namespace
+ https://bugs.webkit.org/show_bug.cgi?id=141372
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebCoreSupport/WebInspectorClient.cpp:
+ (WebInspectorFrontendClient::destroyInspectorView):
+
</ins><span class="cx"> 2015-02-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] [64-bit] Work around MSVC2013 Runtime Bug
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebInspectorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx"> closeWindowWithoutNotifications();
</span><span class="cx">
</span><span class="cx"> if (notifyInspectorController) {
</span><del>- m_inspectedWebView->page()->inspectorController().disconnectFrontend(Inspector::InspectorDisconnectReason::InspectorDestroyed);
</del><ins>+ m_inspectedWebView->page()->inspectorController().disconnectFrontend(Inspector::DisconnectReason::InspectorDestroyed);
</ins><span class="cx"> m_inspectorClient->updateHighlight();
</span><span class="cx"> }
</span><span class="cx"> ::DestroyWindow(m_frontendHwnd);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-09 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove some unnecessary Inspector prefixes from class names in Inspector namespace
+ https://bugs.webkit.org/show_bug.cgi?id=141372
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::remoteFrontendDisconnected):
+
</ins><span class="cx"> 2015-02-14 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Page opens with enlarged font after visiting PDF, navigating back,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (180115 => 180116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2015-02-14 22:56:11 UTC (rev 180115)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2015-02-14 23:25:53 UTC (rev 180116)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> m_remoteFrontendConnected = false;
</span><span class="cx">
</span><span class="cx"> if (m_page->corePage())
</span><del>- m_page->corePage()->inspectorController().disconnectFrontend(Inspector::InspectorDisconnectReason::InspectorDestroyed);
</del><ins>+ m_page->corePage()->inspectorController().disconnectFrontend(Inspector::DisconnectReason::InspectorDestroyed);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>