<!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>[172930] 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/172930">172930</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-08-25 11:39:25 -0700 (Mon, 25 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: rename Inspector::TypeBuilder to Inspector::Protocol
https://bugs.webkit.org/show_bug.cgi?id=136031
Reviewed by Timothy Hatcher.
Rename TypeBuilder namespace to Protocol. Disambiguate where
necessary. Also rename InspectorTypeBuilder to ProtocolTypes.
* CMakeLists.txt:
* DerivedSources.make:
Source/JavaScriptCore:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.vcxproj/copy-files.cmd:
* JavaScriptCore.xcodeproj/project.pbxproj:
* inspector/ConsoleMessage.cpp:
(Inspector::messageSourceValue):
(Inspector::messageTypeValue):
(Inspector::messageLevelValue):
(Inspector::ConsoleMessage::addToFrontend):
* inspector/ContentSearchUtilities.cpp:
(Inspector::ContentSearchUtilities::buildObjectForSearchMatch):
(Inspector::ContentSearchUtilities::searchInTextByLines):
* inspector/ContentSearchUtilities.h:
* inspector/InjectedScript.cpp:
(Inspector::InjectedScript::evaluate):
(Inspector::InjectedScript::callFunctionOn):
(Inspector::InjectedScript::evaluateOnCallFrame):
(Inspector::InjectedScript::getFunctionDetails):
(Inspector::InjectedScript::getProperties):
(Inspector::InjectedScript::getInternalProperties):
(Inspector::InjectedScript::wrapCallFrames):
(Inspector::InjectedScript::wrapObject):
(Inspector::InjectedScript::wrapTable):
* inspector/InjectedScript.h:
* inspector/InjectedScriptBase.cpp:
(Inspector::InjectedScriptBase::makeEvalCall):
* inspector/InjectedScriptBase.h:
* inspector/InspectorTypeBuilder.h: Removed.
* inspector/ScriptCallFrame.cpp:
(Inspector::ScriptCallFrame::buildInspectorObject):
* inspector/ScriptCallFrame.h:
* inspector/ScriptCallStack.cpp:
(Inspector::ScriptCallStack::buildInspectorArray):
* inspector/ScriptCallStack.h:
* inspector/agents/InspectorAgent.cpp:
(Inspector::InspectorAgent::inspect):
* inspector/agents/InspectorAgent.h:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::breakpointActionTypeForString):
(Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
(Inspector::InspectorDebuggerAgent::setBreakpoint):
(Inspector::InspectorDebuggerAgent::resolveBreakpoint):
(Inspector::InspectorDebuggerAgent::searchInContent):
(Inspector::InspectorDebuggerAgent::getFunctionDetails):
(Inspector::InspectorDebuggerAgent::evaluateOnCallFrame):
(Inspector::InspectorDebuggerAgent::currentCallFrames):
(Inspector::InspectorDebuggerAgent::didParseSource):
(Inspector::InspectorDebuggerAgent::breakpointActionProbe):
* inspector/agents/InspectorDebuggerAgent.h:
* inspector/agents/InspectorProfilerAgent.cpp:
(Inspector::InspectorProfilerAgent::createProfileHeader):
(Inspector::InspectorProfilerAgent::getProfileHeaders):
(Inspector::buildInspectorObject):
(Inspector::InspectorProfilerAgent::buildProfileInspectorObject):
(Inspector::InspectorProfilerAgent::getCPUProfile):
* inspector/agents/InspectorProfilerAgent.h:
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::buildErrorRangeObject):
(Inspector::InspectorRuntimeAgent::parse):
(Inspector::InspectorRuntimeAgent::evaluate):
(Inspector::InspectorRuntimeAgent::callFunctionOn):
(Inspector::InspectorRuntimeAgent::getProperties):
(Inspector::InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets):
* inspector/agents/InspectorRuntimeAgent.h:
* inspector/scripts/codegen/__init__.py:
* inspector/scripts/codegen/generate_backend_dispatcher_header.py:
(BackendDispatcherHeaderGenerator.generate_output):
* inspector/scripts/codegen/generate_backend_dispatcher_implementation.py:
(BackendDispatcherImplementationGenerator._generate_async_dispatcher_class_for_domain):
(BackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command):
* inspector/scripts/codegen/generate_frontend_dispatcher_header.py:
(FrontendDispatcherHeaderGenerator.generate_output):
* inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py:
(FrontendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_event):
* inspector/scripts/codegen/generate_type_builder_header.py: Removed.
* inspector/scripts/codegen/generate_type_builder_implementation.py: Removed.
* inspector/scripts/codegen/generator.py:
(Generator.protocol_type_string_for_type):
(Generator.protocol_type_string_for_type_member):
(Generator.type_string_for_type_with_name):
(Generator.type_string_for_formal_out_parameter):
(Generator.type_string_for_formal_async_parameter):
(Generator.type_string_for_stack_in_parameter):
(Generator.type_string_for_stack_out_parameter):
(Generator.assertion_method_for_type_member.assertion_method_for_type):
(Generator.assertion_method_for_type_member):
(Generator.type_builder_string_for_type): Deleted.
(Generator.type_builder_string_for_type_member): Deleted.
* inspector/scripts/codegen/generator_templates.py:
(Inspector):
* inspector/scripts/generate-inspector-protocol-bindings.py:
(generate_from_specification):
* 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/events-with-optional-parameters.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/HighFidelityTypeProfiler.cpp:
(JSC::HighFidelityTypeProfiler::getTypesForVariableAtOffsetForInspector):
* runtime/HighFidelityTypeProfiler.h:
* runtime/TypeSet.cpp:
(JSC::TypeSet::allPrimitiveTypeNames):
(JSC::TypeSet::allStructureRepresentations):
(JSC::StructureShape::inspectorRepresentation):
* runtime/TypeSet.h:
Source/WebCore:
* ForwardingHeaders/inspector/InspectorJSTypeBuilders.h: Removed.
* ForwardingHeaders/inspector/InspectorTypeBuilder.h: Removed.
* WebCore.order:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* inspector/CommandLineAPIHost.cpp:
(WebCore::CommandLineAPIHost::inspectImpl):
* inspector/InspectorApplicationCacheAgent.cpp:
(WebCore::InspectorApplicationCacheAgent::getFramesWithManifests):
(WebCore::InspectorApplicationCacheAgent::getApplicationCacheForFrame):
(WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCache):
(WebCore::InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources):
(WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource):
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::getMatchedStylesForNode):
(WebCore::InspectorCSSAgent::getInlineStylesForNode):
(WebCore::InspectorCSSAgent::getComputedStyleForNode):
(WebCore::InspectorCSSAgent::getAllStyleSheets):
(WebCore::InspectorCSSAgent::getStyleSheet):
(WebCore::InspectorCSSAgent::setStyleText):
(WebCore::InspectorCSSAgent::setPropertyText):
(WebCore::InspectorCSSAgent::toggleProperty):
(WebCore::InspectorCSSAgent::setRuleSelector):
(WebCore::InspectorCSSAgent::addRule):
(WebCore::InspectorCSSAgent::getSupportedCSSProperties):
(WebCore::InspectorCSSAgent::getNamedFlowCollection):
(WebCore::InspectorCSSAgent::asInspectorStyleSheet):
(WebCore::InspectorCSSAgent::collectStyleSheets):
(WebCore::InspectorCSSAgent::viaInspectorStyleSheet):
(WebCore::InspectorCSSAgent::detectOrigin):
(WebCore::InspectorCSSAgent::buildObjectForRule):
(WebCore::InspectorCSSAgent::buildArrayForRuleList):
(WebCore::InspectorCSSAgent::buildArrayForMatchedRuleList):
(WebCore::InspectorCSSAgent::buildObjectForAttributesStyle):
(WebCore::InspectorCSSAgent::buildArrayForRegions):
(WebCore::InspectorCSSAgent::buildObjectForNamedFlow):
* inspector/InspectorCSSAgent.h:
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::didCreateFrontendAndBackend):
(WebCore::InspectorDOMAgent::getDocument):
(WebCore::InspectorDOMAgent::pushChildNodesToFrontend):
(WebCore::InspectorDOMAgent::querySelectorAll):
(WebCore::InspectorDOMAgent::pushNodePathToFrontend):
(WebCore::InspectorDOMAgent::getEventListenersForNode):
(WebCore::InspectorDOMAgent::getAccessibilityPropertiesForNode):
(WebCore::InspectorDOMAgent::getSearchResults):
(WebCore::InspectorDOMAgent::resolveNode):
(WebCore::InspectorDOMAgent::getAttributes):
(WebCore::InspectorDOMAgent::buildObjectForNode):
(WebCore::InspectorDOMAgent::buildArrayForElementAttributes):
(WebCore::InspectorDOMAgent::buildArrayForContainerChildren):
(WebCore::InspectorDOMAgent::buildObjectForEventListener):
(WebCore::InspectorDOMAgent::processAccessibilityChildren):
(WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
(WebCore::InspectorDOMAgent::didCommitLoad):
(WebCore::InspectorDOMAgent::didInsertDOMNode):
(WebCore::InspectorDOMAgent::styleAttributeInvalidated):
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDOMDebuggerAgent.cpp:
(WebCore::InspectorDOMDebuggerAgent::descriptionForDOMEvent):
* inspector/InspectorDOMStorageAgent.cpp:
(WebCore::InspectorDOMStorageAgent::getDOMStorageItems):
(WebCore::InspectorDOMStorageAgent::storageId):
(WebCore::InspectorDOMStorageAgent::didDispatchDOMStorageEvent):
* inspector/InspectorDOMStorageAgent.h:
* inspector/InspectorDatabaseAgent.cpp:
(WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorDatabaseResource.cpp:
(WebCore::InspectorDatabaseResource::bind):
* inspector/InspectorIndexedDBAgent.cpp:
* inspector/InspectorLayerTreeAgent.cpp:
(WebCore::InspectorLayerTreeAgent::layersForNode):
(WebCore::InspectorLayerTreeAgent::gatherLayersUsingRenderObjectHierarchy):
(WebCore::InspectorLayerTreeAgent::gatherLayersUsingRenderLayerHierarchy):
(WebCore::InspectorLayerTreeAgent::buildObjectForLayer):
(WebCore::InspectorLayerTreeAgent::buildObjectForIntRect):
(WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer):
* inspector/InspectorLayerTreeAgent.h:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::resourceTypeJson):
(WebCore::InspectorPageAgent::cachedResourceTypeJson):
(WebCore::buildObjectForCookie):
(WebCore::buildArrayForCookies):
(WebCore::InspectorPageAgent::getCookies):
(WebCore::InspectorPageAgent::getResourceTree):
(WebCore::InspectorPageAgent::searchInResource):
(WebCore::buildObjectForSearchResult):
(WebCore::InspectorPageAgent::searchInResources):
(WebCore::InspectorPageAgent::buildObjectForFrame):
(WebCore::InspectorPageAgent::buildObjectForFrameTree):
* inspector/InspectorPageAgent.h:
* inspector/InspectorReplayAgent.cpp:
(WebCore::buildInspectorObjectForPosition):
(WebCore::buildInspectorObjectForInput):
(WebCore::buildInspectorObjectForSession):
(WebCore::buildInspectorObjectForSessionState):
(WebCore::buildInspectorObjectForSegmentState):
(WebCore::SerializeInputToJSONFunctor::SerializeInputToJSONFunctor):
(WebCore::SerializeInputToJSONFunctor::operator()):
(WebCore::buildInspectorObjectForSegment):
(WebCore::InspectorReplayAgent::switchSession):
(WebCore::InspectorReplayAgent::insertSessionSegment):
(WebCore::InspectorReplayAgent::removeSessionSegment):
(WebCore::InspectorReplayAgent::currentReplayState):
(WebCore::InspectorReplayAgent::getAvailableSessions):
(WebCore::InspectorReplayAgent::getSessionData):
(WebCore::InspectorReplayAgent::getSegmentData):
* inspector/InspectorReplayAgent.h:
* inspector/InspectorResourceAgent.cpp:
(WebCore::buildObjectForTiming):
(WebCore::buildObjectForResourceRequest):
(WebCore::buildObjectForResourceResponse):
(WebCore::buildObjectForCachedResource):
(WebCore::InspectorResourceAgent::willSendRequest):
(WebCore::InspectorResourceAgent::didReceiveResponse):
(WebCore::InspectorResourceAgent::didLoadResourceFromMemoryCache):
(WebCore::InspectorResourceAgent::buildInitiatorObject):
(WebCore::InspectorResourceAgent::willSendWebSocketHandshakeRequest):
(WebCore::InspectorResourceAgent::didReceiveWebSocketHandshakeResponse):
(WebCore::InspectorResourceAgent::didReceiveWebSocketFrame):
(WebCore::InspectorResourceAgent::didSendWebSocketFrame):
* inspector/InspectorResourceAgent.h:
* inspector/InspectorStyleSheet.cpp:
(WebCore::buildSourceRangeObject):
(WebCore::buildMediaObject):
(WebCore::fillMediaListChain):
(WebCore::InspectorStyle::buildObjectForStyle):
(WebCore::InspectorStyle::buildArrayForComputedStyle):
(WebCore::InspectorStyle::styleWithProperties):
(WebCore::InspectorStyleSheet::create):
(WebCore::InspectorStyleSheet::InspectorStyleSheet):
(WebCore::InspectorStyleSheet::buildObjectForStyleSheet):
(WebCore::InspectorStyleSheet::buildObjectForStyleSheetInfo):
(WebCore::selectorsFromSource):
(WebCore::InspectorStyleSheet::buildObjectForSelectorList):
(WebCore::InspectorStyleSheet::buildObjectForRule):
(WebCore::InspectorStyleSheet::buildObjectForStyle):
(WebCore::InspectorStyleSheet::resourceStyleSheetText):
(WebCore::InspectorStyleSheet::buildArrayForRuleList):
(WebCore::InspectorStyleSheetForInlineStyle::create):
(WebCore::InspectorStyleSheetForInlineStyle::InspectorStyleSheetForInlineStyle):
* inspector/InspectorStyleSheet.h:
(WebCore::InspectorStyleSheet::canBind):
* inspector/InspectorTimelineAgent.cpp:
(WebCore::toProtocol):
(WebCore::InspectorTimelineAgent::addRecordToTimeline):
(WebCore::InspectorTimelineAgent::sendEvent):
* inspector/PageRuntimeAgent.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreDerivedSourcesmake">trunk/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojcopyfilescmd">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleMessagecpp">trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorContentSearchUtilitiescpp">trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorContentSearchUtilitiesh">trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptcpp">trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScripth">trunk/Source/JavaScriptCore/inspector/InjectedScript.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptBasecpp">trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptBaseh">trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallFrameh">trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackcpp">trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackh">trunk/Source/JavaScriptCore/inspector/ScriptCallStack.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="#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="#trunkSourceJavaScriptCoreinspectoragentsInspectorProfilerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorProfilerAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.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="#trunkSourceJavaScriptCoreinspectorscriptscodegen__init__py">trunk/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_backend_dispatcher_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_backend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_frontend_dispatcher_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_frontend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengeneratorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerator_templatespy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptsgenerateinspectorprotocolbindingspy">trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.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="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.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="#trunkSourceJavaScriptCoreruntimeTypeProfilercpp">trunk/Source/JavaScriptCore/runtime/TypeProfiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTypeProfilerh">trunk/Source/JavaScriptCore/runtime/TypeProfiler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTypeSetcpp">trunk/Source/JavaScriptCore/runtime/TypeSet.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTypeSeth">trunk/Source/JavaScriptCore/runtime/TypeSet.h</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCoreorder">trunk/Source/WebCore/WebCore.order</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreinspectorCommandLineAPIHostcpp">trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp</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="#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="#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="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</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="#trunkSourceWebCoreinspectorInspectorStyleSheeth">trunk/Source/WebCore/inspector/InspectorStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageRuntimeAgentcpp">trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorProtocolTypesh">trunk/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_protocol_types_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_protocol_types_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectorInspectorJSProtocolTypesh">trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorJSProtocolTypes.h</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectorInspectorProtocolTypesh">trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorProtocolTypes.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorTypeBuilderh">trunk/Source/JavaScriptCore/inspector/InspectorTypeBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_type_builder_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_type_builder_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_implementation.py</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectorInspectorJSTypeBuildersh">trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorJSTypeBuilders.h</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectorInspectorTypeBuilderh">trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorTypeBuilder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -935,8 +935,8 @@
</span><span class="cx"> ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_backend_dispatcher_implementation.py
</span><span class="cx"> ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_header.py
</span><span class="cx"> ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_implementation.py
</span><del>- ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_type_builder_header.py
- ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_type_builder_implementation.py
</del><ins>+ ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_header.py
+ ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_implementation.py
</ins><span class="cx"> ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator.py
</span><span class="cx"> ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator_templates.py
</span><span class="cx"> ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/__init__.py
</span><span class="lines">@@ -965,12 +965,12 @@
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.h
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
</span><del>- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.cpp
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.h
</del><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.cpp
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.h
</ins><span class="cx"> ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorJSBackendCommands.js
</span><span class="cx"> MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
</span><span class="cx"> DEPENDS ${JavaScriptCore_INSPECTOR_PROTOCOL_SCRIPTS}
</span><del>- COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --framework JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && mkdir -p ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol
</del><ins>+ COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --framework JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSProtocolTypes.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSProtocolTypes.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && mkdir -p ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol
</ins><span class="cx"> VERBATIM)
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
</span><span class="cx">
</span><span class="lines">@@ -986,14 +986,14 @@
</span><span class="cx"> list(APPEND JavaScriptCore_SOURCES
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.cpp
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
</span><del>- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.cpp
</del><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.cpp
</ins><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND JavaScriptCore_HEADERS
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.h
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
</span><del>- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.h
</del><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.h
</ins><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -1,5 +1,129 @@
</span><span class="cx"> 2014-08-24 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><ins>+ Web Inspector: rename Inspector::TypeBuilder to Inspector::Protocol
+ https://bugs.webkit.org/show_bug.cgi?id=136031
+
+ Reviewed by Timothy Hatcher.
+
+ Rename TypeBuilder namespace to Protocol. Disambiguate where
+ necessary. Also rename InspectorTypeBuilder to ProtocolTypes.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.vcxproj/copy-files.cmd:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * inspector/ConsoleMessage.cpp:
+ (Inspector::messageSourceValue):
+ (Inspector::messageTypeValue):
+ (Inspector::messageLevelValue):
+ (Inspector::ConsoleMessage::addToFrontend):
+ * inspector/ContentSearchUtilities.cpp:
+ (Inspector::ContentSearchUtilities::buildObjectForSearchMatch):
+ (Inspector::ContentSearchUtilities::searchInTextByLines):
+ * inspector/ContentSearchUtilities.h:
+ * inspector/InjectedScript.cpp:
+ (Inspector::InjectedScript::evaluate):
+ (Inspector::InjectedScript::callFunctionOn):
+ (Inspector::InjectedScript::evaluateOnCallFrame):
+ (Inspector::InjectedScript::getFunctionDetails):
+ (Inspector::InjectedScript::getProperties):
+ (Inspector::InjectedScript::getInternalProperties):
+ (Inspector::InjectedScript::wrapCallFrames):
+ (Inspector::InjectedScript::wrapObject):
+ (Inspector::InjectedScript::wrapTable):
+ * inspector/InjectedScript.h:
+ * inspector/InjectedScriptBase.cpp:
+ (Inspector::InjectedScriptBase::makeEvalCall):
+ * inspector/InjectedScriptBase.h:
+ * inspector/InspectorTypeBuilder.h: Removed.
+ * inspector/ScriptCallFrame.cpp:
+ (Inspector::ScriptCallFrame::buildInspectorObject):
+ * inspector/ScriptCallFrame.h:
+ * inspector/ScriptCallStack.cpp:
+ (Inspector::ScriptCallStack::buildInspectorArray):
+ * inspector/ScriptCallStack.h:
+ * inspector/agents/InspectorAgent.cpp:
+ (Inspector::InspectorAgent::inspect):
+ * inspector/agents/InspectorAgent.h:
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::breakpointActionTypeForString):
+ (Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
+ (Inspector::InspectorDebuggerAgent::setBreakpoint):
+ (Inspector::InspectorDebuggerAgent::resolveBreakpoint):
+ (Inspector::InspectorDebuggerAgent::searchInContent):
+ (Inspector::InspectorDebuggerAgent::getFunctionDetails):
+ (Inspector::InspectorDebuggerAgent::evaluateOnCallFrame):
+ (Inspector::InspectorDebuggerAgent::currentCallFrames):
+ (Inspector::InspectorDebuggerAgent::didParseSource):
+ (Inspector::InspectorDebuggerAgent::breakpointActionProbe):
+ * inspector/agents/InspectorDebuggerAgent.h:
+ * inspector/agents/InspectorProfilerAgent.cpp:
+ (Inspector::InspectorProfilerAgent::createProfileHeader):
+ (Inspector::InspectorProfilerAgent::getProfileHeaders):
+ (Inspector::buildInspectorObject):
+ (Inspector::InspectorProfilerAgent::buildProfileInspectorObject):
+ (Inspector::InspectorProfilerAgent::getCPUProfile):
+ * inspector/agents/InspectorProfilerAgent.h:
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::buildErrorRangeObject):
+ (Inspector::InspectorRuntimeAgent::parse):
+ (Inspector::InspectorRuntimeAgent::evaluate):
+ (Inspector::InspectorRuntimeAgent::callFunctionOn):
+ (Inspector::InspectorRuntimeAgent::getProperties):
+ (Inspector::InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets):
+ * inspector/agents/InspectorRuntimeAgent.h:
+ * inspector/scripts/codegen/__init__.py:
+ * inspector/scripts/codegen/generate_backend_dispatcher_header.py:
+ (BackendDispatcherHeaderGenerator.generate_output):
+ * inspector/scripts/codegen/generate_backend_dispatcher_implementation.py:
+ (BackendDispatcherImplementationGenerator._generate_async_dispatcher_class_for_domain):
+ (BackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command):
+ * inspector/scripts/codegen/generate_frontend_dispatcher_header.py:
+ (FrontendDispatcherHeaderGenerator.generate_output):
+ * inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py:
+ (FrontendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_event):
+ * inspector/scripts/codegen/generate_type_builder_header.py: Removed.
+ * inspector/scripts/codegen/generate_type_builder_implementation.py: Removed.
+ * inspector/scripts/codegen/generator.py:
+ (Generator.protocol_type_string_for_type):
+ (Generator.protocol_type_string_for_type_member):
+ (Generator.type_string_for_type_with_name):
+ (Generator.type_string_for_formal_out_parameter):
+ (Generator.type_string_for_formal_async_parameter):
+ (Generator.type_string_for_stack_in_parameter):
+ (Generator.type_string_for_stack_out_parameter):
+ (Generator.assertion_method_for_type_member.assertion_method_for_type):
+ (Generator.assertion_method_for_type_member):
+ (Generator.type_builder_string_for_type): Deleted.
+ (Generator.type_builder_string_for_type_member): Deleted.
+ * inspector/scripts/codegen/generator_templates.py:
+ (Inspector):
+ * inspector/scripts/generate-inspector-protocol-bindings.py:
+ (generate_from_specification):
+ * 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/events-with-optional-parameters.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/HighFidelityTypeProfiler.cpp:
+ (JSC::HighFidelityTypeProfiler::getTypesForVariableAtOffsetForInspector):
+ * runtime/HighFidelityTypeProfiler.h:
+ * runtime/TypeSet.cpp:
+ (JSC::TypeSet::allPrimitiveTypeNames):
+ (JSC::TypeSet::allStructureRepresentations):
+ (JSC::StructureShape::inspectorRepresentation):
+ * runtime/TypeSet.h:
+
+2014-08-24 Brian J. Burg <burg@cs.washington.edu>
+
</ins><span class="cx"> Web Inspector: Rename DOM.RGBA and remove workarounds in the bindings generator
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136025
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources.make (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources.make 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/DerivedSources.make 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> $(JavaScriptCore)/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py \
</span><span class="cx"> $(JavaScriptCore)/inspector/scripts/codegen/generate_frontend_dispatcher_header.py \
</span><span class="cx"> $(JavaScriptCore)/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py \
</span><del>- $(JavaScriptCore)/inspector/scripts/codegen/generate_type_builder_header.py \
- $(JavaScriptCore)/inspector/scripts/codegen/generate_type_builder_implementation.py \
</del><ins>+ $(JavaScriptCore)/inspector/scripts/codegen/generate_protocol_types_header.py \
+ $(JavaScriptCore)/inspector/scripts/codegen/generate_protocol_types_implementation.py \
</ins><span class="cx"> $(JavaScriptCore)/inspector/scripts/codegen/generator_templates.py \
</span><span class="cx"> $(JavaScriptCore)/inspector/scripts/codegen/generator.py \
</span><span class="cx"> $(JavaScriptCore)/inspector/scripts/codegen/models.py \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -817,7 +817,7 @@
</span><span class="cx"> <ClCompile Include="..\yarr\YarrSyntaxChecker.cpp" />
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.cpp" />
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.cpp" />
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.cpp" />
</del><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.cpp" />
</ins><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCBuiltins.cpp" />
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="lines">@@ -831,7 +831,7 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InjectedScriptSource.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.h" />
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.h" />
</del><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.h" />
</ins><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataViewPrototype.lut.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSONObject.lut.h" />
</span><span class="lines">@@ -1247,7 +1247,7 @@
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorBackendDispatcher.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorEnvironment.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorFrontendChannel.h" />
</span><del>- <ClInclude Include="..\inspector\InspectorTypeBuilder.h" />
</del><ins>+ <ClInclude Include="..\inspector\InspectorProtocolTypes.h" />
</ins><span class="cx"> <ClInclude Include="..\inspector\InspectorValues.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\JSInjectedScriptHost.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\JSInjectedScriptHostPrototype.h" />
</span><span class="lines">@@ -1620,8 +1620,8 @@
</span><span class="cx"> <None Include="..\inspector\scripts\codegen\generate_backend_dispatcher_implementation.py" />
</span><span class="cx"> <None Include="..\inspector\scripts\codegen\generate_frontend_dispatcher_header.py" />
</span><span class="cx"> <None Include="..\inspector\scripts\codegen\generate_frontend_dispatcher_implementation.py" />
</span><del>- <None Include="..\inspector\scripts\codegen\generate_type_builder_header.py" />
- <None Include="..\inspector\scripts\codegen\generate_type_builder_implementation.py" />
</del><ins>+ <None Include="..\inspector\scripts\codegen\generate_protocol_types_header.py" />
+ <None Include="..\inspector\scripts\codegen\generate_protocol_types_implementation.py" />
</ins><span class="cx"> <None Include="..\inspector\scripts\codegen\generator.py" />
</span><span class="cx"> <None Include="..\inspector\scripts\codegen\generator_templates.py" />
</span><span class="cx"> <None Include="..\inspector\scripts\codegen\models.py" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -1389,7 +1389,7 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.cpp">
</span><span class="cx"> <Filter>Derived Sources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.cpp">
</del><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.cpp">
</ins><span class="cx"> <Filter>Derived Sources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\jit\ArityCheckFailReturnThunks.cpp">
</span><span class="lines">@@ -2180,7 +2180,7 @@
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorFrontendChannel.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\InspectorTypeBuilder.h">
</del><ins>+ <ClInclude Include="..\inspector\InspectorProtocolTypes.h">
</ins><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorValues.h">
</span><span class="lines">@@ -2934,7 +2934,7 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.h">
</span><span class="cx"> <Filter>Derived Sources</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.h">
</del><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.h">
</ins><span class="cx"> <Filter>Derived Sources</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h">
</span><span class="lines">@@ -4092,10 +4092,10 @@
</span><span class="cx"> <None Include="..\inspector\scripts\codegen\generate_frontend_dispatcher_implementation.py">
</span><span class="cx"> <Filter>inspector\scripts\codegen</Filter>
</span><span class="cx"> </None>
</span><del>- <None Include="..\inspector\scripts\codegen\generate_type_builder_header.py">
</del><ins>+ <None Include="..\inspector\scripts\codegen\generate_protocol_types_header.py">
</ins><span class="cx"> <Filter>inspector\scripts\codegen</Filter>
</span><span class="cx"> </None>
</span><del>- <None Include="..\inspector\scripts\codegen\generate_type_builder_implementation.py">
</del><ins>+ <None Include="..\inspector\scripts\codegen\generate_protocol_types_implementation.py">
</ins><span class="cx"> <Filter>inspector\scripts\codegen</Filter>
</span><span class="cx"> </None>
</span><span class="cx"> <None Include="..\inspector\scripts\codegen\generator.py">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojcopyfilescmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> echo Copying Inspector generated files as if they were private headers...
</span><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorJS.json" "%PrivateHeadersDirectory%" >NUL
</span><del>-xcopy /y "%DerivedSourcesDirectory%\InspectorJSTypeBuilders.h" "%PrivateHeadersDirectory%" >NUL
</del><ins>+xcopy /y "%DerivedSourcesDirectory%\InspectorJSProtocolTypes.h" "%PrivateHeadersDirectory%" >NUL
</ins><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
</span><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorJSFrontendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
</span><span class="cx"> xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendCommands.js" "%PrivateHeadersDirectory%" >NUL
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -1359,8 +1359,8 @@
</span><span class="cx"> A532438818568335002ED692 /* InspectorJSBackendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438218568317002ED692 /* InspectorJSBackendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A532438918568335002ED692 /* InspectorJSFrontendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */; };
</span><span class="cx"> A532438A18568335002ED692 /* InspectorJSFrontendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- A532438B18568335002ED692 /* InspectorJSTypeBuilders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438518568317002ED692 /* InspectorJSTypeBuilders.cpp */; };
- A532438C18568335002ED692 /* InspectorJSTypeBuilders.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438618568317002ED692 /* InspectorJSTypeBuilders.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ A532438B18568335002ED692 /* InspectorJSProtocolTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438518568317002ED692 /* InspectorJSProtocolTypes.cpp */; };
+ A532438C18568335002ED692 /* InspectorJSProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438618568317002ED692 /* InspectorJSProtocolTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> A532439418569709002ED692 /* generate-combined-inspector-json.py in Headers */ = {isa = PBXBuildFile; fileRef = A5324391185696E6002ED692 /* generate-combined-inspector-json.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A53243981856A489002ED692 /* InspectorJS.json in Headers */ = {isa = PBXBuildFile; fileRef = A53243951856A475002ED692 /* InspectorJS.json */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A53CE08518BC1A5600BEDF76 /* ConsolePrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A53CE08118BC1A5600BEDF76 /* ConsolePrototype.cpp */; };
</span><span class="lines">@@ -1379,7 +1379,7 @@
</span><span class="cx"> A54E8EB118BFFBBE00556D28 /* GCSegmentedArrayInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A343F7718A1749D0039B085 /* GCSegmentedArrayInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A55D93A5185012A800400DED /* ScriptFunctionCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A55D93A3185012A800400DED /* ScriptFunctionCall.cpp */; };
</span><span class="cx"> A55D93A6185012A800400DED /* ScriptFunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = A55D93A4185012A800400DED /* ScriptFunctionCall.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- A55D93AC18514F7900400DED /* InspectorTypeBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = A55D93AB18514F7900400DED /* InspectorTypeBuilder.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ A55D93AC18514F7900400DED /* InspectorProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A55D93AB18514F7900400DED /* InspectorProtocolTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> A57D23E51890CEBF0031C7FA /* InspectorDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A57D23E31890CEBF0031C7FA /* InspectorDebuggerAgent.cpp */; };
</span><span class="cx"> A57D23E61890CEBF0031C7FA /* InspectorDebuggerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A57D23E41890CEBF0031C7FA /* InspectorDebuggerAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A57D23E91891B0770031C7FA /* JSGlobalObjectDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A57D23E71891B0770031C7FA /* JSGlobalObjectDebuggerAgent.cpp */; };
</span><span class="lines">@@ -1792,11 +1792,13 @@
</span><span class="cx"> C4703CD0192844CC0013FBEA /* generate_backend_dispatcher_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC5192844CC0013FBEA /* generate_backend_dispatcher_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C4703CD1192844CC0013FBEA /* generate_frontend_dispatcher_header.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC6192844CC0013FBEA /* generate_frontend_dispatcher_header.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C4703CD2192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC7192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- C4703CD3192844CC0013FBEA /* generate_type_builder_header.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC8192844CC0013FBEA /* generate_type_builder_header.py */; settings = {ATTRIBUTES = (Private, ); }; };
- C4703CD4192844CC0013FBEA /* generate_type_builder_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC9192844CC0013FBEA /* generate_type_builder_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> C4703CD5192844CC0013FBEA /* generator_templates.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CCA192844CC0013FBEA /* generator_templates.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C4703CD6192844CC0013FBEA /* generator.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CCB192844CC0013FBEA /* generator.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C4703CD7192844CC0013FBEA /* models.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CCC192844CC0013FBEA /* models.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ C49FE4A919AAC83E00F40CE9 /* generate_protocol_types_header.py in Resources */ = {isa = PBXBuildFile; fileRef = C49FE4A719AAC83E00F40CE9 /* generate_protocol_types_header.py */; };
+ C49FE4AA19AAC83E00F40CE9 /* generate_protocol_types_implementation.py in Resources */ = {isa = PBXBuildFile; fileRef = C49FE4A819AAC83E00F40CE9 /* generate_protocol_types_implementation.py */; };
+ C49FE4AB19AAC86100F40CE9 /* generate_protocol_types_header.py in Headers */ = {isa = PBXBuildFile; fileRef = C49FE4A719AAC83E00F40CE9 /* generate_protocol_types_header.py */; settings = {ATTRIBUTES = (Private, ); }; };
+ C49FE4AC19AAC86100F40CE9 /* generate_protocol_types_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = C49FE4A819AAC83E00F40CE9 /* generate_protocol_types_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> E124A8F70E555775003091F1 /* OpaqueJSString.h in Headers */ = {isa = PBXBuildFile; fileRef = E124A8F50E555775003091F1 /* OpaqueJSString.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> E124A8F80E555775003091F1 /* OpaqueJSString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E124A8F60E555775003091F1 /* OpaqueJSString.cpp */; };
</span><span class="cx"> E18E3A590DF9278C00D90B34 /* VM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18E3A570DF9278C00D90B34 /* VM.cpp */; };
</span><span class="lines">@@ -3016,8 +3018,8 @@
</span><span class="cx"> A532438218568317002ED692 /* InspectorJSBackendDispatchers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSBackendDispatchers.h; sourceTree = "<group>"; };
</span><span class="cx"> A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSFrontendDispatchers.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSFrontendDispatchers.h; sourceTree = "<group>"; };
</span><del>- A532438518568317002ED692 /* InspectorJSTypeBuilders.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSTypeBuilders.cpp; sourceTree = "<group>"; };
- A532438618568317002ED692 /* InspectorJSTypeBuilders.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSTypeBuilders.h; sourceTree = "<group>"; };
</del><ins>+ A532438518568317002ED692 /* InspectorJSProtocolTypes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSProtocolTypes.cpp; sourceTree = "<group>"; };
+ A532438618568317002ED692 /* InspectorJSProtocolTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSProtocolTypes.h; sourceTree = "<group>"; };
</ins><span class="cx"> A532438D185696CA002ED692 /* protocol */ = {isa = PBXFileReference; lastKnownFileType = folder; path = protocol; sourceTree = "<group>"; };
</span><span class="cx"> A5324391185696E6002ED692 /* generate-combined-inspector-json.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "generate-combined-inspector-json.py"; sourceTree = "<group>"; };
</span><span class="cx"> A53243951856A475002ED692 /* InspectorJS.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = InspectorJS.json; sourceTree = "<group>"; };
</span><span class="lines">@@ -3036,7 +3038,7 @@
</span><span class="cx"> A54CF2F8184EAEDA00237F19 /* ScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptObject.h; sourceTree = "<group>"; };
</span><span class="cx"> A55D93A3185012A800400DED /* ScriptFunctionCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptFunctionCall.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A55D93A4185012A800400DED /* ScriptFunctionCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptFunctionCall.h; sourceTree = "<group>"; };
</span><del>- A55D93AB18514F7900400DED /* InspectorTypeBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTypeBuilder.h; sourceTree = "<group>"; };
</del><ins>+ A55D93AB18514F7900400DED /* InspectorProtocolTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorProtocolTypes.h; sourceTree = "<group>"; };
</ins><span class="cx"> A57D23E31890CEBF0031C7FA /* InspectorDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDebuggerAgent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A57D23E41890CEBF0031C7FA /* InspectorDebuggerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDebuggerAgent.h; sourceTree = "<group>"; };
</span><span class="cx"> A57D23E71891B0770031C7FA /* JSGlobalObjectDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObjectDebuggerAgent.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3441,11 +3443,11 @@
</span><span class="cx"> C4703CC5192844CC0013FBEA /* generate_backend_dispatcher_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_backend_dispatcher_implementation.py; sourceTree = "<group>"; };
</span><span class="cx"> C4703CC6192844CC0013FBEA /* generate_frontend_dispatcher_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_frontend_dispatcher_header.py; sourceTree = "<group>"; };
</span><span class="cx"> C4703CC7192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_frontend_dispatcher_implementation.py; sourceTree = "<group>"; };
</span><del>- C4703CC8192844CC0013FBEA /* generate_type_builder_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_type_builder_header.py; sourceTree = "<group>"; };
- C4703CC9192844CC0013FBEA /* generate_type_builder_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_type_builder_implementation.py; sourceTree = "<group>"; };
</del><span class="cx"> C4703CCA192844CC0013FBEA /* generator_templates.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generator_templates.py; sourceTree = "<group>"; };
</span><span class="cx"> C4703CCB192844CC0013FBEA /* generator.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generator.py; sourceTree = "<group>"; };
</span><span class="cx"> C4703CCC192844CC0013FBEA /* models.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = models.py; sourceTree = "<group>"; };
</span><ins>+ C49FE4A719AAC83E00F40CE9 /* generate_protocol_types_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_protocol_types_header.py; sourceTree = "<group>"; };
+ C49FE4A819AAC83E00F40CE9 /* generate_protocol_types_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_protocol_types_implementation.py; sourceTree = "<group>"; };
</ins><span class="cx"> D21202280AD4310C00ED79B6 /* DateConversion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DateConversion.cpp; sourceTree = "<group>"; };
</span><span class="cx"> D21202290AD4310C00ED79B6 /* DateConversion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DateConversion.h; sourceTree = "<group>"; };
</span><span class="cx"> E124A8F50E555775003091F1 /* OpaqueJSString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpaqueJSString.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4230,8 +4232,8 @@
</span><span class="cx"> A532438218568317002ED692 /* InspectorJSBackendDispatchers.h */,
</span><span class="cx"> A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */,
</span><span class="cx"> A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */,
</span><del>- A532438518568317002ED692 /* InspectorJSTypeBuilders.cpp */,
- A532438618568317002ED692 /* InspectorJSTypeBuilders.h */,
</del><ins>+ A532438518568317002ED692 /* InspectorJSProtocolTypes.cpp */,
+ A532438618568317002ED692 /* InspectorJSProtocolTypes.h */,
</ins><span class="cx"> A7D801A61880D6A80026C39B /* JSCBuiltins.cpp */,
</span><span class="cx"> A7D801A71880D6A80026C39B /* JSCBuiltins.h */,
</span><span class="cx"> BC87CDB810712ACA000614CF /* JSONObject.lut.h */,
</span><span class="lines">@@ -5352,7 +5354,7 @@
</span><span class="cx"> A593CF7B1840360300BFCE27 /* InspectorBackendDispatcher.h */,
</span><span class="cx"> A5D0A1BA1862301B00C7B496 /* InspectorEnvironment.h */,
</span><span class="cx"> A5945594182479EB00CC3843 /* InspectorFrontendChannel.h */,
</span><del>- A55D93AB18514F7900400DED /* InspectorTypeBuilder.h */,
</del><ins>+ A55D93AB18514F7900400DED /* InspectorProtocolTypes.h */,
</ins><span class="cx"> A593CF801840377100BFCE27 /* InspectorValues.cpp */,
</span><span class="cx"> A593CF811840377100BFCE27 /* InspectorValues.h */,
</span><span class="cx"> A503FA13188E0FAF00110F14 /* JavaScriptCallFrame.cpp */,
</span><span class="lines">@@ -5425,8 +5427,8 @@
</span><span class="cx"> C4703CC5192844CC0013FBEA /* generate_backend_dispatcher_implementation.py */,
</span><span class="cx"> C4703CC6192844CC0013FBEA /* generate_frontend_dispatcher_header.py */,
</span><span class="cx"> C4703CC7192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py */,
</span><del>- C4703CC8192844CC0013FBEA /* generate_type_builder_header.py */,
- C4703CC9192844CC0013FBEA /* generate_type_builder_implementation.py */,
</del><ins>+ C49FE4A719AAC83E00F40CE9 /* generate_protocol_types_header.py */,
+ C49FE4A819AAC83E00F40CE9 /* generate_protocol_types_implementation.py */,
</ins><span class="cx"> C4703CCA192844CC0013FBEA /* generator_templates.py */,
</span><span class="cx"> C4703CCB192844CC0013FBEA /* generator.py */,
</span><span class="cx"> C4703CCC192844CC0013FBEA /* models.py */,
</span><span class="lines">@@ -5715,6 +5717,8 @@
</span><span class="cx"> 0F6B1CB91861244C00845D97 /* ArityCheckMode.h in Headers */,
</span><span class="cx"> A1A009C11831A26E00CF8711 /* ARM64Assembler.h in Headers */,
</span><span class="cx"> 86D3B2C410156BDE002865E7 /* ARMAssembler.h in Headers */,
</span><ins>+ C49FE4AB19AAC86100F40CE9 /* generate_protocol_types_header.py in Headers */,
+ C49FE4AC19AAC86100F40CE9 /* generate_protocol_types_implementation.py in Headers */,
</ins><span class="cx"> 658D3A5619638268003C45D6 /* VMEntryRecord.h in Headers */,
</span><span class="cx"> 2AD2EDFB19799E38004D6478 /* EnumerationMode.h in Headers */,
</span><span class="cx"> 147B83AC0E6DB8C9004775A4 /* BatchedTransitionOptimizer.h in Headers */,
</span><span class="lines">@@ -5725,7 +5729,6 @@
</span><span class="cx"> C2DA778318E259990066FCB6 /* HeapInlines.h in Headers */,
</span><span class="cx"> A532439418569709002ED692 /* generate-combined-inspector-json.py in Headers */,
</span><span class="cx"> A5840E27187C981E00843B10 /* cssmin.py in Headers */,
</span><del>- C4703CD3192844CC0013FBEA /* generate_type_builder_header.py in Headers */,
</del><span class="cx"> C4703CD2192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py in Headers */,
</span><span class="cx"> C4703CD1192844CC0013FBEA /* generate_frontend_dispatcher_header.py in Headers */,
</span><span class="cx"> C4703CD5192844CC0013FBEA /* generator_templates.py in Headers */,
</span><span class="lines">@@ -5734,7 +5737,6 @@
</span><span class="cx"> C4703CC0192844960013FBEA /* generate-inspector-protocol-bindings.py in Headers */,
</span><span class="cx"> C4703CD0192844CC0013FBEA /* generate_backend_dispatcher_implementation.py in Headers */,
</span><span class="cx"> C4703CCE192844CC0013FBEA /* generate_backend_commands.py in Headers */,
</span><del>- C4703CD4192844CC0013FBEA /* generate_type_builder_implementation.py in Headers */,
</del><span class="cx"> C4703CD7192844CC0013FBEA /* models.py in Headers */,
</span><span class="cx"> 2AACE63D18CA5A0300ED0191 /* GCActivityCallback.h in Headers */,
</span><span class="cx"> 2A83638618D7D0EE0000EBCC /* EdenGCActivityCallback.h in Headers */,
</span><span class="lines">@@ -6117,10 +6119,10 @@
</span><span class="cx"> A532438818568335002ED692 /* InspectorJSBackendDispatchers.h in Headers */,
</span><span class="cx"> A532438A18568335002ED692 /* InspectorJSFrontendDispatchers.h in Headers */,
</span><span class="cx"> 8606DDEA18DA44AB00A383D0 /* IdentifierInlines.h in Headers */,
</span><del>- A532438C18568335002ED692 /* InspectorJSTypeBuilders.h in Headers */,
</del><ins>+ A532438C18568335002ED692 /* InspectorJSProtocolTypes.h in Headers */,
</ins><span class="cx"> A50E4B6218809DD50068A46D /* InspectorRuntimeAgent.h in Headers */,
</span><span class="cx"> 0FBFDD05196C92BF007A5BFA /* DFGPhantomRemovalPhase.h in Headers */,
</span><del>- A55D93AC18514F7900400DED /* InspectorTypeBuilder.h in Headers */,
</del><ins>+ A55D93AC18514F7900400DED /* InspectorProtocolTypes.h in Headers */,
</ins><span class="cx"> A593CF831840377100BFCE27 /* InspectorValues.h in Headers */,
</span><span class="cx"> 969A07990ED1D3AE00F1F681 /* Instruction.h in Headers */,
</span><span class="cx"> A7A8AF3B17ADB5F3005AB174 /* Int16Array.h in Headers */,
</span><span class="lines">@@ -6767,7 +6769,9 @@
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><ins>+ C49FE4A919AAC83E00F40CE9 /* generate_protocol_types_header.py in Resources */,
</ins><span class="cx"> A53F1AC018C90F8F0072EB6D /* framework.sb in Resources */,
</span><ins>+ C49FE4AA19AAC83E00F40CE9 /* generate_protocol_types_implementation.py in Resources */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -7386,7 +7390,7 @@
</span><span class="cx"> A57D23E51890CEBF0031C7FA /* InspectorDebuggerAgent.cpp in Sources */,
</span><span class="cx"> A532438718568335002ED692 /* InspectorJSBackendDispatchers.cpp in Sources */,
</span><span class="cx"> A532438918568335002ED692 /* InspectorJSFrontendDispatchers.cpp in Sources */,
</span><del>- A532438B18568335002ED692 /* InspectorJSTypeBuilders.cpp in Sources */,
</del><ins>+ A532438B18568335002ED692 /* InspectorJSProtocolTypes.cpp in Sources */,
</ins><span class="cx"> A50E4B6118809DD50068A46D /* InspectorRuntimeAgent.cpp in Sources */,
</span><span class="cx"> A593CF821840377100BFCE27 /* InspectorValues.cpp in Sources */,
</span><span class="cx"> A78853F917972629001440E4 /* IntendedStructureChain.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleMessagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -131,57 +131,57 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Inspector::TypeBuilder::Console::ConsoleMessage::Source messageSourceValue(MessageSource source)
</del><ins>+static Inspector::Protocol::Console::ConsoleMessage::Source messageSourceValue(MessageSource source)
</ins><span class="cx"> {
</span><span class="cx"> switch (source) {
</span><del>- case MessageSource::XML: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::XML;
- case MessageSource::JS: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Javascript;
- case MessageSource::Network: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Network;
- case MessageSource::ConsoleAPI: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::ConsoleAPI;
- case MessageSource::Storage: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Storage;
- case MessageSource::AppCache: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Appcache;
- case MessageSource::Rendering: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Rendering;
- case MessageSource::CSS: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::CSS;
- case MessageSource::Security: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Security;
- case MessageSource::Other: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Other;
</del><ins>+ case MessageSource::XML: return Inspector::Protocol::Console::ConsoleMessage::Source::XML;
+ case MessageSource::JS: return Inspector::Protocol::Console::ConsoleMessage::Source::Javascript;
+ case MessageSource::Network: return Inspector::Protocol::Console::ConsoleMessage::Source::Network;
+ case MessageSource::ConsoleAPI: return Inspector::Protocol::Console::ConsoleMessage::Source::ConsoleAPI;
+ case MessageSource::Storage: return Inspector::Protocol::Console::ConsoleMessage::Source::Storage;
+ case MessageSource::AppCache: return Inspector::Protocol::Console::ConsoleMessage::Source::Appcache;
+ case MessageSource::Rendering: return Inspector::Protocol::Console::ConsoleMessage::Source::Rendering;
+ case MessageSource::CSS: return Inspector::Protocol::Console::ConsoleMessage::Source::CSS;
+ case MessageSource::Security: return Inspector::Protocol::Console::ConsoleMessage::Source::Security;
+ case MessageSource::Other: return Inspector::Protocol::Console::ConsoleMessage::Source::Other;
</ins><span class="cx"> }
</span><del>- return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Other;
</del><ins>+ return Inspector::Protocol::Console::ConsoleMessage::Source::Other;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Inspector::TypeBuilder::Console::ConsoleMessage::Type messageTypeValue(MessageType type)
</del><ins>+static Inspector::Protocol::Console::ConsoleMessage::Type messageTypeValue(MessageType type)
</ins><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><del>- case MessageType::Log: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Log;
- case MessageType::Clear: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Clear;
- case MessageType::Dir: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Dir;
- case MessageType::DirXML: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::DirXML;
- case MessageType::Table: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Table;
- case MessageType::Trace: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Trace;
- case MessageType::StartGroup: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::StartGroup;
- case MessageType::StartGroupCollapsed: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::StartGroupCollapsed;
- case MessageType::EndGroup: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::EndGroup;
- case MessageType::Assert: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Assert;
- case MessageType::Timing: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Timing;
- case MessageType::Profile: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Profile;
- case MessageType::ProfileEnd: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::ProfileEnd;
</del><ins>+ case MessageType::Log: return Inspector::Protocol::Console::ConsoleMessage::Type::Log;
+ case MessageType::Clear: return Inspector::Protocol::Console::ConsoleMessage::Type::Clear;
+ case MessageType::Dir: return Inspector::Protocol::Console::ConsoleMessage::Type::Dir;
+ case MessageType::DirXML: return Inspector::Protocol::Console::ConsoleMessage::Type::DirXML;
+ case MessageType::Table: return Inspector::Protocol::Console::ConsoleMessage::Type::Table;
+ case MessageType::Trace: return Inspector::Protocol::Console::ConsoleMessage::Type::Trace;
+ case MessageType::StartGroup: return Inspector::Protocol::Console::ConsoleMessage::Type::StartGroup;
+ case MessageType::StartGroupCollapsed: return Inspector::Protocol::Console::ConsoleMessage::Type::StartGroupCollapsed;
+ case MessageType::EndGroup: return Inspector::Protocol::Console::ConsoleMessage::Type::EndGroup;
+ case MessageType::Assert: return Inspector::Protocol::Console::ConsoleMessage::Type::Assert;
+ case MessageType::Timing: return Inspector::Protocol::Console::ConsoleMessage::Type::Timing;
+ case MessageType::Profile: return Inspector::Protocol::Console::ConsoleMessage::Type::Profile;
+ case MessageType::ProfileEnd: return Inspector::Protocol::Console::ConsoleMessage::Type::ProfileEnd;
</ins><span class="cx"> }
</span><del>- return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Log;
</del><ins>+ return Inspector::Protocol::Console::ConsoleMessage::Type::Log;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Inspector::TypeBuilder::Console::ConsoleMessage::Level messageLevelValue(MessageLevel level)
</del><ins>+static Inspector::Protocol::Console::ConsoleMessage::Level messageLevelValue(MessageLevel level)
</ins><span class="cx"> {
</span><span class="cx"> switch (level) {
</span><del>- case MessageLevel::Log: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Log;
- case MessageLevel::Warning: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Warning;
- case MessageLevel::Error: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Error;
- case MessageLevel::Debug: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Debug;
</del><ins>+ case MessageLevel::Log: return Inspector::Protocol::Console::ConsoleMessage::Level::Log;
+ case MessageLevel::Warning: return Inspector::Protocol::Console::ConsoleMessage::Level::Warning;
+ case MessageLevel::Error: return Inspector::Protocol::Console::ConsoleMessage::Level::Error;
+ case MessageLevel::Debug: return Inspector::Protocol::Console::ConsoleMessage::Level::Debug;
</ins><span class="cx"> }
</span><del>- return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Log;
</del><ins>+ return Inspector::Protocol::Console::ConsoleMessage::Level::Log;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ConsoleMessage::addToFrontend(InspectorConsoleFrontendDispatcher* consoleFrontendDispatcher, Inspector::InjectedScriptManager* injectedScriptManager, bool generatePreview)
</span><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Console::ConsoleMessage> jsonObj = Inspector::TypeBuilder::Console::ConsoleMessage::create()
</del><ins>+ RefPtr<Inspector::Protocol::Console::ConsoleMessage> jsonObj = Inspector::Protocol::Console::ConsoleMessage::create()
</ins><span class="cx"> .setSource(messageSourceValue(m_source))
</span><span class="cx"> .setLevel(messageLevelValue(m_level))
</span><span class="cx"> .setText(m_message);
</span><span class="lines">@@ -199,11 +199,11 @@
</span><span class="cx"> if (m_arguments && m_arguments->argumentCount()) {
</span><span class="cx"> InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState());
</span><span class="cx"> if (!injectedScript.hasNoValue()) {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::RemoteObject>> jsonArgs = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::RemoteObject>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>> jsonArgs = Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>::create();
</ins><span class="cx"> if (m_type == MessageType::Table && generatePreview && m_arguments->argumentCount()) {
</span><span class="cx"> Deprecated::ScriptValue table = m_arguments->argumentAt(0);
</span><span class="cx"> Deprecated::ScriptValue columns = m_arguments->argumentCount() > 1 ? m_arguments->argumentAt(1) : Deprecated::ScriptValue();
</span><del>- RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapTable(table, columns);
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::RemoteObject> inspectorValue = injectedScript.wrapTable(table, columns);
</ins><span class="cx"> if (!inspectorValue) {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return;
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> jsonArgs->addItem(inspectorValue);
</span><span class="cx"> } else {
</span><span class="cx"> for (unsigned i = 0; i < m_arguments->argumentCount(); ++i) {
</span><del>- RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapObject(m_arguments->argumentAt(i), "console", generatePreview);
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::RemoteObject> inspectorValue = injectedScript.wrapObject(m_arguments->argumentAt(i), "console", generatePreview);
</ins><span class="cx"> if (!inspectorValue) {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorContentSearchUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorJSTypeBuilders.h"
</del><ins>+#include "InspectorJSProtocolTypes.h"
</ins><span class="cx"> #include "InspectorValues.h"
</span><span class="cx"> #include "RegularExpression.h"
</span><span class="cx"> #include "Yarr.h"
</span><span class="lines">@@ -121,9 +121,9 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::GenericTypes::SearchMatch> buildObjectForSearchMatch(size_t lineNumber, const String& lineContent)
</del><ins>+static PassRefPtr<Inspector::Protocol::GenericTypes::SearchMatch> buildObjectForSearchMatch(size_t lineNumber, const String& lineContent)
</ins><span class="cx"> {
</span><del>- return Inspector::TypeBuilder::GenericTypes::SearchMatch::create()
</del><ins>+ return Inspector::Protocol::GenericTypes::SearchMatch::create()
</ins><span class="cx"> .setLineNumber(lineNumber)
</span><span class="cx"> .setLineContent(lineContent)
</span><span class="cx"> .release();
</span><span class="lines">@@ -154,9 +154,9 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>> result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> result = Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>::create();
</ins><span class="cx">
</span><span class="cx"> JSC::Yarr::RegularExpression regex = ContentSearchUtilities::createSearchRegex(query, caseSensitive, isRegex);
</span><span class="cx"> Vector<std::pair<size_t, String>> matches = getRegularExpressionMatchesByLines(regex, text);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorContentSearchUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorJSTypeBuilders.h"
</del><ins>+#include "InspectorJSProtocolTypes.h"
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/TextPosition.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE JSC::Yarr::RegularExpression createSearchRegex(const String& query, bool caseSensitive, bool isRegex);
</span><span class="cx"> JS_EXPORT_PRIVATE int countRegularExpressionMatches(const JSC::Yarr::RegularExpression&, const String&);
</span><del>-JS_EXPORT_PRIVATE PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex);
</del><ins>+JS_EXPORT_PRIVATE PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex);
</ins><span class="cx"> JS_EXPORT_PRIVATE TextPosition textPositionFromOffset(size_t offset, const Vector<size_t>& lineEndings);
</span><span class="cx"> JS_EXPORT_PRIVATE std::unique_ptr<Vector<size_t>> lineEndings(const String&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #include "ScriptObject.h"
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-using Inspector::TypeBuilder::Array;
</del><ins>+using Inspector::Protocol::Array;
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>* result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown)
</del><ins>+void InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>* result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("evaluate"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(expression);
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> makeEvalCall(errorString, function, result, wasThrown);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>* result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown)
</del><ins>+void InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>* result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("callFunctionOn"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(objectId);
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> makeEvalCall(errorString, function, result, wasThrown);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const Deprecated::ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>* result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown)
</del><ins>+void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const Deprecated::ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>* result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("evaluateOnCallFrame"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(callFrames);
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> makeEvalCall(errorString, function, result, wasThrown);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>* result)
</del><ins>+void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>* result)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getFunctionDetails"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(functionId);
</span><span class="lines">@@ -106,10 +106,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *result = BindingTraits<Inspector::TypeBuilder::Debugger::FunctionDetails>::runtimeCast(resultValue);
</del><ins>+ *result = BindingTraits<Inspector::Protocol::Debugger::FunctionDetails>::runtimeCast(resultValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>>* properties)
</del><ins>+void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>* properties)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getProperties"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(objectId);
</span><span class="lines">@@ -122,10 +122,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *properties = BindingTraits<Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>>::runtimeCast(result);
</del><ins>+ *properties = BindingTraits<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>::runtimeCast(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, RefPtr<Array<Inspector::TypeBuilder::Runtime::InternalPropertyDescriptor>>* properties)
</del><ins>+void InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, RefPtr<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>* properties)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getInternalProperties"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(objectId);
</span><span class="lines">@@ -137,12 +137,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto array = BindingTraits<Array<Inspector::TypeBuilder::Runtime::InternalPropertyDescriptor>>::runtimeCast(result);
</del><ins>+ auto array = BindingTraits<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>::runtimeCast(result);
</ins><span class="cx"> if (array->length() > 0)
</span><span class="cx"> *properties = array;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Array<Inspector::TypeBuilder::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
</del><ins>+PassRefPtr<Array<Inspector::Protocol::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!hasNoValue());
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("wrapCallFrames"), inspectorEnvironment()->functionCallHandler());
</span><span class="lines">@@ -153,12 +153,12 @@
</span><span class="cx"> ASSERT(!hadException);
</span><span class="cx"> RefPtr<InspectorValue> result = callFramesValue.toInspectorValue(scriptState());
</span><span class="cx"> if (result->type() == InspectorValue::Type::Array)
</span><del>- return BindingTraits<Array<Inspector::TypeBuilder::Debugger::CallFrame>>::runtimeCast(result);
</del><ins>+ return BindingTraits<Array<Inspector::Protocol::Debugger::CallFrame>>::runtimeCast(result);
</ins><span class="cx">
</span><del>- return Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
</del><ins>+ return Array<Inspector::Protocol::Debugger::CallFrame>::create();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(const Deprecated::ScriptValue& value, const String& groupName, bool generatePreview) const
</del><ins>+PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> InjectedScript::wrapObject(const Deprecated::ScriptValue& value, const String& groupName, bool generatePreview) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!hasNoValue());
</span><span class="cx"> Deprecated::ScriptFunctionCall wrapFunction(injectedScriptObject(), ASCIILiteral("wrapObject"), inspectorEnvironment()->functionCallHandler());
</span><span class="lines">@@ -173,10 +173,10 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> RefPtr<InspectorObject> rawResult = r.toInspectorValue(scriptState())->asObject();
</span><del>- return BindingTraits<Inspector::TypeBuilder::Runtime::RemoteObject>::runtimeCast(rawResult);
</del><ins>+ return BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(rawResult);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const
</del><ins>+PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> InjectedScript::wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!hasNoValue());
</span><span class="cx"> Deprecated::ScriptFunctionCall wrapFunction(injectedScriptObject(), ASCIILiteral("wrapTable"), inspectorEnvironment()->functionCallHandler());
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> RefPtr<InspectorObject> rawResult = r.toInspectorValue(scriptState())->asObject();
</span><del>- return BindingTraits<Inspector::TypeBuilder::Runtime::RemoteObject>::runtimeCast(rawResult);
</del><ins>+ return BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(rawResult);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue InjectedScript::findObjectById(const String& objectId) const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScript.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScript.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScript.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #include "InjectedScriptBase.h"
</span><del>-#include "InspectorJSTypeBuilders.h"
</del><ins>+#include "InspectorJSProtocolTypes.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -56,16 +56,16 @@
</span><span class="cx"> InjectedScript(Deprecated::ScriptObject, InspectorEnvironment*);
</span><span class="cx"> virtual ~InjectedScript();
</span><span class="cx">
</span><del>- void evaluate(ErrorString*, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown);
- void callFunctionOn(ErrorString*, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown);
- void evaluateOnCallFrame(ErrorString*, const Deprecated::ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown);
- void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<TypeBuilder::Debugger::FunctionDetails>* result);
- void getProperties(ErrorString*, const String& objectId, bool ownProperties, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::PropertyDescriptor>>* result);
- void getInternalProperties(ErrorString*, const String& objectId, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::InternalPropertyDescriptor>>* result);
</del><ins>+ void evaluate(ErrorString*, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
+ void callFunctionOn(ErrorString*, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
+ void evaluateOnCallFrame(ErrorString*, const Deprecated::ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
+ void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Protocol::Debugger::FunctionDetails>* result);
+ void getProperties(ErrorString*, const String& objectId, bool ownProperties, RefPtr<Protocol::Array<Protocol::Runtime::PropertyDescriptor>>* result);
+ void getInternalProperties(ErrorString*, const String& objectId, RefPtr<Protocol::Array<Protocol::Runtime::InternalPropertyDescriptor>>* result);
</ins><span class="cx">
</span><del>- PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>> wrapCallFrames(const Deprecated::ScriptValue&);
- PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapObject(const Deprecated::ScriptValue&, const String& groupName, bool generatePreview = false) const;
- PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const;
</del><ins>+ PassRefPtr<Protocol::Array<Protocol::Debugger::CallFrame>> wrapCallFrames(const Deprecated::ScriptValue&);
+ PassRefPtr<Protocol::Runtime::RemoteObject> wrapObject(const Deprecated::ScriptValue&, const String& groupName, bool generatePreview = false) const;
+ PassRefPtr<Protocol::Runtime::RemoteObject> wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const;
</ins><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue findObjectById(const String& objectId) const;
</span><span class="cx"> void inspectObject(Deprecated::ScriptValue);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> *result = InspectorString::create("Exception while making a call.");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScriptBase::makeEvalCall(ErrorString* errorString, Deprecated::ScriptFunctionCall& function, RefPtr<TypeBuilder::Runtime::RemoteObject>* objectResult, TypeBuilder::OptOutput<bool>* wasThrown)
</del><ins>+void InjectedScriptBase::makeEvalCall(ErrorString* errorString, Deprecated::ScriptFunctionCall& function, RefPtr<Protocol::Runtime::RemoteObject>* objectResult, Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorValue> result;
</span><span class="cx"> makeCall(function, &result);
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *objectResult = BindingTraits<TypeBuilder::Runtime::RemoteObject>::runtimeCast(resultObj);
</del><ins>+ *objectResult = BindingTraits<Protocol::Runtime::RemoteObject>::runtimeCast(resultObj);
</ins><span class="cx"> *wasThrown = wasThrownVal;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #include "InspectorEnvironment.h"
</span><del>-#include "InspectorJSTypeBuilders.h"
</del><ins>+#include "InspectorJSProtocolTypes.h"
</ins><span class="cx"> #include "bindings/ScriptObject.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> const Deprecated::ScriptObject& injectedScriptObject() const;
</span><span class="cx"> Deprecated::ScriptValue callFunctionWithEvalEnabled(Deprecated::ScriptFunctionCall&, bool& hadException) const;
</span><span class="cx"> void makeCall(Deprecated::ScriptFunctionCall&, RefPtr<InspectorValue>* result);
</span><del>- void makeEvalCall(ErrorString*, Deprecated::ScriptFunctionCall&, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown);
</del><ins>+ void makeEvalCall(ErrorString*, Deprecated::ScriptFunctionCall&, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> String m_name;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorProtocolTypeshfromrev172929trunkSourceJavaScriptCoreinspectorInspectorTypeBuilderh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h (from rev 172929, trunk/Source/JavaScriptCore/inspector/InspectorTypeBuilder.h) (0 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -0,0 +1,275 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2011 The Chromium Authors. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef InspectorProtocolTypes_h
+#define InspectorProtocolTypes_h
+
+#if ENABLE(INSPECTOR)
+
+#include "InspectorValues.h"
+#include <wtf/Assertions.h>
+#include <wtf/PassRefPtr.h>
+
+namespace Inspector {
+
+namespace Protocol {
+
+template<typename T>
+class OptOutput {
+public:
+ OptOutput() : m_assigned(false) { }
+
+ void operator=(T value)
+ {
+ m_value = value;
+ m_assigned = true;
+ }
+
+ bool isAssigned() const { return m_assigned; }
+
+ T getValue()
+ {
+ ASSERT(isAssigned());
+ return m_value;
+ }
+
+private:
+ T m_value;
+ bool m_assigned;
+
+ WTF_MAKE_NONCOPYABLE(OptOutput);
+};
+
+// This class provides "Traits" type for the input type T. It is programmed using C++ template specialization
+// technique. By default it simply takes "ItemTraits" type from T, but it doesn't work with the base types.
+template<typename T>
+struct ArrayItemHelper {
+ typedef typename T::ItemTraits Traits;
+};
+
+template<typename T>
+class Array : public InspectorArrayBase {
+private:
+ Array() { }
+
+ InspectorArray* openAccessors()
+ {
+ COMPILE_ASSERT(sizeof(InspectorArray) == sizeof(Array<T>), cannot_cast);
+ return static_cast<InspectorArray*>(static_cast<InspectorArrayBase*>(this));
+ }
+
+public:
+ void addItem(PassRefPtr<T> value)
+ {
+ ArrayItemHelper<T>::Traits::pushRefPtr(this->openAccessors(), value);
+ }
+
+ void addItem(T value)
+ {
+ ArrayItemHelper<T>::Traits::pushRaw(this->openAccessors(), value);
+ }
+
+ static PassRefPtr<Array<T>> create()
+ {
+ return adoptRef(new Array<T>());
+ }
+};
+
+struct StructItemTraits {
+ static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorValue> value)
+ {
+ array->pushValue(value);
+ }
+};
+
+template<>
+struct ArrayItemHelper<String> {
+ struct Traits {
+ static void pushRaw(InspectorArray* array, const String& value)
+ {
+ array->pushString(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<int> {
+ struct Traits {
+ static void pushRaw(InspectorArray* array, int value)
+ {
+ array->pushInt(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<double> {
+ struct Traits {
+ static void pushRaw(InspectorArray* array, double value)
+ {
+ array->pushNumber(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<bool> {
+ struct Traits {
+ static void pushRaw(InspectorArray* array, bool value)
+ {
+ array->pushBoolean(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<InspectorValue> {
+ struct Traits {
+ static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorValue> value)
+ {
+ array->pushValue(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<InspectorObject> {
+ struct Traits {
+ static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorValue> value)
+ {
+ array->pushValue(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<InspectorArray> {
+ struct Traits {
+ static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorArray> value)
+ {
+ array->pushArray(value);
+ }
+ };
+};
+
+template<typename T>
+struct ArrayItemHelper<Protocol::Array<T>> {
+ struct Traits {
+ static void pushRefPtr(InspectorArray* array, PassRefPtr<Protocol::Array<T>> value)
+ {
+ array->pushValue(value);
+ }
+ };
+};
+
+// Helper methods for Protocol and other Inspector types are provided by
+// specializations of BindingTraits<T>. Some are generated for protocol types.
+
+template<typename T>
+struct BindingTraits {
+ typedef T BindingType;
+
+ static InspectorValue::Type typeTag();
+ static PassRefPtr<T> runtimeCast(PassRefPtr<InspectorObject>);
+#if !ASSERT_DISABLED
+ static void assertValueHasExpectedType(InspectorValue*);
+#endif // !ASSERT_DISABLED
+};
+
+template<InspectorValue::Type TYPE>
+struct PrimitiveBindingTraits {
+#if !ASSERT_DISABLED
+ static void assertValueHasExpectedType(InspectorValue* value)
+ {
+ ASSERT(value->type() == TYPE);
+ }
+#endif // !ASSERT_DISABLED
+};
+
+template<typename T>
+struct BindingTraits<Protocol::Array<T>> {
+ static PassRefPtr<Array<T>> runtimeCast(PassRefPtr<InspectorValue> value)
+ {
+ RefPtr<InspectorArray> array;
+ bool castRes = value->asArray(&array);
+ ASSERT_UNUSED(castRes, castRes);
+#if !ASSERT_DISABLED
+ assertValueHasExpectedType(array.get());
+#endif // !ASSERT_DISABLED
+ COMPILE_ASSERT(sizeof(Array<T>) == sizeof(InspectorArray), type_cast_problem);
+ return static_cast<Array<T>*>(static_cast<InspectorArrayBase*>(array.get()));
+ }
+
+#if !ASSERT_DISABLED
+ static void assertValueHasExpectedType(InspectorValue* value)
+ {
+ RefPtr<InspectorArray> array;
+ bool castRes = value->asArray(&array);
+ ASSERT_UNUSED(castRes, castRes);
+ for (unsigned i = 0; i < array->length(); i++)
+ BindingTraits<T>::assertValueHasExpectedType(array->get(i).get());
+ }
+#endif // !ASSERT_DISABLED
+};
+
+template<>
+struct BindingTraits<InspectorValue> {
+#if !ASSERT_DISABLED
+ static void assertValueHasExpectedType(InspectorValue*)
+ {
+ }
+#endif // !ASSERT_DISABLED
+};
+
+template<> struct BindingTraits<InspectorArray> : public PrimitiveBindingTraits<InspectorValue::Type::Array> { };
+template<> struct BindingTraits<InspectorObject> : public PrimitiveBindingTraits<InspectorValue::Type::Object> { };
+template<> struct BindingTraits<String> : public PrimitiveBindingTraits<InspectorValue::Type::String> { };
+template<> struct BindingTraits<bool> : public PrimitiveBindingTraits<InspectorValue::Type::Boolean> { };
+template<> struct BindingTraits<double> : public PrimitiveBindingTraits<InspectorValue::Type::Number> { };
+
+// FIXME: Add an Inspector::Type tag for int so we can remove this special case.
+template<>
+struct BindingTraits<int> {
+#if !ASSERT_DISABLED
+ static void assertValueHasExpectedType(InspectorValue* value)
+ {
+ double v;
+ bool castRes = value->asNumber(&v);
+ ASSERT_UNUSED(castRes, castRes);
+ ASSERT(static_cast<double>(static_cast<int>(v)) == v);
+ }
+#endif // !ASSERT_DISABLED
+};
+
+} // namespace Protocol
+
+using Protocol::BindingTraits;
+
+} // namespace Inspector
+
+#endif // ENABLE(INSPECTOR)
+
+#endif // !defined(InspectorProtocolTypes_h)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorTypeBuilderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/inspector/InspectorTypeBuilder.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorTypeBuilder.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/InspectorTypeBuilder.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -1,275 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All Rights Reserved.
- * Copyright (C) 2011 The Chromium Authors. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef InspectorTypeBuilder_h
-#define InspectorTypeBuilder_h
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorValues.h"
-#include <wtf/Assertions.h>
-#include <wtf/PassRefPtr.h>
-
-namespace Inspector {
-
-namespace TypeBuilder {
-
-template<typename T>
-class OptOutput {
-public:
- OptOutput() : m_assigned(false) { }
-
- void operator=(T value)
- {
- m_value = value;
- m_assigned = true;
- }
-
- bool isAssigned() const { return m_assigned; }
-
- T getValue()
- {
- ASSERT(isAssigned());
- return m_value;
- }
-
-private:
- T m_value;
- bool m_assigned;
-
- WTF_MAKE_NONCOPYABLE(OptOutput);
-};
-
-// This class provides "Traits" type for the input type T. It is programmed using C++ template specialization
-// technique. By default it simply takes "ItemTraits" type from T, but it doesn't work with the base types.
-template<typename T>
-struct ArrayItemHelper {
- typedef typename T::ItemTraits Traits;
-};
-
-template<typename T>
-class Array : public InspectorArrayBase {
-private:
- Array() { }
-
- InspectorArray* openAccessors()
- {
- COMPILE_ASSERT(sizeof(InspectorArray) == sizeof(Array<T>), cannot_cast);
- return static_cast<InspectorArray*>(static_cast<InspectorArrayBase*>(this));
- }
-
-public:
- void addItem(PassRefPtr<T> value)
- {
- ArrayItemHelper<T>::Traits::pushRefPtr(this->openAccessors(), value);
- }
-
- void addItem(T value)
- {
- ArrayItemHelper<T>::Traits::pushRaw(this->openAccessors(), value);
- }
-
- static PassRefPtr<Array<T>> create()
- {
- return adoptRef(new Array<T>());
- }
-};
-
-struct StructItemTraits {
- static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorValue> value)
- {
- array->pushValue(value);
- }
-};
-
-template<>
-struct ArrayItemHelper<String> {
- struct Traits {
- static void pushRaw(InspectorArray* array, const String& value)
- {
- array->pushString(value);
- }
- };
-};
-
-template<>
-struct ArrayItemHelper<int> {
- struct Traits {
- static void pushRaw(InspectorArray* array, int value)
- {
- array->pushInt(value);
- }
- };
-};
-
-template<>
-struct ArrayItemHelper<double> {
- struct Traits {
- static void pushRaw(InspectorArray* array, double value)
- {
- array->pushNumber(value);
- }
- };
-};
-
-template<>
-struct ArrayItemHelper<bool> {
- struct Traits {
- static void pushRaw(InspectorArray* array, bool value)
- {
- array->pushBoolean(value);
- }
- };
-};
-
-template<>
-struct ArrayItemHelper<InspectorValue> {
- struct Traits {
- static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorValue> value)
- {
- array->pushValue(value);
- }
- };
-};
-
-template<>
-struct ArrayItemHelper<InspectorObject> {
- struct Traits {
- static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorValue> value)
- {
- array->pushValue(value);
- }
- };
-};
-
-template<>
-struct ArrayItemHelper<InspectorArray> {
- struct Traits {
- static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorArray> value)
- {
- array->pushArray(value);
- }
- };
-};
-
-template<typename T>
-struct ArrayItemHelper<TypeBuilder::Array<T>> {
- struct Traits {
- static void pushRefPtr(InspectorArray* array, PassRefPtr<TypeBuilder::Array<T>> value)
- {
- array->pushValue(value);
- }
- };
-};
-
-// Helper methods for TypeBuilder and other Inspector types are provided by
-// specializations of BindingTraits<T>. Some are generated for protocol types.
-
-template<typename T>
-struct BindingTraits {
- typedef T BindingType;
-
- static InspectorValue::Type typeTag();
- static PassRefPtr<T> runtimeCast(PassRefPtr<InspectorObject>);
-#if !ASSERT_DISABLED
- static void assertValueHasExpectedType(InspectorValue*);
-#endif // !ASSERT_DISABLED
-};
-
-template<InspectorValue::Type TYPE>
-struct PrimitiveBindingTraits {
-#if !ASSERT_DISABLED
- static void assertValueHasExpectedType(InspectorValue* value)
- {
- ASSERT(value->type() == TYPE);
- }
-#endif // !ASSERT_DISABLED
-};
-
-template<typename T>
-struct BindingTraits<TypeBuilder::Array<T>> {
- static PassRefPtr<Array<T>> runtimeCast(PassRefPtr<InspectorValue> value)
- {
- RefPtr<InspectorArray> array;
- bool castRes = value->asArray(&array);
- ASSERT_UNUSED(castRes, castRes);
-#if !ASSERT_DISABLED
- assertValueHasExpectedType(array.get());
-#endif // !ASSERT_DISABLED
- COMPILE_ASSERT(sizeof(Array<T>) == sizeof(InspectorArray), type_cast_problem);
- return static_cast<Array<T>*>(static_cast<InspectorArrayBase*>(array.get()));
- }
-
-#if !ASSERT_DISABLED
- static void assertValueHasExpectedType(InspectorValue* value)
- {
- RefPtr<InspectorArray> array;
- bool castRes = value->asArray(&array);
- ASSERT_UNUSED(castRes, castRes);
- for (unsigned i = 0; i < array->length(); i++)
- BindingTraits<T>::assertValueHasExpectedType(array->get(i).get());
- }
-#endif // !ASSERT_DISABLED
-};
-
-template<>
-struct BindingTraits<InspectorValue> {
-#if !ASSERT_DISABLED
- static void assertValueHasExpectedType(InspectorValue*)
- {
- }
-#endif // !ASSERT_DISABLED
-};
-
-template<> struct BindingTraits<InspectorArray> : public PrimitiveBindingTraits<InspectorValue::Type::Array> { };
-template<> struct BindingTraits<InspectorObject> : public PrimitiveBindingTraits<InspectorValue::Type::Object> { };
-template<> struct BindingTraits<String> : public PrimitiveBindingTraits<InspectorValue::Type::String> { };
-template<> struct BindingTraits<bool> : public PrimitiveBindingTraits<InspectorValue::Type::Boolean> { };
-template<> struct BindingTraits<double> : public PrimitiveBindingTraits<InspectorValue::Type::Number> { };
-
-// FIXME: Add an Inspector::Type tag for int so we can remove this special case.
-template<>
-struct BindingTraits<int> {
-#if !ASSERT_DISABLED
- static void assertValueHasExpectedType(InspectorValue* value)
- {
- double v;
- bool castRes = value->asNumber(&v);
- ASSERT_UNUSED(castRes, castRes);
- ASSERT(static_cast<double>(static_cast<int>(v)) == v);
- }
-#endif // !ASSERT_DISABLED
-};
-
-} // namespace TypeBuilder
-
-using TypeBuilder::BindingTraits;
-
-} // namespace Inspector
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(InspectorTypeBuilder_h)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -58,9 +58,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-PassRefPtr<Inspector::TypeBuilder::Console::CallFrame> ScriptCallFrame::buildInspectorObject() const
</del><ins>+PassRefPtr<Inspector::Protocol::Console::CallFrame> ScriptCallFrame::buildInspectorObject() const
</ins><span class="cx"> {
</span><del>- return Inspector::TypeBuilder::Console::CallFrame::create()
</del><ins>+ return Inspector::Protocol::Console::CallFrame::create()
</ins><span class="cx"> .setFunctionName(m_functionName)
</span><span class="cx"> .setUrl(m_scriptName)
</span><span class="cx"> .setLineNumber(m_lineNumber)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#include "InspectorJSTypeBuilders.h"
</del><ins>+#include "InspectorJSProtocolTypes.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> bool isEqual(const ScriptCallFrame&) const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- PassRefPtr<Inspector::TypeBuilder::Console::CallFrame> buildInspectorObject() const;
</del><ins>+ PassRefPtr<Inspector::Protocol::Console::CallFrame> buildInspectorObject() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -107,9 +107,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> ScriptCallStack::buildInspectorArray() const
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> ScriptCallStack::buildInspectorArray() const
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> frames = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> frames = Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>::create();
</ins><span class="cx"> for (size_t i = 0; i < m_frames.size(); i++)
</span><span class="cx"> frames->addItem(m_frames.at(i).buildInspectorObject());
</span><span class="cx"> return frames;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-#include "InspectorJSTypeBuilders.h"
</del><ins>+#include "InspectorJSProtocolTypes.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> bool isEqual(ScriptCallStack*) const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> buildInspectorArray() const;
</del><ins>+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> buildInspectorArray() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints)
</del><ins>+void InspectorAgent::inspect(PassRefPtr<Protocol::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints)
</ins><span class="cx"> {
</span><span class="cx"> if (m_enabled && m_frontendDispatcher) {
</span><span class="cx"> m_frontendDispatcher->inspect(objectToInspect, hints);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -60,14 +60,14 @@
</span><span class="cx"> virtual void enable(ErrorString*) override;
</span><span class="cx"> virtual void disable(ErrorString*) override;
</span><span class="cx">
</span><del>- void inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
</del><ins>+ void inspect(PassRefPtr<Protocol::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
</ins><span class="cx"> void evaluateForTestInFrontend(const String& script);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> std::unique_ptr<InspectorInspectorFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<InspectorInspectorBackendDispatcher> m_backendDispatcher;
</span><span class="cx"> Vector<String> m_pendingEvaluateTestCommands;
</span><del>- std::pair<RefPtr<TypeBuilder::Runtime::RemoteObject>, RefPtr<InspectorObject>> m_pendingInspectData;
</del><ins>+ std::pair<RefPtr<Protocol::Runtime::RemoteObject>, RefPtr<InspectorObject>> m_pendingInspectData;
</ins><span class="cx"> bool m_enabled;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -175,19 +175,19 @@
</span><span class="cx">
</span><span class="cx"> static bool breakpointActionTypeForString(const String& typeString, ScriptBreakpointActionType* output)
</span><span class="cx"> {
</span><del>- if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Log)) {
</del><ins>+ if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Log)) {
</ins><span class="cx"> *output = ScriptBreakpointActionTypeLog;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Evaluate)) {
</del><ins>+ if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Evaluate)) {
</ins><span class="cx"> *output = ScriptBreakpointActionTypeEvaluate;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Sound)) {
</del><ins>+ if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Sound)) {
</ins><span class="cx"> *output = ScriptBreakpointActionTypeSound;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Probe)) {
</del><ins>+ if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Probe)) {
</ins><span class="cx"> *output = ScriptBreakpointActionTypeProbe;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -239,9 +239,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const RefPtr<InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>>& locations)
</del><ins>+void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const RefPtr<InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations)
</ins><span class="cx"> {
</span><del>- locations = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>::create();
</del><ins>+ locations = Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>::create();
</ins><span class="cx"> if (!optionalURL == !optionalURLRegex) {
</span><span class="cx"> *errorString = ASCIILiteral("Either url or urlRegex must be specified.");
</span><span class="cx"> return;
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> if (!matches(scriptURL, url, isRegex))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Debugger::Location> location = resolveBreakpoint(breakpointIdentifier, it->key, breakpoint);
</del><ins>+ RefPtr<Inspector::Protocol::Debugger::Location> location = resolveBreakpoint(breakpointIdentifier, it->key, breakpoint);
</ins><span class="cx"> if (location)
</span><span class="cx"> locations->addItem(location);
</span><span class="cx"> }
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, const RefPtr<InspectorObject>& location, const RefPtr<InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::TypeBuilder::Debugger::Location>& actualLocation)
</del><ins>+void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, const RefPtr<InspectorObject>& location, const RefPtr<InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation)
</ins><span class="cx"> {
</span><span class="cx"> JSC::SourceID sourceID;
</span><span class="cx"> unsigned lineNumber;
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> resume(errorString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID sourceID, const ScriptBreakpoint& breakpoint)
</del><ins>+PassRefPtr<Inspector::Protocol::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID sourceID, const ScriptBreakpoint& breakpoint)
</ins><span class="cx"> {
</span><span class="cx"> ScriptsMap::iterator scriptIterator = m_scripts.find(sourceID);
</span><span class="cx"> if (scriptIterator == m_scripts.end())
</span><span class="lines">@@ -388,14 +388,14 @@
</span><span class="cx"> debugServerBreakpointIDsIterator = m_breakpointIdentifierToDebugServerBreakpointIDs.set(breakpointIdentifier, Vector<JSC::BreakpointID>()).iterator;
</span><span class="cx"> debugServerBreakpointIDsIterator->value.append(debugServerBreakpointID);
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Debugger::Location> location = Inspector::TypeBuilder::Debugger::Location::create()
</del><ins>+ RefPtr<Inspector::Protocol::Debugger::Location> location = Inspector::Protocol::Debugger::Location::create()
</ins><span class="cx"> .setScriptId(String::number(sourceID))
</span><span class="cx"> .setLineNumber(actualLineNumber);
</span><span class="cx"> location->setColumnNumber(actualColumnNumber);
</span><span class="cx"> return location;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::searchInContent(ErrorString* error, const String& scriptIDStr, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>& results)
</del><ins>+void InspectorDebuggerAgent::searchInContent(ErrorString* error, const String& scriptIDStr, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>& results)
</ins><span class="cx"> {
</span><span class="cx"> bool isRegex = optionalIsRegex ? *optionalIsRegex : false;
</span><span class="cx"> bool caseSensitive = optionalCaseSensitive ? *optionalCaseSensitive : false;
</span><span class="lines">@@ -418,7 +418,7 @@
</span><span class="cx"> *error = "No script for id: " + scriptIDStr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>& details)
</del><ins>+void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>& details)
</ins><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(functionId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> *errorString = ASCIILiteral("Internal error. Could not change pause on exceptions state");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString* errorString, const String& callFrameId, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown)
</del><ins>+void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString* errorString, const String& callFrameId, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(callFrameId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="lines">@@ -553,15 +553,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>> InspectorDebuggerAgent::currentCallFrames()
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> InspectorDebuggerAgent::currentCallFrames()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_pausedScriptState)
</span><del>- return Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
</del><ins>+ return Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>::create();
</ins><span class="cx">
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(m_pausedScriptState);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
</del><ins>+ return Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>::create();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return injectedScript.wrapCallFrames(m_currentCallStack);
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Debugger::Location> location = resolveBreakpoint(it->key, sourceID, breakpoint);
</del><ins>+ RefPtr<Inspector::Protocol::Debugger::Location> location = resolveBreakpoint(it->key, sourceID, breakpoint);
</ins><span class="cx"> if (location)
</span><span class="cx"> m_frontendDispatcher->breakpointResolved(it->key, location);
</span><span class="cx"> }
</span><span class="lines">@@ -660,8 +660,8 @@
</span><span class="cx"> int sampleId = m_nextProbeSampleId++;
</span><span class="cx">
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
</span><del>- RefPtr<TypeBuilder::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(action));
- RefPtr<TypeBuilder::Debugger::ProbeSample> result = TypeBuilder::Debugger::ProbeSample::create()
</del><ins>+ RefPtr<Protocol::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(action));
+ RefPtr<Protocol::Debugger::ProbeSample> result = Protocol::Debugger::ProbeSample::create()
</ins><span class="cx"> .setProbeId(action.identifier)
</span><span class="cx"> .setSampleId(sampleId)
</span><span class="cx"> .setBatchId(hitCount)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -71,20 +71,20 @@
</span><span class="cx"> virtual void enable(ErrorString*) override;
</span><span class="cx"> virtual void disable(ErrorString*) override;
</span><span class="cx"> virtual void setBreakpointsActive(ErrorString*, bool active) override;
</span><del>- virtual void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const RefPtr<Inspector::InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>>& locations) override;
- virtual void setBreakpoint(ErrorString*, const RefPtr<Inspector::InspectorObject>& location, const RefPtr<Inspector::InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId*, RefPtr<Inspector::TypeBuilder::Debugger::Location>& actualLocation) override;
</del><ins>+ virtual void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const RefPtr<Inspector::InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations) override;
+ virtual void setBreakpoint(ErrorString*, const RefPtr<Inspector::InspectorObject>& location, const RefPtr<Inspector::InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation) override;
</ins><span class="cx"> virtual void removeBreakpoint(ErrorString*, const String& breakpointIdentifier) override;
</span><span class="cx"> virtual void continueToLocation(ErrorString*, const RefPtr<InspectorObject>& location) override;
</span><del>- virtual void searchInContent(ErrorString*, const String& scriptID, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>&) override;
</del><ins>+ virtual void searchInContent(ErrorString*, const String& scriptID, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) override;
</ins><span class="cx"> virtual void getScriptSource(ErrorString*, const String& scriptID, String* scriptSource) override;
</span><del>- virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>&) override;
</del><ins>+ virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>&) override;
</ins><span class="cx"> virtual void pause(ErrorString*) override;
</span><span class="cx"> virtual void resume(ErrorString*) override;
</span><span class="cx"> virtual void stepOver(ErrorString*) override;
</span><span class="cx"> virtual void stepInto(ErrorString*) override;
</span><span class="cx"> virtual void stepOut(ErrorString*) override;
</span><span class="cx"> virtual void setPauseOnExceptions(ErrorString*, const String& pauseState) override;
</span><del>- virtual void evaluateOnCallFrame(ErrorString*, const String& callFrameId, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown) override;
</del><ins>+ virtual void evaluateOnCallFrame(ErrorString*, const String& callFrameId, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override;
</ins><span class="cx"> virtual void setOverlayMessage(ErrorString*, const String*) override;
</span><span class="cx">
</span><span class="cx"> bool isPaused();
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> void didClearGlobalObject();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>> currentCallFrames();
</del><ins>+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> currentCallFrames();
</ins><span class="cx">
</span><span class="cx"> virtual void didParseSource(JSC::SourceID, const Script&) override final;
</span><span class="cx"> virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) override final;
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> virtual void breakpointActionSound(int breakpointActionIdentifier) override;
</span><span class="cx"> virtual void breakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, int hitCount, const Deprecated::ScriptValue& sample) override final;
</span><span class="cx">
</span><del>- PassRefPtr<Inspector::TypeBuilder::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
</del><ins>+ PassRefPtr<Inspector::Protocol::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
</ins><span class="cx"> bool assertPaused(ErrorString*);
</span><span class="cx"> void clearDebuggerBreakpointState();
</span><span class="cx"> void clearInspectorBreakpointState();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -84,10 +84,10 @@
</span><span class="cx"> m_frontendDispatcher->addProfileHeader(createProfileHeader(*profile));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TypeBuilder::Profiler::ProfileHeader> InspectorProfilerAgent::createProfileHeader(const JSC::Profile& profile)
</del><ins>+PassRefPtr<Protocol::Profiler::ProfileHeader> InspectorProfilerAgent::createProfileHeader(const JSC::Profile& profile)
</ins><span class="cx"> {
</span><del>- return TypeBuilder::Profiler::ProfileHeader::create()
- .setTypeId(TypeBuilder::Profiler::ProfileHeader::TypeId::CPU)
</del><ins>+ return Protocol::Profiler::ProfileHeader::create()
+ .setTypeId(Protocol::Profiler::ProfileHeader::TypeId::CPU)
</ins><span class="cx"> .setUid(profile.uid())
</span><span class="cx"> .setTitle(profile.title())
</span><span class="cx"> .release();
</span><span class="lines">@@ -131,30 +131,30 @@
</span><span class="cx"> return makeString(UserInitiatedProfileName, '.', String::number(m_nextUserInitiatedProfileNumber++));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorProfilerAgent::getProfileHeaders(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::ProfileHeader>>& headers)
</del><ins>+void InspectorProfilerAgent::getProfileHeaders(ErrorString*, RefPtr<Protocol::Array<Protocol::Profiler::ProfileHeader>>& headers)
</ins><span class="cx"> {
</span><span class="cx"> m_profileHeadersRequested = true;
</span><del>- headers = TypeBuilder::Array<TypeBuilder::Profiler::ProfileHeader>::create();
</del><ins>+ headers = Protocol::Array<Protocol::Profiler::ProfileHeader>::create();
</ins><span class="cx">
</span><span class="cx"> for (auto& profile : m_profiles.values())
</span><span class="cx"> headers->addItem(createProfileHeader(*profile.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<TypeBuilder::Profiler::CPUProfileNodeCall> buildInspectorObject(const JSC::ProfileNode::Call& call)
</del><ins>+static PassRefPtr<Protocol::Profiler::CPUProfileNodeCall> buildInspectorObject(const JSC::ProfileNode::Call& call)
</ins><span class="cx"> {
</span><del>- RefPtr<TypeBuilder::Profiler::CPUProfileNodeCall> result = TypeBuilder::Profiler::CPUProfileNodeCall::create()
</del><ins>+ RefPtr<Protocol::Profiler::CPUProfileNodeCall> result = Protocol::Profiler::CPUProfileNodeCall::create()
</ins><span class="cx"> .setStartTime(call.startTime())
</span><span class="cx"> .setTotalTime(call.totalTime());
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
</del><ins>+static PassRefPtr<Protocol::Profiler::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
</ins><span class="cx"> {
</span><del>- RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNodeCall>> calls = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNodeCall>::create();
</del><ins>+ RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNodeCall>> calls = Protocol::Array<Protocol::Profiler::CPUProfileNodeCall>::create();
</ins><span class="cx"> for (const JSC::ProfileNode::Call& call : node->calls())
</span><span class="cx"> calls->addItem(buildInspectorObject(call));
</span><span class="cx">
</span><del>- RefPtr<TypeBuilder::Profiler::CPUProfileNode> result = TypeBuilder::Profiler::CPUProfileNode::create()
</del><ins>+ RefPtr<Protocol::Profiler::CPUProfileNode> result = Protocol::Profiler::CPUProfileNode::create()
</ins><span class="cx"> .setId(node->id())
</span><span class="cx"> .setCalls(calls.release());
</span><span class="cx">
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!node->children().isEmpty()) {
</span><del>- RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>> children = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>::create();
</del><ins>+ RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNode>> children = Protocol::Array<Protocol::Profiler::CPUProfileNode>::create();
</ins><span class="cx"> for (RefPtr<JSC::ProfileNode> profileNode : node->children())
</span><span class="cx"> children->addItem(buildInspectorObject(profileNode.get()));
</span><span class="cx"> result->setChildren(children);
</span><span class="lines">@@ -177,13 +177,13 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TypeBuilder::Profiler::CPUProfile> InspectorProfilerAgent::buildProfileInspectorObject(const JSC::Profile* profile)
</del><ins>+PassRefPtr<Protocol::Profiler::CPUProfile> InspectorProfilerAgent::buildProfileInspectorObject(const JSC::Profile* profile)
</ins><span class="cx"> {
</span><del>- RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>> rootNodes = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>::create();
</del><ins>+ RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNode>> rootNodes = Protocol::Array<Protocol::Profiler::CPUProfileNode>::create();
</ins><span class="cx"> for (RefPtr<JSC::ProfileNode> profileNode : profile->head()->children())
</span><span class="cx"> rootNodes->addItem(buildInspectorObject(profileNode.get()));
</span><span class="cx">
</span><del>- RefPtr<TypeBuilder::Profiler::CPUProfile> result = TypeBuilder::Profiler::CPUProfile::create()
</del><ins>+ RefPtr<Protocol::Profiler::CPUProfile> result = Protocol::Profiler::CPUProfile::create()
</ins><span class="cx"> .setRootNodes(rootNodes);
</span><span class="cx">
</span><span class="cx"> if (profile->idleTime())
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorProfilerAgent::getCPUProfile(ErrorString* errorString, int rawUid, RefPtr<TypeBuilder::Profiler::CPUProfile>& profileObject)
</del><ins>+void InspectorProfilerAgent::getCPUProfile(ErrorString* errorString, int rawUid, RefPtr<Protocol::Profiler::CPUProfile>& profileObject)
</ins><span class="cx"> {
</span><span class="cx"> unsigned uid = static_cast<unsigned>(rawUid);
</span><span class="cx"> auto it = m_profiles.find(uid);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorProfilerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -68,11 +68,11 @@
</span><span class="cx">
</span><span class="cx"> virtual void clearProfiles(ErrorString*) override final { reset(); }
</span><span class="cx">
</span><del>- virtual void getProfileHeaders(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::ProfileHeader>>&) override final;
- virtual void getCPUProfile(ErrorString*, int uid, RefPtr<TypeBuilder::Profiler::CPUProfile>&) override final;
</del><ins>+ virtual void getProfileHeaders(ErrorString*, RefPtr<Protocol::Array<Protocol::Profiler::ProfileHeader>>&) override final;
+ virtual void getCPUProfile(ErrorString*, int uid, RefPtr<Protocol::Profiler::CPUProfile>&) override final;
</ins><span class="cx"> virtual void removeProfile(ErrorString*, const String& type, int uid) override final;
</span><span class="cx">
</span><del>- static PassRefPtr<TypeBuilder::Profiler::CPUProfile> buildProfileInspectorObject(const JSC::Profile*);
</del><ins>+ static PassRefPtr<Protocol::Profiler::CPUProfile> buildProfileInspectorObject(const JSC::Profile*);
</ins><span class="cx">
</span><span class="cx"> enum ShouldRecompile { SkipRecompile, Recompile };
</span><span class="cx">
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> String getUserInitiatedProfileName();
</span><span class="cx">
</span><del>- PassRefPtr<TypeBuilder::Profiler::ProfileHeader> createProfileHeader(const JSC::Profile&);
</del><ins>+ PassRefPtr<Protocol::Profiler::ProfileHeader> createProfileHeader(const JSC::Profile&);
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<InspectorProfilerFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<InspectorProfilerBackendDispatcher> m_backendDispatcher;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -80,15 +80,15 @@
</span><span class="cx"> return presentState;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::Runtime::ErrorRange> buildErrorRangeObject(const JSTokenLocation& tokenLocation)
</del><ins>+static PassRefPtr<Inspector::Protocol::Runtime::ErrorRange> buildErrorRangeObject(const JSTokenLocation& tokenLocation)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Runtime::ErrorRange> result = Inspector::TypeBuilder::Runtime::ErrorRange::create()
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::ErrorRange> result = Inspector::Protocol::Runtime::ErrorRange::create()
</ins><span class="cx"> .setStartOffset(tokenLocation.startOffset)
</span><span class="cx"> .setEndOffset(tokenLocation.endOffset);
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::parse(ErrorString*, const String& expression, Inspector::TypeBuilder::Runtime::SyntaxErrorType* result, Inspector::TypeBuilder::OptOutput<String>* message, RefPtr<Inspector::TypeBuilder::Runtime::ErrorRange>& range)
</del><ins>+void InspectorRuntimeAgent::parse(ErrorString*, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>& range)
</ins><span class="cx"> {
</span><span class="cx"> VM& vm = globalVM();
</span><span class="cx"> JSLockHolder lock(vm);
</span><span class="lines">@@ -98,16 +98,16 @@
</span><span class="cx">
</span><span class="cx"> switch (error.m_syntaxErrorType) {
</span><span class="cx"> case ParserError::SyntaxErrorNone:
</span><del>- *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::None;
</del><ins>+ *result = Inspector::Protocol::Runtime::SyntaxErrorType::None;
</ins><span class="cx"> break;
</span><span class="cx"> case ParserError::SyntaxErrorIrrecoverable:
</span><del>- *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::Irrecoverable;
</del><ins>+ *result = Inspector::Protocol::Runtime::SyntaxErrorType::Irrecoverable;
</ins><span class="cx"> break;
</span><span class="cx"> case ParserError::SyntaxErrorUnterminatedLiteral:
</span><del>- *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::UnterminatedLiteral;
</del><ins>+ *result = Inspector::Protocol::Runtime::SyntaxErrorType::UnterminatedLiteral;
</ins><span class="cx"> break;
</span><span class="cx"> case ParserError::SyntaxErrorRecoverable:
</span><del>- *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::Recoverable;
</del><ins>+ *result = Inspector::Protocol::Runtime::SyntaxErrorType::Recoverable;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::evaluate(ErrorString* errorString, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown)
</del><ins>+void InspectorRuntimeAgent::evaluate(ErrorString* errorString, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = injectedScriptForEval(errorString, executionContextId);
</span><span class="cx"> if (injectedScript.hasNoValue())
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const RefPtr<InspectorArray>* const optionalArguments, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown)
</del><ins>+void InspectorRuntimeAgent::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const RefPtr<InspectorArray>* const optionalArguments, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::getProperties(ErrorString* errorString, const String& objectId, const bool* const ownProperties, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::InternalPropertyDescriptor>>& internalProperties)
</del><ins>+void InspectorRuntimeAgent::getProperties(ErrorString* errorString, const String& objectId, const bool* const ownProperties, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties)
</ins><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="lines">@@ -197,11 +197,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets(ErrorString* errorString, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::TypeDescription>>& typeDescriptions)
</del><ins>+void InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets(ErrorString* errorString, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>& typeDescriptions)
</ins><span class="cx"> {
</span><span class="cx"> static const bool verbose = false;
</span><span class="cx"> VM& vm = globalVM();
</span><del>- typeDescriptions = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::TypeDescription>::create();
</del><ins>+ typeDescriptions = Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>::create();
</ins><span class="cx"> if (!vm.typeProfiler()) {
</span><span class="cx"> *errorString = ASCIILiteral("The VM does not currently have Type Information.");
</span><span class="cx"> return;
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> location->getString(ASCIILiteral("sourceID"), &sourceIDAsString);
</span><span class="cx"> location->getNumber(ASCIILiteral("divot"), &divot);
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Runtime::TypeDescription> typeDescription = Inspector::TypeBuilder::Runtime::TypeDescription::create();
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::TypeDescription> typeDescription = Inspector::Protocol::Runtime::TypeDescription::create();
</ins><span class="cx"> bool okay;
</span><span class="cx"> vm.typeProfiler()->getTypesForVariableAtOffsetForInspector(static_cast<TypeProfilerSearchDescriptor>(descriptor), divot, sourceIDAsString.toIntPtrStrict(&okay), typeDescription);
</span><span class="cx"> typeDescriptions->addItem(typeDescription);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -61,14 +61,14 @@
</span><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><del>- virtual void parse(ErrorString*, const String& expression, Inspector::TypeBuilder::Runtime::SyntaxErrorType* result, Inspector::TypeBuilder::OptOutput<String>* message, RefPtr<Inspector::TypeBuilder::Runtime::ErrorRange>&) override final;
- virtual void evaluate(ErrorString*, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown) override final;
- virtual void callFunctionOn(ErrorString*, const String& objectId, const String& expression, const RefPtr<Inspector::InspectorArray>* optionalArguments, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown) override final;
</del><ins>+ virtual void parse(ErrorString*, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>&) override final;
+ virtual void evaluate(ErrorString*, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override final;
+ virtual void callFunctionOn(ErrorString*, const String& objectId, const String& expression, const RefPtr<Inspector::InspectorArray>* optionalArguments, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override final;
</ins><span class="cx"> virtual void releaseObject(ErrorString*, const ErrorString& objectId) override final;
</span><del>- virtual void getProperties(ErrorString*, const String& objectId, const bool* ownProperties, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::InternalPropertyDescriptor>>& internalProperties) override final;
</del><ins>+ virtual void getProperties(ErrorString*, const String& objectId, const bool* ownProperties, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) override final;
</ins><span class="cx"> virtual void releaseObjectGroup(ErrorString*, const String& objectGroup) override final;
</span><span class="cx"> virtual void run(ErrorString*) override;
</span><del>- virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString*, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::TypeDescription>>&) override;
</del><ins>+ virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString*, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
</ins><span class="cx"> virtual void enableTypeProfiler(ErrorString*) override;
</span><span class="cx"> virtual void disableTypeProfiler(ErrorString*) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegen__init__py"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -8,5 +8,5 @@
</span><span class="cx"> from generate_backend_dispatcher_implementation import *
</span><span class="cx"> from generate_frontend_dispatcher_header import *
</span><span class="cx"> from generate_frontend_dispatcher_implementation import *
</span><del>-from generate_type_builder_header import *
-from generate_type_builder_implementation import *
</del><ins>+from generate_protocol_types_header import *
+from generate_protocol_types_implementation import *
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_backend_dispatcher_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = [
</span><del>- '"Inspector%sTypeBuilders.h"' % self.model().framework.setting('prefix'),
</del><ins>+ '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
</ins><span class="cx"> '<inspector/InspectorBackendDispatcher.h>',
</span><span class="cx"> '<wtf/PassRefPtr.h>',
</span><span class="cx"> '<wtf/text/WTFString.h>']
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_backend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> out_parameter_assignments.append(' if (%(parameterName)s)' % param_args)
</span><span class="cx"> out_parameter_assignments.append(' jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), %(parameterName)s);' % param_args)
</span><span class="cx"> elif parameter.type.is_enum():
</span><del>- out_parameter_assignments.append(' jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::TypeBuilder::get%(frameworkPrefix)sEnumConstantValue(%(parameterName)s));' % param_args)
</del><ins>+ out_parameter_assignments.append(' jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(%(parameterName)s));' % param_args)
</ins><span class="cx"> else:
</span><span class="cx"> out_parameter_assignments.append(' jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), %(parameterName)s);' % param_args)
</span><span class="cx">
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> out_parameter_assignments.append(' if (out_%(parameterName)s)' % param_args)
</span><span class="cx"> out_parameter_assignments.append(' result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), out_%(parameterName)s);' % param_args)
</span><span class="cx"> elif parameter.type.is_enum():
</span><del>- out_parameter_assignments.append(' result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::TypeBuilder::get%(frameworkPrefix)sEnumConstantValue(out_%(parameterName)s));' % param_args)
</del><ins>+ out_parameter_assignments.append(' result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(out_%(parameterName)s));' % param_args)
</ins><span class="cx"> else:
</span><span class="cx"> out_parameter_assignments.append(' result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), out_%(parameterName)s);' % param_args)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_frontend_dispatcher_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_header.py (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_header.py 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_header.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = [
</span><del>- '"Inspector%sTypeBuilders.h"' % self.model().framework.setting('prefix'),
</del><ins>+ '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
</ins><span class="cx"> '<inspector/InspectorFrontendChannel.h>',
</span><span class="cx"> '<inspector/InspectorValues.h>',
</span><span class="cx"> '<wtf/PassRefPtr.h>',
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_frontend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> parameter_value = '*' + parameter_value
</span><span class="cx"> if parameter.type.is_enum():
</span><span class="cx"> framework_prefix = self.model().framework.setting('prefix')
</span><del>- parameter_value = 'Inspector::TypeBuilder::get%sEnumConstantValue(%s)' % (framework_prefix, parameter_value)
</del><ins>+ parameter_value = 'Inspector::Protocol::get%sEnumConstantValue(%s)' % (framework_prefix, parameter_value)
</ins><span class="cx">
</span><span class="cx"> parameter_args = {
</span><span class="cx"> 'parameterType': Generator.type_string_for_stack_out_parameter(parameter),
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_protocol_types_headerpyfromrev172929trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_type_builder_headerpy"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_header.py (from rev 172929, trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_header.py) (0 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_header.py (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_header.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -0,0 +1,346 @@
</span><ins>+#!/usr/bin/env python
+#
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+# Copyright (c) 2014 University of Washington. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+
+
+import logging
+import re
+import string
+from string import Template
+
+from generator import Generator, ucfirst
+from generator_templates import GeneratorTemplates as Templates
+from models import EnumType, ObjectType, PrimitiveType, AliasedType, ArrayType, Frameworks
+
+log = logging.getLogger('global')
+
+
+class ProtocolTypesHeaderGenerator(Generator):
+ def __init__(self, model, input_filepath):
+ Generator.__init__(self, model, input_filepath)
+
+ def output_filename(self):
+ return "Inspector%sProtocolTypes.h" % self.model().framework.setting('prefix')
+
+ def generate_output(self):
+ domains = self.domains_to_generate()
+ self.calculate_types_requiring_shape_assertions(domains)
+
+ headers = set([
+ '<inspector/InspectorProtocolTypes.h>',
+ '<wtf/Assertions.h>',
+ '<wtf/PassRefPtr.h>'
+ ])
+
+ if self.model().framework is not Frameworks.JavaScriptCore:
+ headers.add('<inspector/InspectorJSProtocolTypes.h>')
+
+ export_macro = self.model().framework.setting('export_macro', None)
+ framework_prefix = self.model().framework.setting('prefix')
+
+ header_args = {
+ 'headerGuardString': re.sub('\W+', '_', self.output_filename()),
+ 'includes': '\n'.join(['#include ' + header for header in sorted(headers)]),
+ 'typedefs': '',
+ 'inputFilename': self._input_filepath
+ }
+
+ return_type = 'String'
+ return_type_with_export_macro = [return_type]
+ if export_macro is not None:
+ return_type_with_export_macro[:0] = [export_macro]
+
+ sections = []
+ sections.append(self.generate_license())
+ sections.append(Template(Templates.CppHeaderPrelude).substitute(None, **header_args))
+ sections.append('namespace Protocol {')
+ sections.append(self._generate_forward_declarations(domains))
+ sections.append(self._generate_typedefs(domains))
+ sections.append('%s get%sEnumConstantValue(int code);' % (' '.join(return_type_with_export_macro), framework_prefix))
+ sections.append('\n'.join([
+ 'template<typename T> %s get%sEnumConstantValue(T enumValue)' % (return_type, framework_prefix),
+ '{',
+ ' return get%sEnumConstantValue(static_cast<int>(enumValue));' % framework_prefix,
+ '}']))
+
+ builder_sections = map(self._generate_builders_for_domain, domains)
+ sections.extend(filter(lambda section: len(section) > 0, builder_sections))
+ sections.append(self._generate_forward_declarations_for_binding_traits())
+ sections.append('} // namespace Protocol')
+ sections.append(Template(Templates.CppHeaderPostlude).substitute(None, **header_args))
+ return "\n\n".join(sections)
+
+ # Private methods.
+
+ # FIXME: move builders out of classes, uncomment forward declaration
+
+ def _generate_forward_declarations(self, domains):
+ sections = []
+
+ for domain in domains:
+ declaration_types = [decl.type for decl in domain.type_declarations]
+ object_types = filter(lambda _type: isinstance(_type, ObjectType), declaration_types)
+ enum_types = filter(lambda _type: isinstance(_type, EnumType), declaration_types)
+ if len(object_types) + len(enum_types) == 0:
+ continue
+
+ domain_lines = []
+ domain_lines.append('namespace %s {' % domain.domain_name)
+
+ object_type_names = [_type.raw_name() for _type in object_types]
+ enum_type_names = [_type.raw_name() for _type in enum_types]
+
+ # Forward-declare all classes so the type builders won't break if rearranged.
+ domain_lines.extend('class %s;' % name for name in sorted(object_type_names))
+ domain_lines.extend('enum class %s;' % name for name in sorted(enum_type_names))
+ domain_lines.append('} // %s' % domain.domain_name)
+ sections.append(Generator.wrap_with_guard_for_domain(domain, '\n'.join(domain_lines)))
+
+ if len(sections) == 0:
+ return ''
+ else:
+ return """// Forward declarations.
+%s
+// End of forward declarations.
+""" % '\n\n'.join(sections)
+
+ def _generate_typedefs(self, domains):
+ sections = map(self._generate_typedefs_for_domain, domains)
+ sections = filter(lambda text: len(text) > 0, sections)
+
+ if len(sections) == 0:
+ return ''
+ else:
+ return """// Typedefs.
+%s
+// End of typedefs.""" % '\n\n'.join(sections)
+
+ def _generate_typedefs_for_domain(self, domain):
+ primitive_declarations = filter(lambda decl: isinstance(decl.type, AliasedType), domain.type_declarations)
+ if len(primitive_declarations) == 0:
+ return ''
+
+ sections = []
+ for declaration in primitive_declarations:
+ primitive_name = Generator.cpp_name_for_primitive_type(declaration.type.aliased_type)
+ typedef_lines = []
+ if len(declaration.description) > 0:
+ typedef_lines.append('/* %s */' % declaration.description)
+ typedef_lines.append('typedef %s %s;' % (primitive_name, declaration.type_name))
+ sections.append('\n'.join(typedef_lines))
+
+ lines = []
+ lines.append('namespace %s {' % domain.domain_name)
+ lines.append('\n\n'.join(sections))
+ lines.append('} // %s' % domain.domain_name)
+ return Generator.wrap_with_guard_for_domain(domain, '\n'.join(lines))
+
+ def _generate_builders_for_domain(self, domain):
+ sections = []
+
+ for type_declaration in domain.type_declarations:
+ if isinstance(type_declaration.type, EnumType):
+ sections.append(self._generate_struct_for_enum_declaration(type_declaration))
+ elif isinstance(type_declaration.type, ObjectType):
+ sections.append(self._generate_class_for_object_declaration(type_declaration, domain))
+
+ sections = filter(lambda section: len(section) > 0, sections)
+ if len(sections) == 0:
+ return ''
+
+ lines = []
+ lines.append('namespace %s {' % domain.domain_name)
+ lines.append('\n'.join(sections))
+ lines.append('} // %s' % domain.domain_name)
+ return Generator.wrap_with_guard_for_domain(domain, '\n'.join(lines))
+
+ def _generate_class_for_object_declaration(self, type_declaration, domain):
+ if len(type_declaration.type_members) == 0:
+ return ''
+
+ enum_members = filter(lambda member: isinstance(member.type, EnumType) and member.type.is_anonymous, type_declaration.type_members)
+ required_members = filter(lambda member: not member.is_optional, type_declaration.type_members)
+ optional_members = filter(lambda member: member.is_optional, type_declaration.type_members)
+ object_name = type_declaration.type_name
+
+ lines = []
+ if len(type_declaration.description) > 0:
+ lines.append('/* %s */' % type_declaration.description)
+ base_class = 'Inspector::InspectorObject'
+ if not Generator.type_has_open_fields(type_declaration.type):
+ base_class = base_class + 'Base'
+ lines.append('class %s : public %s {' % (object_name, base_class))
+ lines.append('public:')
+ for enum_member in enum_members:
+ lines.append(' // Named after property name \'%s\' while generating %s.' % (enum_member.member_name, object_name))
+ lines.append(self._generate_struct_for_anonymous_enum_member(enum_member))
+ lines.append(self._generate_builder_state_enum(type_declaration))
+
+ constructor_example = []
+ constructor_example.append(' * RefPtr<%s> result = %s::create()' % (object_name, object_name))
+ for member in required_members:
+ constructor_example.append(' * .set%s(...)' % ucfirst(member.member_name))
+
+ builder_args = {
+ 'objectType': object_name,
+ 'constructorExample': '\n'.join(constructor_example) + ';',
+ }
+
+ lines.append(Template(Templates.ProtocolObjectBuilderDeclarationPrelude).substitute(None, **builder_args))
+ for type_member in required_members:
+ lines.append(self._generate_builder_setter_for_member(type_member, domain))
+ lines.append(Template(Templates.ProtocolObjectBuilderDeclarationPostlude).substitute(None, **builder_args))
+ for member in optional_members:
+ lines.append(self._generate_unchecked_setter_for_member(member, domain))
+
+ if Generator.type_has_open_fields(type_declaration.type):
+ lines.append('')
+ lines.append(' // Property names for type generated as open.')
+ for type_member in type_declaration.type_members:
+ lines.append(' static const char* %s;' % ucfirst(type_member.member_name))
+
+ lines.append('};')
+ lines.append('')
+ return '\n'.join(lines)
+
+ def _generate_struct_for_enum_declaration(self, enum_declaration):
+ lines = []
+ lines.append('/* %s */' % enum_declaration.description)
+ lines.extend(self._generate_struct_for_enum_type(enum_declaration.type_name, enum_declaration.type))
+ return '\n'.join(lines)
+
+ def _generate_struct_for_anonymous_enum_member(self, enum_member):
+ def apply_indentation(line):
+ if line.startswith(('#', '/*', '*/', '//')) or len(line) is 0:
+ return line
+ else:
+ return ' ' + line
+
+ indented_lines = map(apply_indentation, self._generate_struct_for_enum_type(enum_member.member_name, enum_member.type))
+ return '\n'.join(indented_lines)
+
+ def _generate_struct_for_enum_type(self, enum_name, enum_type):
+ lines = []
+ enum_name = ucfirst(enum_name)
+ lines.append('enum class %s {' % enum_name)
+ for enum_value in enum_type.enum_values():
+ lines.append(' %s = %s,' % (Generator.stylized_name_for_enum_value(enum_value), self.encoding_for_enum_value(enum_value)))
+ lines.append('}; // enum class %s' % enum_name)
+ return lines # The caller may want to adjust indentation, so don't join these lines.
+
+ def _generate_builder_state_enum(self, type_declaration):
+ lines = []
+ required_members = filter(lambda member: not member.is_optional, type_declaration.type_members)
+ enum_values = []
+
+ lines.append(' enum {')
+ lines.append(' NoFieldsSet = 0,')
+ for i in range(len(required_members)):
+ enum_value = "%sSet" % ucfirst(required_members[i].member_name)
+ enum_values.append(enum_value)
+ lines.append(' %s = 1 << %d,' % (enum_value, i))
+ if len(enum_values) > 0:
+ lines.append(' AllFieldsSet = (%s)' % ' | '.join(enum_values))
+ else:
+ lines.append(' AllFieldsSet = 0')
+ lines.append(' };')
+ lines.append('')
+ return '\n'.join(lines)
+
+ def _generate_builder_setter_for_member(self, type_member, domain):
+ setter_args = {
+ 'camelName': ucfirst(type_member.member_name),
+ 'frameworkPrefix': self.model().framework.setting('prefix'),
+ 'keyedSet': Generator.keyed_set_method_for_type(type_member.type),
+ 'name': type_member.member_name,
+ 'parameterType': Generator.type_string_for_type_member(type_member)
+ }
+
+ lines = []
+ lines.append('')
+ lines.append(' Builder<STATE | %(camelName)sSet>& set%(camelName)s(%(parameterType)s value)' % setter_args)
+ lines.append(' {')
+ lines.append(' COMPILE_ASSERT(!(STATE & %(camelName)sSet), property_%(name)s_already_set);' % setter_args)
+
+ if isinstance(type_member.type, EnumType):
+ lines.append(' m_result->%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(static_cast<int>(value)));' % setter_args)
+ else:
+ lines.append(' m_result->%(keyedSet)s(ASCIILiteral("%(name)s"), value);' % setter_args)
+ lines.append(' return castState<%(camelName)sSet>();' % setter_args)
+ lines.append(' }')
+ return '\n'.join(lines)
+
+ def _generate_unchecked_setter_for_member(self, type_member, domain):
+ setter_args = {
+ 'camelName': ucfirst(type_member.member_name),
+ 'frameworkPrefix': self.model().framework.setting('prefix'),
+ 'keyedSet': Generator.keyed_set_method_for_type(type_member.type),
+ 'name': type_member.member_name,
+ 'parameterType': Generator.type_string_for_type_member(type_member)
+ }
+
+ lines = []
+ lines.append('')
+ lines.append(' void set%(camelName)s(%(parameterType)s value)' % setter_args)
+ lines.append(' {')
+ if isinstance(type_member.type, EnumType):
+ lines.append(' InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(static_cast<int>(value)));' % setter_args)
+ else:
+ lines.append(' InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), value);' % setter_args)
+ lines.append(' }')
+ return '\n'.join(lines)
+
+ def _generate_forward_declarations_for_binding_traits(self):
+ # A list of (builder_type, needs_runtime_cast)
+ type_arguments = []
+
+ for domain in self.domains_to_generate():
+ declarations_to_generate = filter(lambda decl: self.type_needs_shape_assertions(decl.type), domain.type_declarations)
+
+ for type_declaration in declarations_to_generate:
+ for type_member in type_declaration.type_members:
+ if isinstance(type_member.type, EnumType):
+ type_arguments.append((Generator.protocol_type_string_for_type_member(type_member, type_declaration), False))
+
+ if isinstance(type_declaration.type, ObjectType):
+ type_arguments.append((Generator.protocol_type_string_for_type(type_declaration.type), Generator.type_needs_runtime_casts(type_declaration.type)))
+
+ struct_keywords = ['struct']
+ function_keywords = ['static void']
+ export_macro = self.model().framework.setting('export_macro', None)
+ if export_macro is not None:
+ struct_keywords.append(export_macro)
+ #function_keywords[1:1] = [export_macro]
+
+ lines = []
+ for argument in type_arguments:
+ lines.append('template<> %s BindingTraits<%s> {' % (' '.join(struct_keywords), argument[0]))
+ if argument[1]:
+ lines.append('static PassRefPtr<%s> runtimeCast(PassRefPtr<Inspector::InspectorValue> value);' % argument[0])
+ lines.append('#if !ASSERT_DISABLED')
+ lines.append('%s assertValueHasExpectedType(Inspector::InspectorValue*);' % ' '.join(function_keywords))
+ lines.append('#endif // !ASSERT_DISABLED')
+ lines.append('};')
+ return '\n'.join(lines)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_protocol_types_implementationpyfromrev172929trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_type_builder_implementationpy"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py (from rev 172929, trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_implementation.py) (0 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -0,0 +1,184 @@
</span><ins>+#!/usr/bin/env python
+#
+# Copyright (c) 2014 Apple Inc. All rights reserved.
+# Copyright (c) 2014 University of Washington. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+
+
+import logging
+import string
+from string import Template
+
+from generator import Generator, ucfirst
+from generator_templates import GeneratorTemplates as Templates
+from models import AliasedType, ArrayType, EnumType, ObjectType
+
+log = logging.getLogger('global')
+
+
+class ProtocolTypesImplementationGenerator(Generator):
+ def __init__(self, model, input_filepath):
+ Generator.__init__(self, model, input_filepath)
+
+ def output_filename(self):
+ return "Inspector%sProtocolTypes.cpp" % self.model().framework.setting('prefix')
+
+ def generate_output(self):
+ domains = self.domains_to_generate()
+ self.calculate_types_requiring_shape_assertions(domains)
+
+ secondary_headers = ['<wtf/text/CString.h>']
+
+ header_args = {
+ 'primaryInclude': '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
+ 'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),
+ 'inputFilename': self._input_filepath
+ }
+
+ sections = []
+ sections.append(self.generate_license())
+ sections.append(Template(Templates.CppImplementationPrelude).substitute(None, **header_args))
+ sections.append('namespace Protocol {')
+ sections.append(self._generate_enum_mapping())
+ sections.append(self._generate_open_field_names())
+ builder_sections = map(self._generate_builders_for_domain, domains)
+ sections.extend(filter(lambda section: len(section) > 0, builder_sections))
+ sections.append('} // namespace Protocol')
+ sections.append(Template(Templates.CppImplementationPostlude).substitute(None, **header_args))
+
+ return "\n\n".join(sections)
+
+ # Private methods.
+
+ def _generate_enum_mapping(self):
+ framework_prefix = self.model().framework.setting('prefix')
+ lines = []
+
+ lines.append('static const char* const enum_constant_values[] = {')
+ lines.extend([' "%s",' % enum_value for enum_value in self.assigned_enum_values()])
+ lines.append('};')
+ lines.append('')
+ lines.append('String get%sEnumConstantValue(int code) {' % framework_prefix)
+ lines.append(' return enum_constant_values[code];')
+ lines.append('}')
+
+ return '\n'.join(lines)
+
+ def _generate_open_field_names(self):
+ lines = []
+ for domain in self.domains_to_generate():
+ for type_declaration in filter(lambda decl: Generator.type_has_open_fields(decl.type), domain.type_declarations):
+ for type_member in sorted(type_declaration.type_members, key=lambda member: member.member_name):
+ field_name = '::'.join(['Inspector', 'Protocol', domain.domain_name, ucfirst(type_declaration.type_name), ucfirst(type_member.member_name)])
+ lines.append('const char* %s = "%s";' % (field_name, type_member.member_name))
+
+ return '\n'.join(lines)
+
+ def _generate_builders_for_domain(self, domain):
+ sections = []
+ declarations_to_generate = filter(lambda decl: self.type_needs_shape_assertions(decl.type), domain.type_declarations)
+
+ for type_declaration in declarations_to_generate:
+ for type_member in type_declaration.type_members:
+ if isinstance(type_member.type, EnumType):
+ sections.append(self._generate_assertion_for_enum(type_member, type_declaration))
+
+ if isinstance(type_declaration.type, ObjectType):
+ sections.append(self._generate_assertion_for_object_declaration(type_declaration))
+ if Generator.type_needs_runtime_casts(type_declaration.type):
+ sections.append(self._generate_runtime_cast_for_object_declaration(type_declaration))
+
+ return '\n\n'.join(sections)
+
+ def _generate_runtime_cast_for_object_declaration(self, object_declaration):
+ args = {
+ 'objectType': Generator.protocol_type_string_for_type(object_declaration.type)
+ }
+ return Template(Templates.ProtocolObjectRuntimeCast).substitute(None, **args)
+
+ def _generate_assertion_for_object_declaration(self, object_declaration):
+ required_members = filter(lambda member: not member.is_optional, object_declaration.type_members)
+ optional_members = filter(lambda member: member.is_optional, object_declaration.type_members)
+ should_count_properties = not Generator.type_has_open_fields(object_declaration.type)
+ lines = []
+
+ lines.append('#if !ASSERT_DISABLED')
+ lines.append('void BindingTraits<%s>::assertValueHasExpectedType(Inspector::InspectorValue* value)' % (Generator.protocol_type_string_for_type(object_declaration.type)))
+ lines.append("""{
+ RefPtr<InspectorObject> object;
+ bool castRes = value->asObject(&object);
+ ASSERT_UNUSED(castRes, castRes);""")
+ for type_member in required_members:
+ args = {
+ 'memberName': type_member.member_name,
+ 'assertMethod': Generator.assertion_method_for_type_member(type_member, object_declaration)
+ }
+
+ lines.append(""" {
+ InspectorObject::iterator %(memberName)sPos = object->find(ASCIILiteral("%(memberName)s"));
+ ASSERT(%(memberName)sPos != object->end());
+ %(assertMethod)s(%(memberName)sPos->value.get());
+ }""" % args)
+
+ if should_count_properties:
+ lines.append('')
+ lines.append(' int foundPropertiesCount = %s;' % len(required_members))
+
+ for type_member in optional_members:
+ args = {
+ 'memberName': type_member.member_name,
+ 'assertMethod': Generator.assertion_method_for_type_member(type_member, object_declaration)
+ }
+
+ lines.append(""" {
+ InspectorObject::iterator %(memberName)sPos = object->find(ASCIILiteral("%(memberName)s"));
+ if (%(memberName)sPos != object->end()) {
+ %(assertMethod)s(%(memberName)sPos->value.get());""" % args)
+
+ if should_count_properties:
+ lines.append(' ++foundPropertiesCount;')
+ lines.append(' }')
+ lines.append(' }')
+
+ if should_count_properties:
+ lines.append(' if (foundPropertiesCount != object->size())')
+ lines.append(' FATAL("Unexpected properties in object: %s\\n", object->toJSONString().ascii().data());')
+ lines.append('}')
+ lines.append('#endif // !ASSERT_DISABLED')
+ return '\n'.join(lines)
+
+ def _generate_assertion_for_enum(self, enum_member, object_declaration):
+ lines = []
+ lines.append('#if !ASSERT_DISABLED')
+ lines.append('void %s(Inspector::InspectorValue* value)' % Generator.assertion_method_for_type_member(enum_member, object_declaration))
+ lines.append('{')
+ lines.append(' String s;')
+ lines.append(' bool cast_res = value->asString(&s);')
+ lines.append(' ASSERT(cast_res);')
+
+ assert_condition = ' || '.join(['s == "%s"' % enum_value for enum_value in enum_member.type.enum_values()])
+ lines.append(' ASSERT(%s);' % assert_condition)
+ lines.append('}')
+ lines.append('#endif // !ASSERT_DISABLED')
+
+ return '\n'.join(lines)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_type_builder_headerpy"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_header.py (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_header.py 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_header.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -1,346 +0,0 @@
</span><del>-#!/usr/bin/env python
-#
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-# Copyright (c) 2014 University of Washington. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-
-import logging
-import re
-import string
-from string import Template
-
-from generator import Generator, ucfirst
-from generator_templates import GeneratorTemplates as Templates
-from models import EnumType, ObjectType, PrimitiveType, AliasedType, ArrayType, Frameworks
-
-log = logging.getLogger('global')
-
-
-class TypeBuilderHeaderGenerator(Generator):
- def __init__(self, model, input_filepath):
- Generator.__init__(self, model, input_filepath)
-
- def output_filename(self):
- return "Inspector%sTypeBuilders.h" % self.model().framework.setting('prefix')
-
- def generate_output(self):
- domains = self.domains_to_generate()
- self.calculate_types_requiring_shape_assertions(domains)
-
- headers = set([
- '<inspector/InspectorTypeBuilder.h>',
- '<wtf/Assertions.h>',
- '<wtf/PassRefPtr.h>'
- ])
-
- if self.model().framework is not Frameworks.JavaScriptCore:
- headers.add('<inspector/InspectorJSTypeBuilders.h>')
-
- export_macro = self.model().framework.setting('export_macro', None)
- framework_prefix = self.model().framework.setting('prefix')
-
- header_args = {
- 'headerGuardString': re.sub('\W+', '_', self.output_filename()),
- 'includes': '\n'.join(['#include ' + header for header in sorted(headers)]),
- 'typedefs': '',
- 'inputFilename': self._input_filepath
- }
-
- return_type = 'String'
- return_type_with_export_macro = [return_type]
- if export_macro is not None:
- return_type_with_export_macro[:0] = [export_macro]
-
- sections = []
- sections.append(self.generate_license())
- sections.append(Template(Templates.CppHeaderPrelude).substitute(None, **header_args))
- sections.append('namespace TypeBuilder {')
- sections.append(self._generate_forward_declarations(domains))
- sections.append(self._generate_typedefs(domains))
- sections.append('%s get%sEnumConstantValue(int code);' % (' '.join(return_type_with_export_macro), framework_prefix))
- sections.append('\n'.join([
- 'template<typename T> %s get%sEnumConstantValue(T enumValue)' % (return_type, framework_prefix),
- '{',
- ' return get%sEnumConstantValue(static_cast<int>(enumValue));' % framework_prefix,
- '}']))
-
- builder_sections = map(self._generate_builders_for_domain, domains)
- sections.extend(filter(lambda section: len(section) > 0, builder_sections))
- sections.append(self._generate_forward_declarations_for_binding_traits())
- sections.append('} // namespace TypeBuilder')
- sections.append(Template(Templates.CppHeaderPostlude).substitute(None, **header_args))
- return "\n\n".join(sections)
-
- # Private methods.
-
- # FIXME: move builders out of classes, uncomment forward declaration
-
- def _generate_forward_declarations(self, domains):
- sections = []
-
- for domain in domains:
- declaration_types = [decl.type for decl in domain.type_declarations]
- object_types = filter(lambda _type: isinstance(_type, ObjectType), declaration_types)
- enum_types = filter(lambda _type: isinstance(_type, EnumType), declaration_types)
- if len(object_types) + len(enum_types) == 0:
- continue
-
- domain_lines = []
- domain_lines.append('namespace %s {' % domain.domain_name)
-
- object_type_names = [_type.raw_name() for _type in object_types]
- enum_type_names = [_type.raw_name() for _type in enum_types]
-
- # Forward-declare all classes so the type builders won't break if rearranged.
- domain_lines.extend('class %s;' % name for name in sorted(object_type_names))
- domain_lines.extend('enum class %s;' % name for name in sorted(enum_type_names))
- domain_lines.append('} // %s' % domain.domain_name)
- sections.append(Generator.wrap_with_guard_for_domain(domain, '\n'.join(domain_lines)))
-
- if len(sections) == 0:
- return ''
- else:
- return """// Forward declarations.
-%s
-// End of forward declarations.
-""" % '\n\n'.join(sections)
-
- def _generate_typedefs(self, domains):
- sections = map(self._generate_typedefs_for_domain, domains)
- sections = filter(lambda text: len(text) > 0, sections)
-
- if len(sections) == 0:
- return ''
- else:
- return """// Typedefs.
-%s
-// End of typedefs.""" % '\n\n'.join(sections)
-
- def _generate_typedefs_for_domain(self, domain):
- primitive_declarations = filter(lambda decl: isinstance(decl.type, AliasedType), domain.type_declarations)
- if len(primitive_declarations) == 0:
- return ''
-
- sections = []
- for declaration in primitive_declarations:
- primitive_name = Generator.cpp_name_for_primitive_type(declaration.type.aliased_type)
- typedef_lines = []
- if len(declaration.description) > 0:
- typedef_lines.append('/* %s */' % declaration.description)
- typedef_lines.append('typedef %s %s;' % (primitive_name, declaration.type_name))
- sections.append('\n'.join(typedef_lines))
-
- lines = []
- lines.append('namespace %s {' % domain.domain_name)
- lines.append('\n\n'.join(sections))
- lines.append('} // %s' % domain.domain_name)
- return Generator.wrap_with_guard_for_domain(domain, '\n'.join(lines))
-
- def _generate_builders_for_domain(self, domain):
- sections = []
-
- for type_declaration in domain.type_declarations:
- if isinstance(type_declaration.type, EnumType):
- sections.append(self._generate_struct_for_enum_declaration(type_declaration))
- elif isinstance(type_declaration.type, ObjectType):
- sections.append(self._generate_class_for_object_declaration(type_declaration, domain))
-
- sections = filter(lambda section: len(section) > 0, sections)
- if len(sections) == 0:
- return ''
-
- lines = []
- lines.append('namespace %s {' % domain.domain_name)
- lines.append('\n'.join(sections))
- lines.append('} // %s' % domain.domain_name)
- return Generator.wrap_with_guard_for_domain(domain, '\n'.join(lines))
-
- def _generate_class_for_object_declaration(self, type_declaration, domain):
- if len(type_declaration.type_members) == 0:
- return ''
-
- enum_members = filter(lambda member: isinstance(member.type, EnumType) and member.type.is_anonymous, type_declaration.type_members)
- required_members = filter(lambda member: not member.is_optional, type_declaration.type_members)
- optional_members = filter(lambda member: member.is_optional, type_declaration.type_members)
- object_name = type_declaration.type_name
-
- lines = []
- if len(type_declaration.description) > 0:
- lines.append('/* %s */' % type_declaration.description)
- base_class = 'Inspector::InspectorObject'
- if not Generator.type_has_open_fields(type_declaration.type):
- base_class = base_class + 'Base'
- lines.append('class %s : public %s {' % (object_name, base_class))
- lines.append('public:')
- for enum_member in enum_members:
- lines.append(' // Named after property name \'%s\' while generating %s.' % (enum_member.member_name, object_name))
- lines.append(self._generate_struct_for_anonymous_enum_member(enum_member))
- lines.append(self._generate_builder_state_enum(type_declaration))
-
- constructor_example = []
- constructor_example.append(' * RefPtr<%s> result = %s::create()' % (object_name, object_name))
- for member in required_members:
- constructor_example.append(' * .set%s(...)' % ucfirst(member.member_name))
-
- builder_args = {
- 'objectType': object_name,
- 'constructorExample': '\n'.join(constructor_example) + ';',
- }
-
- lines.append(Template(Templates.TypeBuilderDeclarationPrelude).substitute(None, **builder_args))
- for type_member in required_members:
- lines.append(self._generate_builder_setter_for_member(type_member, domain))
- lines.append(Template(Templates.TypeBuilderDeclarationPostlude).substitute(None, **builder_args))
- for member in optional_members:
- lines.append(self._generate_unchecked_setter_for_member(member, domain))
-
- if Generator.type_has_open_fields(type_declaration.type):
- lines.append('')
- lines.append(' // Property names for type generated as open.')
- for type_member in type_declaration.type_members:
- lines.append(' static const char* %s;' % ucfirst(type_member.member_name))
-
- lines.append('};')
- lines.append('')
- return '\n'.join(lines)
-
- def _generate_struct_for_enum_declaration(self, enum_declaration):
- lines = []
- lines.append('/* %s */' % enum_declaration.description)
- lines.extend(self._generate_struct_for_enum_type(enum_declaration.type_name, enum_declaration.type))
- return '\n'.join(lines)
-
- def _generate_struct_for_anonymous_enum_member(self, enum_member):
- def apply_indentation(line):
- if line.startswith(('#', '/*', '*/', '//')) or len(line) is 0:
- return line
- else:
- return ' ' + line
-
- indented_lines = map(apply_indentation, self._generate_struct_for_enum_type(enum_member.member_name, enum_member.type))
- return '\n'.join(indented_lines)
-
- def _generate_struct_for_enum_type(self, enum_name, enum_type):
- lines = []
- enum_name = ucfirst(enum_name)
- lines.append('enum class %s {' % enum_name)
- for enum_value in enum_type.enum_values():
- lines.append(' %s = %s,' % (Generator.stylized_name_for_enum_value(enum_value), self.encoding_for_enum_value(enum_value)))
- lines.append('}; // enum class %s' % enum_name)
- return lines # The caller may want to adjust indentation, so don't join these lines.
-
- def _generate_builder_state_enum(self, type_declaration):
- lines = []
- required_members = filter(lambda member: not member.is_optional, type_declaration.type_members)
- enum_values = []
-
- lines.append(' enum {')
- lines.append(' NoFieldsSet = 0,')
- for i in range(len(required_members)):
- enum_value = "%sSet" % ucfirst(required_members[i].member_name)
- enum_values.append(enum_value)
- lines.append(' %s = 1 << %d,' % (enum_value, i))
- if len(enum_values) > 0:
- lines.append(' AllFieldsSet = (%s)' % ' | '.join(enum_values))
- else:
- lines.append(' AllFieldsSet = 0')
- lines.append(' };')
- lines.append('')
- return '\n'.join(lines)
-
- def _generate_builder_setter_for_member(self, type_member, domain):
- setter_args = {
- 'camelName': ucfirst(type_member.member_name),
- 'frameworkPrefix': self.model().framework.setting('prefix'),
- 'keyedSet': Generator.keyed_set_method_for_type(type_member.type),
- 'name': type_member.member_name,
- 'parameterType': Generator.type_string_for_type_member(type_member)
- }
-
- lines = []
- lines.append('')
- lines.append(' Builder<STATE | %(camelName)sSet>& set%(camelName)s(%(parameterType)s value)' % setter_args)
- lines.append(' {')
- lines.append(' COMPILE_ASSERT(!(STATE & %(camelName)sSet), property_%(name)s_already_set);' % setter_args)
-
- if isinstance(type_member.type, EnumType):
- lines.append(' m_result->%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::TypeBuilder::get%(frameworkPrefix)sEnumConstantValue(static_cast<int>(value)));' % setter_args)
- else:
- lines.append(' m_result->%(keyedSet)s(ASCIILiteral("%(name)s"), value);' % setter_args)
- lines.append(' return castState<%(camelName)sSet>();' % setter_args)
- lines.append(' }')
- return '\n'.join(lines)
-
- def _generate_unchecked_setter_for_member(self, type_member, domain):
- setter_args = {
- 'camelName': ucfirst(type_member.member_name),
- 'frameworkPrefix': self.model().framework.setting('prefix'),
- 'keyedSet': Generator.keyed_set_method_for_type(type_member.type),
- 'name': type_member.member_name,
- 'parameterType': Generator.type_string_for_type_member(type_member)
- }
-
- lines = []
- lines.append('')
- lines.append(' void set%(camelName)s(%(parameterType)s value)' % setter_args)
- lines.append(' {')
- if isinstance(type_member.type, EnumType):
- lines.append(' InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::TypeBuilder::get%(frameworkPrefix)sEnumConstantValue(static_cast<int>(value)));' % setter_args)
- else:
- lines.append(' InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), value);' % setter_args)
- lines.append(' }')
- return '\n'.join(lines)
-
- def _generate_forward_declarations_for_binding_traits(self):
- # A list of (builder_type, needs_runtime_cast)
- type_arguments = []
-
- for domain in self.domains_to_generate():
- declarations_to_generate = filter(lambda decl: self.type_needs_shape_assertions(decl.type), domain.type_declarations)
-
- for type_declaration in declarations_to_generate:
- for type_member in type_declaration.type_members:
- if isinstance(type_member.type, EnumType):
- type_arguments.append((Generator.type_builder_string_for_type_member(type_member, type_declaration), False))
-
- if isinstance(type_declaration.type, ObjectType):
- type_arguments.append((Generator.type_builder_string_for_type(type_declaration.type), Generator.type_needs_runtime_casts(type_declaration.type)))
-
- struct_keywords = ['struct']
- function_keywords = ['static void']
- export_macro = self.model().framework.setting('export_macro', None)
- if export_macro is not None:
- struct_keywords.append(export_macro)
- #function_keywords[1:1] = [export_macro]
-
- lines = []
- for argument in type_arguments:
- lines.append('template<> %s BindingTraits<%s> {' % (' '.join(struct_keywords), argument[0]))
- if argument[1]:
- lines.append('static PassRefPtr<%s> runtimeCast(PassRefPtr<Inspector::InspectorValue> value);' % argument[0])
- lines.append('#if !ASSERT_DISABLED')
- lines.append('%s assertValueHasExpectedType(Inspector::InspectorValue*);' % ' '.join(function_keywords))
- lines.append('#endif // !ASSERT_DISABLED')
- lines.append('};')
- return '\n'.join(lines)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_type_builder_implementationpy"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_implementation.py (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_implementation.py 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_implementation.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -1,184 +0,0 @@
</span><del>-#!/usr/bin/env python
-#
-# Copyright (c) 2014 Apple Inc. All rights reserved.
-# Copyright (c) 2014 University of Washington. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-
-import logging
-import string
-from string import Template
-
-from generator import Generator, ucfirst
-from generator_templates import GeneratorTemplates as Templates
-from models import AliasedType, ArrayType, EnumType, ObjectType
-
-log = logging.getLogger('global')
-
-
-class TypeBuilderImplementationGenerator(Generator):
- def __init__(self, model, input_filepath):
- Generator.__init__(self, model, input_filepath)
-
- def output_filename(self):
- return "Inspector%sTypeBuilders.cpp" % self.model().framework.setting('prefix')
-
- def generate_output(self):
- domains = self.domains_to_generate()
- self.calculate_types_requiring_shape_assertions(domains)
-
- secondary_headers = ['<wtf/text/CString.h>']
-
- header_args = {
- 'primaryInclude': '"Inspector%sTypeBuilders.h"' % self.model().framework.setting('prefix'),
- 'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),
- 'inputFilename': self._input_filepath
- }
-
- sections = []
- sections.append(self.generate_license())
- sections.append(Template(Templates.CppImplementationPrelude).substitute(None, **header_args))
- sections.append('namespace TypeBuilder {')
- sections.append(self._generate_enum_mapping())
- sections.append(self._generate_open_field_names())
- builder_sections = map(self._generate_builders_for_domain, domains)
- sections.extend(filter(lambda section: len(section) > 0, builder_sections))
- sections.append('} // namespace TypeBuilder')
- sections.append(Template(Templates.CppImplementationPostlude).substitute(None, **header_args))
-
- return "\n\n".join(sections)
-
- # Private methods.
-
- def _generate_enum_mapping(self):
- framework_prefix = self.model().framework.setting('prefix')
- lines = []
-
- lines.append('static const char* const enum_constant_values[] = {')
- lines.extend([' "%s",' % enum_value for enum_value in self.assigned_enum_values()])
- lines.append('};')
- lines.append('')
- lines.append('String get%sEnumConstantValue(int code) {' % framework_prefix)
- lines.append(' return enum_constant_values[code];')
- lines.append('}')
-
- return '\n'.join(lines)
-
- def _generate_open_field_names(self):
- lines = []
- for domain in self.domains_to_generate():
- for type_declaration in filter(lambda decl: Generator.type_has_open_fields(decl.type), domain.type_declarations):
- for type_member in sorted(type_declaration.type_members, key=lambda member: member.member_name):
- field_name = '::'.join(['Inspector', 'TypeBuilder', domain.domain_name, ucfirst(type_declaration.type_name), ucfirst(type_member.member_name)])
- lines.append('const char* %s = "%s";' % (field_name, type_member.member_name))
-
- return '\n'.join(lines)
-
- def _generate_builders_for_domain(self, domain):
- sections = []
- declarations_to_generate = filter(lambda decl: self.type_needs_shape_assertions(decl.type), domain.type_declarations)
-
- for type_declaration in declarations_to_generate:
- for type_member in type_declaration.type_members:
- if isinstance(type_member.type, EnumType):
- sections.append(self._generate_assertion_for_enum(type_member, type_declaration))
-
- if isinstance(type_declaration.type, ObjectType):
- sections.append(self._generate_assertion_for_object_declaration(type_declaration))
- if Generator.type_needs_runtime_casts(type_declaration.type):
- sections.append(self._generate_runtime_cast_for_object_declaration(type_declaration))
-
- return '\n\n'.join(sections)
-
- def _generate_runtime_cast_for_object_declaration(self, object_declaration):
- args = {
- 'objectType': Generator.type_builder_string_for_type(object_declaration.type)
- }
- return Template(Templates.TypeBuilderObjectRuntimeCast).substitute(None, **args)
-
- def _generate_assertion_for_object_declaration(self, object_declaration):
- required_members = filter(lambda member: not member.is_optional, object_declaration.type_members)
- optional_members = filter(lambda member: member.is_optional, object_declaration.type_members)
- should_count_properties = not Generator.type_has_open_fields(object_declaration.type)
- lines = []
-
- lines.append('#if !ASSERT_DISABLED')
- lines.append('void BindingTraits<%s>::assertValueHasExpectedType(Inspector::InspectorValue* value)' % (Generator.type_builder_string_for_type(object_declaration.type)))
- lines.append("""{
- RefPtr<InspectorObject> object;
- bool castRes = value->asObject(&object);
- ASSERT_UNUSED(castRes, castRes);""")
- for type_member in required_members:
- args = {
- 'memberName': type_member.member_name,
- 'assertMethod': Generator.assertion_method_for_type_member(type_member, object_declaration)
- }
-
- lines.append(""" {
- InspectorObject::iterator %(memberName)sPos = object->find(ASCIILiteral("%(memberName)s"));
- ASSERT(%(memberName)sPos != object->end());
- %(assertMethod)s(%(memberName)sPos->value.get());
- }""" % args)
-
- if should_count_properties:
- lines.append('')
- lines.append(' int foundPropertiesCount = %s;' % len(required_members))
-
- for type_member in optional_members:
- args = {
- 'memberName': type_member.member_name,
- 'assertMethod': Generator.assertion_method_for_type_member(type_member, object_declaration)
- }
-
- lines.append(""" {
- InspectorObject::iterator %(memberName)sPos = object->find(ASCIILiteral("%(memberName)s"));
- if (%(memberName)sPos != object->end()) {
- %(assertMethod)s(%(memberName)sPos->value.get());""" % args)
-
- if should_count_properties:
- lines.append(' ++foundPropertiesCount;')
- lines.append(' }')
- lines.append(' }')
-
- if should_count_properties:
- lines.append(' if (foundPropertiesCount != object->size())')
- lines.append(' FATAL("Unexpected properties in object: %s\\n", object->toJSONString().ascii().data());')
- lines.append('}')
- lines.append('#endif // !ASSERT_DISABLED')
- return '\n'.join(lines)
-
- def _generate_assertion_for_enum(self, enum_member, object_declaration):
- lines = []
- lines.append('#if !ASSERT_DISABLED')
- lines.append('void %s(Inspector::InspectorValue* value)' % Generator.assertion_method_for_type_member(enum_member, object_declaration))
- lines.append('{')
- lines.append(' String s;')
- lines.append(' bool cast_res = value->asString(&s);')
- lines.append(' ASSERT(cast_res);')
-
- assert_condition = ' || '.join(['s == "%s"' % enum_value for enum_value in enum_member.type.enum_values()])
- lines.append(' ASSERT(%s);' % assert_condition)
- lines.append('}')
- lines.append('#endif // !ASSERT_DISABLED')
-
- return '\n'.join(lines)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengeneratorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -267,22 +267,22 @@
</span><span class="cx">
</span><span class="cx"> # Generate type representations for various situations.
</span><span class="cx"> @staticmethod
</span><del>- def type_builder_string_for_type(_type):
</del><ins>+ def protocol_type_string_for_type(_type):
</ins><span class="cx"> if isinstance(_type, ObjectType) and len(_type.members) == 0:
</span><span class="cx"> return 'Inspector::InspectorObject'
</span><span class="cx"> if isinstance(_type, (ObjectType, AliasedType, EnumType)):
</span><del>- return 'Inspector::TypeBuilder::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
</del><ins>+ return 'Inspector::Protocol::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
</ins><span class="cx"> if isinstance(_type, ArrayType):
</span><del>- return 'Inspector::TypeBuilder::Array<%s>' % Generator.type_builder_string_for_type(_type.element_type)
</del><ins>+ return 'Inspector::Protocol::Array<%s>' % Generator.protocol_type_string_for_type(_type.element_type)
</ins><span class="cx"> if isinstance(_type, PrimitiveType):
</span><span class="cx"> return Generator.cpp_name_for_primitive_type(_type)
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><del>- def type_builder_string_for_type_member(type_member, object_declaration):
</del><ins>+ def protocol_type_string_for_type_member(type_member, object_declaration):
</ins><span class="cx"> if isinstance(type_member.type, EnumType) and type_member.type.is_anonymous:
</span><del>- return '::'.join([Generator.type_builder_string_for_type(object_declaration.type), ucfirst(type_member.member_name)])
</del><ins>+ return '::'.join([Generator.protocol_type_string_for_type(object_declaration.type), ucfirst(type_member.member_name)])
</ins><span class="cx"> else:
</span><del>- return Generator.type_builder_string_for_type(type_member.type)
</del><ins>+ return Generator.protocol_type_string_for_type(type_member.type)
</ins><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def type_string_for_unchecked_formal_in_parameter(parameter):
</span><span class="lines">@@ -321,9 +321,9 @@
</span><span class="cx"> @staticmethod
</span><span class="cx"> def type_string_for_type_with_name(_type, type_name, is_optional):
</span><span class="cx"> if isinstance(_type, (ArrayType, ObjectType)):
</span><del>- return 'PassRefPtr<%s>' % Generator.type_builder_string_for_type(_type)
</del><ins>+ return 'PassRefPtr<%s>' % Generator.protocol_type_string_for_type(_type)
</ins><span class="cx"> if isinstance(_type, AliasedType):
</span><del>- builder_type = Generator.type_builder_string_for_type(_type)
</del><ins>+ builder_type = Generator.protocol_type_string_for_type(_type)
</ins><span class="cx"> if is_optional:
</span><span class="cx"> return 'const %s* const' % builder_type
</span><span class="cx"> elif _type.aliased_type.qualified_name() in ['integer', 'number']:
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx"> if _type.is_anonymous:
</span><span class="cx"> enum_type_name = ucfirst(type_name)
</span><span class="cx"> else:
</span><del>- enum_type_name = 'Inspector::TypeBuilder::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
</del><ins>+ enum_type_name = 'Inspector::Protocol::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
</ins><span class="cx">
</span><span class="cx"> if is_optional:
</span><span class="cx"> return '%s*' % enum_type_name
</span><span class="lines">@@ -363,18 +363,18 @@
</span><span class="cx"> _type = _type.aliased_type # Fall through.
</span><span class="cx">
</span><span class="cx"> if isinstance(_type, (ObjectType, ArrayType)):
</span><del>- return 'RefPtr<%s>&' % Generator.type_builder_string_for_type(_type)
</del><ins>+ return 'RefPtr<%s>&' % Generator.protocol_type_string_for_type(_type)
</ins><span class="cx"> if isinstance(_type, PrimitiveType):
</span><span class="cx"> cpp_name = Generator.cpp_name_for_primitive_type(_type)
</span><span class="cx"> if parameter.is_optional:
</span><del>- return "Inspector::TypeBuilder::OptOutput<%s>*" % cpp_name
</del><ins>+ return "Inspector::Protocol::OptOutput<%s>*" % cpp_name
</ins><span class="cx"> else:
</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><span class="cx"> return 'Inspector%sBackendDispatcherHandler::%s*' % (_type.type_domain().domain_name, ucfirst(parameter.parameter_name))
</span><span class="cx"> else:
</span><del>- return 'Inspector::TypeBuilder::%s::%s*' % (_type.type_domain().domain_name, _type.raw_name())
</del><ins>+ return 'Inspector::Protocol::%s::%s*' % (_type.type_domain().domain_name, _type.raw_name())
</ins><span class="cx">
</span><span class="cx"> raise ValueError("unknown formal out parameter type.")
</span><span class="cx">
</span><span class="lines">@@ -389,11 +389,11 @@
</span><span class="cx"> _type = _type.primitive_type # Fall through.
</span><span class="cx">
</span><span class="cx"> if isinstance(_type, (ObjectType, ArrayType)):
</span><del>- return 'PassRefPtr<%s>' % Generator.type_builder_string_for_type(_type)
</del><ins>+ return 'PassRefPtr<%s>' % Generator.protocol_type_string_for_type(_type)
</ins><span class="cx"> if isinstance(_type, PrimitiveType):
</span><span class="cx"> cpp_name = Generator.cpp_name_for_primitive_type(_type)
</span><span class="cx"> if parameter.is_optional:
</span><del>- return "Inspector::TypeBuilder::OptOutput<%s>*" % cpp_name
</del><ins>+ return "Inspector::Protocol::OptOutput<%s>*" % cpp_name
</ins><span class="cx"> elif _type.qualified_name() in ['integer', 'number']:
</span><span class="cx"> return Generator.cpp_name_for_primitive_type(_type)
</span><span class="cx"> elif _type.qualified_name() in ['string']:
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx"> if _type.qualified_name() in ['any', 'object']:
</span><span class="cx"> return "RefPtr<%s>" % Generator.cpp_name_for_primitive_type(_type)
</span><span class="cx"> elif parameter.is_optional and _type.qualified_name() not in ['boolean', 'string', 'integer']:
</span><del>- return "Inspector::TypeBuilder::OptOutput<%s>" % cpp_name
</del><ins>+ return "Inspector::Protocol::OptOutput<%s>" % cpp_name
</ins><span class="cx"> else:
</span><span class="cx"> return cpp_name
</span><span class="cx">
</span><span class="lines">@@ -433,34 +433,34 @@
</span><span class="cx"> def type_string_for_stack_out_parameter(parameter):
</span><span class="cx"> _type = parameter.type
</span><span class="cx"> if isinstance(_type, (ArrayType, ObjectType)):
</span><del>- return 'RefPtr<%s>' % Generator.type_builder_string_for_type(_type)
</del><ins>+ return 'RefPtr<%s>' % Generator.protocol_type_string_for_type(_type)
</ins><span class="cx"> if isinstance(_type, AliasedType):
</span><del>- builder_type = Generator.type_builder_string_for_type(_type)
</del><ins>+ builder_type = Generator.protocol_type_string_for_type(_type)
</ins><span class="cx"> if parameter.is_optional:
</span><del>- return "Inspector::TypeBuilder::OptOutput<%s>" % builder_type
</del><ins>+ return "Inspector::Protocol::OptOutput<%s>" % builder_type
</ins><span class="cx"> return '%s' % builder_type
</span><span class="cx"> if isinstance(_type, PrimitiveType):
</span><span class="cx"> cpp_name = Generator.cpp_name_for_primitive_type(_type)
</span><span class="cx"> if parameter.is_optional:
</span><del>- return "Inspector::TypeBuilder::OptOutput<%s>" % cpp_name
</del><ins>+ return "Inspector::Protocol::OptOutput<%s>" % cpp_name
</ins><span class="cx"> else:
</span><span class="cx"> return cpp_name
</span><span class="cx"> if isinstance(_type, EnumType):
</span><span class="cx"> if _type.is_anonymous:
</span><span class="cx"> return 'Inspector%sBackendDispatcherHandler::%s' % (_type.type_domain().domain_name, ucfirst(parameter.parameter_name))
</span><span class="cx"> else:
</span><del>- return 'Inspector::TypeBuilder::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
</del><ins>+ return 'Inspector::Protocol::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
</ins><span class="cx">
</span><span class="cx"> @staticmethod
</span><span class="cx"> def assertion_method_for_type_member(type_member, object_declaration):
</span><span class="cx">
</span><span class="cx"> def assertion_method_for_type(_type):
</span><del>- return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.type_builder_string_for_type(_type)
</del><ins>+ return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.protocol_type_string_for_type(_type)
</ins><span class="cx">
</span><span class="cx"> if isinstance(type_member.type, AliasedType):
</span><span class="cx"> return assertion_method_for_type(type_member.type.aliased_type)
</span><span class="cx"> if isinstance(type_member.type, EnumType) and type_member.type.is_anonymous:
</span><del>- return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.type_builder_string_for_type_member(type_member, object_declaration)
</del><ins>+ return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.protocol_type_string_for_type_member(type_member, object_declaration)
</ins><span class="cx">
</span><span class="cx"> return assertion_method_for_type(type_member.type)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerator_templatespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> InspectorFrontendChannel* m_inspectorFrontendChannel;
</span><span class="cx"> };""")
</span><span class="cx">
</span><del>- TypeBuilderDeclarationPrelude = (
</del><ins>+ ProtocolObjectBuilderDeclarationPrelude = (
</ins><span class="cx"> """ template<int STATE>
</span><span class="cx"> class Builder {
</span><span class="cx"> private:
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> friend class ${objectType};
</span><span class="cx"> public:""")
</span><span class="cx">
</span><del>- TypeBuilderDeclarationPostlude = (
</del><ins>+ ProtocolObjectBuilderDeclarationPostlude = (
</ins><span class="cx"> """
</span><span class="cx"> operator RefPtr<${objectType}>& ()
</span><span class="cx"> {
</span><span class="lines">@@ -248,9 +248,9 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;""")
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;""")
</ins><span class="cx">
</span><del>- TypeBuilderObjectRuntimeCast = (
</del><ins>+ ProtocolObjectRuntimeCast = (
</ins><span class="cx"> """PassRefPtr<${objectType}> BindingTraits<${objectType}>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Inspector::InspectorObject> object;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptsgenerateinspectorprotocolbindingspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> from generate_backend_dispatcher_implementation import *
</span><span class="cx"> from generate_frontend_dispatcher_header import *
</span><span class="cx"> from generate_frontend_dispatcher_implementation import *
</span><del>- from generate_type_builder_header import *
- from generate_type_builder_implementation import *
</del><ins>+ from generate_protocol_types_header import *
+ from generate_protocol_types_implementation import *
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.ERROR)
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx"> generators.append(BackendDispatcherImplementationGenerator(protocol, primary_specification_filepath))
</span><span class="cx"> generators.append(FrontendDispatcherHeaderGenerator(protocol, primary_specification_filepath))
</span><span class="cx"> generators.append(FrontendDispatcherImplementationGenerator(protocol, primary_specification_filepath))
</span><del>- generators.append(TypeBuilderHeaderGenerator(protocol, primary_specification_filepath))
- generators.append(TypeBuilderImplementationGenerator(protocol, primary_specification_filepath))
</del><ins>+ generators.append(ProtocolTypesHeaderGenerator(protocol, primary_specification_filepath))
+ generators.append(ProtocolTypesImplementationGenerator(protocol, primary_specification_filepath))
</ins><span class="cx">
</span><span class="cx"> single_output_file_contents = []
</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 (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -99,18 +99,18 @@
</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::TypeBuilder::Array<String>>& opt_out_columnNames, Inspector::TypeBuilder::OptOutput<String>* opt_out_notes, Inspector::TypeBuilder::OptOutput<double>* opt_out_timestamp, Inspector::TypeBuilder::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::TypeBuilder::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::TypeBuilder::OptOutput<int>* opt_out_databaseId, RefPtr<Inspector::TypeBuilder::Database::Error>& opt_out_sqlError, Inspector::TypeBuilder::Database::PrimaryColors* opt_out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
</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, InspectorDatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
</ins><span class="cx"> class ExecuteSQLAsyncOptionalReturnValuesCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
</span><span class="cx"> public:
</span><span class="cx"> ExecuteSQLAsyncOptionalReturnValuesCallback(PassRefPtr<Inspector::InspectorBackendDispatcher>, int id);
</span><del>- void sendSuccess(PassRefPtr<Inspector::TypeBuilder::Array<String>> columnNames, Inspector::TypeBuilder::OptOutput<String>* notes, Inspector::TypeBuilder::OptOutput<double>* timestamp, Inspector::TypeBuilder::OptOutput<Inspector::InspectorObject>* values, Inspector::TypeBuilder::OptOutput<Inspector::InspectorValue>* payload, Inspector::TypeBuilder::OptOutput<int>* databaseId, PassRefPtr<Inspector::TypeBuilder::Database::Error> sqlError, Inspector::TypeBuilder::OptOutput<String>* screenColor, Inspector::TypeBuilder::OptOutput<String>* printColor);
</del><ins>+ void sendSuccess(PassRefPtr<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, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, Inspector::Protocol::OptOutput<String>* screenColor, Inspector::Protocol::OptOutput<String>* printColor);
</ins><span class="cx"> };
</span><span class="cx"> virtual void executeSQLAsyncOptionalReturnValues(ErrorString*, int in_databaseId, const String& in_query, PassRefPtr<ExecuteSQLAsyncOptionalReturnValuesCallback> callback) = 0;
</span><del>- virtual void executeSQLSync(ErrorString*, int in_databaseId, const String& in_query, RefPtr<Inspector::TypeBuilder::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::TypeBuilder::Database::Error>& out_sqlError, Inspector::TypeBuilder::Database::PrimaryColors* out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* out_printColor) = 0;
</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, Inspector::Protocol::Database::PrimaryColors* out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* out_printColor) = 0;
</ins><span class="cx"> class ExecuteSQLAsyncCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
</span><span class="cx"> public:
</span><span class="cx"> ExecuteSQLAsyncCallback(PassRefPtr<Inspector::InspectorBackendDispatcher>, int id);
</span><del>- void sendSuccess(PassRefPtr<Inspector::TypeBuilder::Array<String>> columnNames, const String& notes, double timestamp, Inspector::InspectorObject values, Inspector::InspectorValue payload, int databaseId, PassRefPtr<Inspector::TypeBuilder::Database::Error> sqlError, const String& screenColor, const String& printColor);
</del><ins>+ void sendSuccess(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, Inspector::InspectorObject values, Inspector::InspectorValue payload, int databaseId, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const String& screenColor, const String& printColor);
</ins><span class="cx"> };
</span><span class="cx"> virtual void executeSQLAsync(ErrorString*, int in_databaseId, const String& in_query, PassRefPtr<ExecuteSQLAsyncCallback> callback) = 0;
</span><span class="cx"> protected:
</span><span class="lines">@@ -232,14 +232,14 @@
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> out_columnNames;
- Inspector::TypeBuilder::OptOutput<String> out_notes;
- Inspector::TypeBuilder::OptOutput<double> out_timestamp;
- Inspector::TypeBuilder::OptOutput<Inspector::InspectorObject> out_values;
- Inspector::TypeBuilder::OptOutput<Inspector::InspectorValue> out_payload;
- Inspector::TypeBuilder::OptOutput<Inspector::TypeBuilder::Database::DatabaseId> out_databaseId;
- RefPtr<Inspector::TypeBuilder::Database::Error> out_sqlError;
- Inspector::TypeBuilder::Database::PrimaryColors out_screenColor;
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
+ Inspector::Protocol::OptOutput<String> out_notes;
+ Inspector::Protocol::OptOutput<double> out_timestamp;
+ Inspector::Protocol::OptOutput<Inspector::InspectorObject> out_values;
+ Inspector::Protocol::OptOutput<Inspector::InspectorValue> out_payload;
+ Inspector::Protocol::OptOutput<Inspector::Protocol::Database::DatabaseId> out_databaseId;
+ RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
+ Inspector::Protocol::Database::PrimaryColors out_screenColor;
</ins><span class="cx"> InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
</span><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_printColor);
</span><span class="cx">
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx">
</span><span class="cx"> InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::ExecuteSQLAsyncOptionalReturnValuesCallback(PassRefPtr<InspectorBackendDispatcher> backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(backendDispatcher, id) { }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::sendSuccess(PassRefPtr<Inspector::TypeBuilder::Array<String>> columnNames, Inspector::TypeBuilder::OptOutput<String>* notes, Inspector::TypeBuilder::OptOutput<double>* timestamp, Inspector::TypeBuilder::OptOutput<Inspector::InspectorObject>* values, Inspector::TypeBuilder::OptOutput<Inspector::InspectorValue>* payload, Inspector::TypeBuilder::OptOutput<int>* databaseId, PassRefPtr<Inspector::TypeBuilder::Database::Error> sqlError, Inspector::TypeBuilder::OptOutput<String>* screenColor, Inspector::TypeBuilder::OptOutput<String>* printColor)
</del><ins>+void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::sendSuccess(PassRefPtr<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, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, Inspector::Protocol::OptOutput<String>* screenColor, Inspector::Protocol::OptOutput<String>* printColor)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> if (columnNames)
</span><span class="lines">@@ -334,14 +334,14 @@
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> out_columnNames;
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
</ins><span class="cx"> String out_notes;
</span><span class="cx"> double out_timestamp;
</span><span class="cx"> Inspector::InspectorObject out_values;
</span><span class="cx"> Inspector::InspectorValue out_payload;
</span><del>- Inspector::TypeBuilder::Database::DatabaseId out_databaseId;
- RefPtr<Inspector::TypeBuilder::Database::Error> out_sqlError;
- Inspector::TypeBuilder::Database::PrimaryColors out_screenColor;
</del><ins>+ Inspector::Protocol::Database::DatabaseId out_databaseId;
+ RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
+ Inspector::Protocol::Database::PrimaryColors out_screenColor;
</ins><span class="cx"> InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
</span><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_screenColor, &out_printColor);
</span><span class="cx">
</span><span class="lines">@@ -353,15 +353,15 @@
</span><span class="cx"> result->setValue(ASCIILiteral("payload"), out_payload);
</span><span class="cx"> result->setNumber(ASCIILiteral("databaseId"), out_databaseId);
</span><span class="cx"> result->setObject(ASCIILiteral("sqlError"), out_sqlError);
</span><del>- result->setString(ASCIILiteral("screenColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_screenColor));
- result->setString(ASCIILiteral("printColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_printColor));
</del><ins>+ result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(out_screenColor));
+ result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(out_printColor));
</ins><span class="cx"> }
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, result.release(), error);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::ExecuteSQLAsyncCallback(PassRefPtr<InspectorBackendDispatcher> backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(backendDispatcher, id) { }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::sendSuccess(PassRefPtr<Inspector::TypeBuilder::Array<String>> columnNames, const String& notes, double timestamp, Inspector::InspectorObject values, Inspector::InspectorValue payload, int databaseId, PassRefPtr<Inspector::TypeBuilder::Database::Error> sqlError, const String& screenColor, const String& printColor)
</del><ins>+void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::sendSuccess(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, Inspector::InspectorObject values, Inspector::InspectorValue payload, int databaseId, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const String& screenColor, const String& printColor)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setArray(ASCIILiteral("columnNames"), columnNames);
</span><span class="lines">@@ -371,8 +371,8 @@
</span><span class="cx"> jsonMessage->setValue(ASCIILiteral("payload"), payload);
</span><span class="cx"> jsonMessage->setNumber(ASCIILiteral("databaseId"), databaseId);
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("sqlError"), sqlError);
</span><del>- jsonMessage->setString(ASCIILiteral("screenColor"), Inspector::TypeBuilder::getTestEnumConstantValue(screenColor));
- jsonMessage->setString(ASCIILiteral("printColor"), Inspector::TypeBuilder::getTestEnumConstantValue(printColor));
</del><ins>+ jsonMessage->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(screenColor));
+ jsonMessage->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(printColor));
</ins><span class="cx"> sendIfActive(jsonMessage, ErrorString());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -508,7 +508,7 @@
</span><span class="cx">
</span><span class="cx"> ### End File: InspectorTestFrontendDispatchers.cpp
</span><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.h
</del><ins>+### Begin File: InspectorTestProtocolTypes.h
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -539,13 +539,13 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-async-attribute.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
</del><ins>+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
</del><ins>+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> // Forward declarations.
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="lines">@@ -654,7 +654,7 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // Database
</span><span class="lines">@@ -662,16 +662,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
</del><ins>+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
</ins><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.cpp
</del><ins>+### Begin File: InspectorTestProtocolTypes.cpp
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -703,7 +703,7 @@
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> static const char* const enum_constant_values[] = {
</span><span class="cx"> "red",
</span><span class="lines">@@ -729,10 +729,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-### End File: InspectorTestTypeBuilders.cpp
</del><ins>+### End File: InspectorTestProtocolTypes.cpp
</ins></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 (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -96,8 +96,8 @@
</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 String* in_printColor, RefPtr<Inspector::TypeBuilder::Array<String>>& opt_out_columnNames, Inspector::TypeBuilder::OptOutput<String>* opt_out_notes, Inspector::TypeBuilder::OptOutput<double>* opt_out_timestamp, Inspector::TypeBuilder::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::TypeBuilder::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::TypeBuilder::OptOutput<int>* opt_out_databaseId, RefPtr<Inspector::TypeBuilder::Database::Error>& opt_out_sqlError, Inspector::TypeBuilder::Database::PrimaryColors* opt_out_screenColor, 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 String& in_printColor, RefPtr<Inspector::TypeBuilder::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::TypeBuilder::Database::Error>& out_sqlError, Inspector::TypeBuilder::Database::PrimaryColors* out_screenColor, InspectorDatabaseBackendDispatcherHandler::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 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<Inspector::Protocol::Database::Error>& opt_out_sqlError, Inspector::Protocol::Database::PrimaryColors* opt_out_screenColor, 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 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, InspectorDatabaseBackendDispatcherHandler::PrintColor* out_printColor) = 0;
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~InspectorDatabaseBackendDispatcherHandler();
</span><span class="cx"> };
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> bool notes_valueFound = false;
</span><span class="cx"> String in_notes = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("notes"), &notes_valueFound, protocolErrorsPtr);
</span><span class="cx"> bool timestamp_valueFound = false;
</span><del>- Inspector::TypeBuilder::OptOutput<double> in_timestamp = InspectorBackendDispatcher::getNumber(paramsContainerPtr, ASCIILiteral("timestamp"), &timestamp_valueFound, protocolErrorsPtr);
</del><ins>+ Inspector::Protocol::OptOutput<double> in_timestamp = InspectorBackendDispatcher::getNumber(paramsContainerPtr, ASCIILiteral("timestamp"), &timestamp_valueFound, protocolErrorsPtr);
</ins><span class="cx"> bool values_valueFound = false;
</span><span class="cx"> RefPtr<Inspector::InspectorObject> in_values = InspectorBackendDispatcher::getObject(paramsContainerPtr, ASCIILiteral("values"), &values_valueFound, protocolErrorsPtr);
</span><span class="cx"> bool payload_valueFound = false;
</span><span class="lines">@@ -227,14 +227,14 @@
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> out_columnNames;
- Inspector::TypeBuilder::OptOutput<String> out_notes;
- Inspector::TypeBuilder::OptOutput<double> out_timestamp;
- Inspector::TypeBuilder::OptOutput<Inspector::InspectorObject> out_values;
- Inspector::TypeBuilder::OptOutput<Inspector::InspectorValue> out_payload;
- Inspector::TypeBuilder::OptOutput<Inspector::TypeBuilder::Database::DatabaseId> out_databaseId;
- RefPtr<Inspector::TypeBuilder::Database::Error> out_sqlError;
- Inspector::TypeBuilder::Database::PrimaryColors out_screenColor;
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
+ Inspector::Protocol::OptOutput<String> out_notes;
+ Inspector::Protocol::OptOutput<double> out_timestamp;
+ Inspector::Protocol::OptOutput<Inspector::InspectorObject> out_values;
+ Inspector::Protocol::OptOutput<Inspector::InspectorValue> out_payload;
+ Inspector::Protocol::OptOutput<Inspector::Protocol::Database::DatabaseId> out_databaseId;
+ RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
+ Inspector::Protocol::Database::PrimaryColors out_screenColor;
</ins><span class="cx"> InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
</span><span class="cx"> m_agent->executeAllOptionalParameters(&error, columnNames_valueFound ? &in_columnNames : nullptr, notes_valueFound ? &in_notes : nullptr, timestamp_valueFound ? &in_timestamp : nullptr, values_valueFound ? &in_values : nullptr, payload_valueFound ? &in_payload : nullptr, databaseId_valueFound ? &in_databaseId : nullptr, sqlError_valueFound ? &in_sqlError : nullptr, screenColor_valueFound ? &in_screenColor : nullptr, printColor_valueFound ? &in_printColor : nullptr, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, &out_screenColor, &out_printColor);
</span><span class="cx">
</span><span class="lines">@@ -284,14 +284,14 @@
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> out_columnNames;
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
</ins><span class="cx"> String out_notes;
</span><span class="cx"> double out_timestamp;
</span><span class="cx"> Inspector::InspectorObject out_values;
</span><span class="cx"> Inspector::InspectorValue out_payload;
</span><del>- Inspector::TypeBuilder::Database::DatabaseId out_databaseId;
- RefPtr<Inspector::TypeBuilder::Database::Error> out_sqlError;
- Inspector::TypeBuilder::Database::PrimaryColors out_screenColor;
</del><ins>+ Inspector::Protocol::Database::DatabaseId out_databaseId;
+ RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
+ Inspector::Protocol::Database::PrimaryColors out_screenColor;
</ins><span class="cx"> InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
</span><span class="cx"> m_agent->executeNoOptionalParameters(&error, in_columnNames, in_notes, in_timestamp, in_values, in_payload, in_databaseId, in_sqlError, in_screenColor, in_printColor, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, &out_screenColor, &out_printColor);
</span><span class="cx">
</span><span class="lines">@@ -303,8 +303,8 @@
</span><span class="cx"> result->setValue(ASCIILiteral("payload"), out_payload);
</span><span class="cx"> result->setNumber(ASCIILiteral("databaseId"), out_databaseId);
</span><span class="cx"> result->setObject(ASCIILiteral("sqlError"), out_sqlError);
</span><del>- result->setString(ASCIILiteral("screenColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_screenColor));
- result->setString(ASCIILiteral("printColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_printColor));
</del><ins>+ result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(out_screenColor));
+ result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(out_printColor));
</ins><span class="cx"> }
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, result.release(), error);
</span><span class="cx"> }
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx">
</span><span class="cx"> ### End File: InspectorTestFrontendDispatchers.cpp
</span><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.h
</del><ins>+### Begin File: InspectorTestProtocolTypes.h
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -446,13 +446,13 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-optional-call-return-parameters.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
</del><ins>+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
</del><ins>+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> // Forward declarations.
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="lines">@@ -561,7 +561,7 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // Database
</span><span class="lines">@@ -569,16 +569,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
</del><ins>+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
</ins><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.cpp
</del><ins>+### Begin File: InspectorTestProtocolTypes.cpp
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -610,7 +610,7 @@
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -618,7 +618,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> static const char* const enum_constant_values[] = {
</span><span class="cx"> "red",
</span><span class="lines">@@ -636,10 +636,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-### End File: InspectorTestTypeBuilders.cpp
</del><ins>+### End File: InspectorTestProtocolTypes.cpp
</ins></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 (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx">
</span><span class="cx"> ### End File: InspectorTestFrontendDispatchers.cpp
</span><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.h
</del><ins>+### Begin File: InspectorTestProtocolTypes.h
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -463,13 +463,13 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
</del><ins>+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
</del><ins>+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -497,16 +497,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
</del><ins>+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
</ins><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.cpp
</del><ins>+### Begin File: InspectorTestProtocolTypes.cpp
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -538,7 +538,7 @@
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> static const char* const enum_constant_values[] = {
</span><span class="cx"> };
</span><span class="lines">@@ -557,10 +557,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-### End File: InspectorTestTypeBuilders.cpp
</del><ins>+### End File: InspectorTestProtocolTypes.cpp
</ins></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 (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -187,8 +187,8 @@
</span><span class="cx"> class InspectorDatabaseFrontendDispatcher {
</span><span class="cx"> public:
</span><span class="cx"> InspectorDatabaseFrontendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
</span><del>- void didExecuteOptionalParameters(PassRefPtr<Inspector::TypeBuilder::Array<String>> columnNames, const String* const notes, const double* const timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::TypeBuilder::Database::Error> sqlError, const Inspector::TypeBuilder::Database::PrimaryColors* const screenColor, const String* const printColor);
- void didExecuteNoOptionalParameters(PassRefPtr<Inspector::TypeBuilder::Array<String>> columnNames, const String& notes, double timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::TypeBuilder::Database::Error> sqlError, const Inspector::TypeBuilder::Database::PrimaryColors& screenColor, const String& printColor);
</del><ins>+ void didExecuteOptionalParameters(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String* const notes, const double* const timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors* const screenColor, const String* const printColor);
+ void didExecuteNoOptionalParameters(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors& screenColor, const String& printColor);
</ins><span class="cx"> private:
</span><span class="cx"> InspectorFrontendChannel* m_inspectorFrontendChannel;
</span><span class="cx"> };
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>-void InspectorDatabaseFrontendDispatcher::didExecuteOptionalParameters(PassRefPtr<Inspector::TypeBuilder::Array<String>> columnNames, const String* const notes, const double* const timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::TypeBuilder::Database::Error> sqlError, const Inspector::TypeBuilder::Database::PrimaryColors* const screenColor, const String* const printColor)
</del><ins>+void InspectorDatabaseFrontendDispatcher::didExecuteOptionalParameters(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String* const notes, const double* const timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors* const screenColor, const String* const printColor)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Database.didExecuteOptionalParameters"));
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseFrontendDispatcher::didExecuteNoOptionalParameters(PassRefPtr<Inspector::TypeBuilder::Array<String>> columnNames, const String& notes, double timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::TypeBuilder::Database::Error> sqlError, const Inspector::TypeBuilder::Database::PrimaryColors& screenColor, const String& printColor)
</del><ins>+void InspectorDatabaseFrontendDispatcher::didExecuteNoOptionalParameters(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors& screenColor, const String& printColor)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Database.didExecuteNoOptionalParameters"));
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx">
</span><span class="cx"> ### End File: InspectorTestFrontendDispatchers.cpp
</span><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.h
</del><ins>+### Begin File: InspectorTestProtocolTypes.h
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -324,13 +324,13 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
</del><ins>+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
</del><ins>+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> // Forward declarations.
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // Database
</span><span class="lines">@@ -442,16 +442,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
</del><ins>+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
</ins><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.cpp
</del><ins>+### Begin File: InspectorTestProtocolTypes.cpp
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> static const char* const enum_constant_values[] = {
</span><span class="cx"> };
</span><span class="lines">@@ -502,10 +502,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-### End File: InspectorTestTypeBuilders.cpp
</del><ins>+### End File: InspectorTestProtocolTypes.cpp
</ins></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 (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx">
</span><span class="cx"> ### End File: InspectorTestFrontendDispatchers.cpp
</span><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.h
</del><ins>+### Begin File: InspectorTestProtocolTypes.h
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -262,13 +262,13 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
</del><ins>+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
</del><ins>+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -301,16 +301,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
</del><ins>+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
</ins><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.cpp
</del><ins>+### Begin File: InspectorTestProtocolTypes.cpp
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> static const char* const enum_constant_values[] = {
</span><span class="cx"> };
</span><span class="lines">@@ -361,10 +361,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-### End File: InspectorTestTypeBuilders.cpp
</del><ins>+### End File: InspectorTestProtocolTypes.cpp
</ins></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 (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx">
</span><span class="cx"> ### End File: InspectorTestFrontendDispatchers.cpp
</span><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.h
</del><ins>+### Begin File: InspectorTestProtocolTypes.h
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -262,13 +262,13 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
</del><ins>+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
</del><ins>+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> // Forward declarations.
</span><span class="cx"> namespace Runtime {
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> Builder<STATE | TypeSet>& setType(Type value)
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & TypeSet), property_type_already_set);
</span><del>- m_result->setString(ASCIILiteral("type"), Inspector::TypeBuilder::getTestEnumConstantValue(static_cast<int>(value)));
</del><ins>+ m_result->setString(ASCIILiteral("type"), Inspector::Protocol::getTestEnumConstantValue(static_cast<int>(value)));
</ins><span class="cx"> return castState<TypeSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -357,14 +357,14 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx">
</span><span class="cx"> void setString(const String& value)
</span><span class="cx"> {
</span><span class="cx"> InspectorObjectBase::setString(ASCIILiteral("string"), value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setArray(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
</del><ins>+ void setArray(PassRefPtr<Inspector::Protocol::Array<String>> value)
</ins><span class="cx"> {
</span><span class="cx"> InspectorObjectBase::setArray(ASCIILiteral("array"), value);
</span><span class="cx"> }
</span><span class="lines">@@ -374,16 +374,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
</del><ins>+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
</ins><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.cpp
</del><ins>+### Begin File: InspectorTestProtocolTypes.cpp
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> static const char* const enum_constant_values[] = {
</span><span class="cx"> "null",
</span><span class="lines">@@ -437,10 +437,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-### End File: InspectorTestTypeBuilders.cpp
</del><ins>+### End File: InspectorTestProtocolTypes.cpp
</ins></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 (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx">
</span><span class="cx"> ### End File: InspectorTestFrontendDispatchers.cpp
</span><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.h
</del><ins>+### Begin File: InspectorTestProtocolTypes.h
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -262,13 +262,13 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
</del><ins>+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
</del><ins>+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -296,16 +296,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
</del><ins>+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
</ins><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.cpp
</del><ins>+### Begin File: InspectorTestProtocolTypes.cpp
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> static const char* const enum_constant_values[] = {
</span><span class="cx"> };
</span><span class="lines">@@ -356,10 +356,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-### End File: InspectorTestTypeBuilders.cpp
</del><ins>+### End File: InspectorTestProtocolTypes.cpp
</ins></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 (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx">
</span><span class="cx"> ### End File: InspectorTestFrontendDispatchers.cpp
</span><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.h
</del><ins>+### Begin File: InspectorTestProtocolTypes.h
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -265,13 +265,13 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
</del><ins>+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
</del><ins>+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> // Forward declarations.
</span><span class="cx"> namespace Debugger {
</span><span class="lines">@@ -316,16 +316,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
</del><ins>+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
</ins><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.cpp
</del><ins>+### Begin File: InspectorTestProtocolTypes.cpp
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> static const char* const enum_constant_values[] = {
</span><span class="cx"> "Died",
</span><span class="lines">@@ -379,10 +379,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-### End File: InspectorTestTypeBuilders.cpp
</del><ins>+### End File: InspectorTestProtocolTypes.cpp
</ins></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 (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx">
</span><span class="cx"> ### End File: InspectorTestFrontendDispatchers.cpp
</span><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.h
</del><ins>+### Begin File: InspectorTestProtocolTypes.h
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -266,13 +266,13 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
</del><ins>+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
</del><ins>+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> // Forward declarations.
</span><span class="cx"> namespace Runtime {
</span><span class="lines">@@ -318,16 +318,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
</del><ins>+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
</ins><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.cpp
</del><ins>+### Begin File: InspectorTestProtocolTypes.cpp
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> static const char* const enum_constant_values[] = {
</span><span class="cx"> "Pigs",
</span><span class="lines">@@ -385,10 +385,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-### End File: InspectorTestTypeBuilders.cpp
</del><ins>+### End File: InspectorTestProtocolTypes.cpp
</ins></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 (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx">
</span><span class="cx"> ### End File: InspectorTestFrontendDispatchers.cpp
</span><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.h
</del><ins>+### Begin File: InspectorTestProtocolTypes.h
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -262,13 +262,13 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-object-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
</del><ins>+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
</del><ins>+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> // Forward declarations.
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class OptionalParameterBundle : public Inspector::InspectorObjectBase {
</span><span class="lines">@@ -420,9 +420,9 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx">
</span><del>- void setColumnNames(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
</del><ins>+ void setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
</ins><span class="cx"> {
</span><span class="cx"> InspectorObjectBase::setArray(ASCIILiteral("columnNames"), value);
</span><span class="cx"> }
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> InspectorObjectBase::setValue(ASCIILiteral("payload"), value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setError(PassRefPtr<Inspector::TypeBuilder::Database::Error> value)
</del><ins>+ void setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
</ins><span class="cx"> {
</span><span class="cx"> InspectorObjectBase::setObject(ASCIILiteral("error"), value);
</span><span class="cx"> }
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx"> friend class ParameterBundle;
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
</del><ins>+ Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & ColumnNamesSet), property_columnNames_already_set);
</span><span class="cx"> m_result->setArray(ASCIILiteral("columnNames"), value);
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> return castState<PayloadSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::TypeBuilder::Database::Error> value)
</del><ins>+ Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & ErrorSet), property_error_already_set);
</span><span class="cx"> m_result->setObject(ASCIILiteral("error"), value);
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* Conflicted names may cause generated getters/setters to clash with built-in InspectorObject methods. */
</span><span class="lines">@@ -648,7 +648,7 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // Database
</span><span class="lines">@@ -686,7 +686,7 @@
</span><span class="cx"> friend class ParameterBundle;
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
</del><ins>+ Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & ColumnNamesSet), property_columnNames_already_set);
</span><span class="cx"> m_result->setArray(ASCIILiteral("columnNames"), value);
</span><span class="lines">@@ -721,7 +721,7 @@
</span><span class="cx"> return castState<PayloadSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::TypeBuilder::Database::Error> value)
</del><ins>+ Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & ErrorSet), property_error_already_set);
</span><span class="cx"> m_result->setObject(ASCIILiteral("error"), value);
</span><span class="lines">@@ -755,23 +755,23 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // Test
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
</del><ins>+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
</ins><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.cpp
</del><ins>+### Begin File: InspectorTestProtocolTypes.cpp
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -803,7 +803,7 @@
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -811,7 +811,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> static const char* const enum_constant_values[] = {
</span><span class="cx"> };
</span><span class="lines">@@ -822,10 +822,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-### End File: InspectorTestTypeBuilders.cpp
</del><ins>+### End File: InspectorTestProtocolTypes.cpp
</ins></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 (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx">
</span><span class="cx"> ### End File: InspectorTestFrontendDispatchers.cpp
</span><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.h
</del><ins>+### Begin File: InspectorTestProtocolTypes.h
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -266,13 +266,13 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-requiring-runtime-casts.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
</del><ins>+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
</del><ins>+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> // Forward declarations.
</span><span class="cx"> namespace Test {
</span><span class="lines">@@ -354,10 +354,10 @@
</span><span class="cx"> return castState<NumberSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder<STATE | AnimalsSet>& setAnimals(Inspector::TypeBuilder::Test::CastedAnimals value)
</del><ins>+ Builder<STATE | AnimalsSet>& setAnimals(Inspector::Protocol::Test::CastedAnimals value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & AnimalsSet), property_animals_already_set);
</span><del>- m_result->setString(ASCIILiteral("animals"), Inspector::TypeBuilder::getTestEnumConstantValue(static_cast<int>(value)));
</del><ins>+ m_result->setString(ASCIILiteral("animals"), Inspector::Protocol::getTestEnumConstantValue(static_cast<int>(value)));
</ins><span class="cx"> return castState<AnimalsSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> return castState<IdSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder<STATE | TreeSet>& setTree(PassRefPtr<Inspector::TypeBuilder::Test::RecursiveObject1> value)
</del><ins>+ Builder<STATE | TreeSet>& setTree(PassRefPtr<Inspector::Protocol::Test::RecursiveObject1> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & TreeSet), property_tree_already_set);
</span><span class="cx"> m_result->setObject(ASCIILiteral("tree"), value);
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* */
</span><span class="lines">@@ -464,9 +464,9 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx">
</span><del>- void setObj(PassRefPtr<Inspector::TypeBuilder::Test::RecursiveObject2> value)
</del><ins>+ void setObj(PassRefPtr<Inspector::Protocol::Test::RecursiveObject2> value)
</ins><span class="cx"> {
</span><span class="cx"> InspectorObjectBase::setObject(ASCIILiteral("obj"), value);
</span><span class="cx"> }
</span><span class="lines">@@ -518,9 +518,9 @@
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><del>- typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
</del><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx">
</span><del>- void setObj(PassRefPtr<Inspector::TypeBuilder::Test::RecursiveObject1> value)
</del><ins>+ void setObj(PassRefPtr<Inspector::Protocol::Test::RecursiveObject1> value)
</ins><span class="cx"> {
</span><span class="cx"> InspectorObjectBase::setObject(ASCIILiteral("obj"), value);
</span><span class="cx"> }
</span><span class="lines">@@ -528,38 +528,38 @@
</span><span class="cx">
</span><span class="cx"> } // Test
</span><span class="cx">
</span><del>-template<> struct BindingTraits<Inspector::TypeBuilder::Test::CastedAnimals> {
</del><ins>+template<> struct BindingTraits<Inspector::Protocol::Test::CastedAnimals> {
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> static void assertValueHasExpectedType(Inspector::InspectorValue*);
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx"> };
</span><del>-template<> struct BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast> {
-static PassRefPtr<Inspector::TypeBuilder::Test::TypeNeedingCast> runtimeCast(PassRefPtr<Inspector::InspectorValue> value);
</del><ins>+template<> struct BindingTraits<Inspector::Protocol::Test::TypeNeedingCast> {
+static PassRefPtr<Inspector::Protocol::Test::TypeNeedingCast> runtimeCast(PassRefPtr<Inspector::InspectorValue> value);
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> static void assertValueHasExpectedType(Inspector::InspectorValue*);
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx"> };
</span><del>-template<> struct BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1> {
</del><ins>+template<> struct BindingTraits<Inspector::Protocol::Test::RecursiveObject1> {
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> static void assertValueHasExpectedType(Inspector::InspectorValue*);
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx"> };
</span><del>-template<> struct BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject2> {
</del><ins>+template<> struct BindingTraits<Inspector::Protocol::Test::RecursiveObject2> {
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> static void assertValueHasExpectedType(Inspector::InspectorValue*);
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx"> };
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
</del><ins>+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
</ins><span class="cx">
</span><del>-### Begin File: InspectorTestTypeBuilders.cpp
</del><ins>+### Begin File: InspectorTestProtocolTypes.cpp
</ins><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Google Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</span><span class="lines">@@ -591,7 +591,7 @@
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "InspectorTestTypeBuilders.h"
</del><ins>+#include "InspectorTestProtocolTypes.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx">
</span><span class="cx"> static const char* const enum_constant_values[] = {
</span><span class="cx"> "Ducks",
</span><span class="lines">@@ -618,7 +618,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><del>-void BindingTraits<Inspector::TypeBuilder::Test::CastedAnimals>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</del><ins>+void BindingTraits<Inspector::Protocol::Test::CastedAnimals>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</ins><span class="cx"> {
</span><span class="cx"> String s;
</span><span class="cx"> bool cast_res = value->asString(&s);
</span><span class="lines">@@ -628,7 +628,7 @@
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><del>-void BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</del><ins>+void BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> object;
</span><span class="cx"> bool castRes = value->asObject(&object);
</span><span class="lines">@@ -646,7 +646,7 @@
</span><span class="cx"> {
</span><span class="cx"> InspectorObject::iterator animalsPos = object->find(ASCIILiteral("animals"));
</span><span class="cx"> ASSERT(animalsPos != object->end());
</span><del>- BindingTraits<Inspector::TypeBuilder::Test::CastedAnimals>::assertValueHasExpectedType(animalsPos->value.get());
</del><ins>+ BindingTraits<Inspector::Protocol::Test::CastedAnimals>::assertValueHasExpectedType(animalsPos->value.get());
</ins><span class="cx"> }
</span><span class="cx"> {
</span><span class="cx"> InspectorObject::iterator idPos = object->find(ASCIILiteral("id"));
</span><span class="lines">@@ -656,7 +656,7 @@
</span><span class="cx"> {
</span><span class="cx"> InspectorObject::iterator treePos = object->find(ASCIILiteral("tree"));
</span><span class="cx"> ASSERT(treePos != object->end());
</span><del>- BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1>::assertValueHasExpectedType(treePos->value.get());
</del><ins>+ BindingTraits<Inspector::Protocol::Test::RecursiveObject1>::assertValueHasExpectedType(treePos->value.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int foundPropertiesCount = 5;
</span><span class="lines">@@ -665,21 +665,21 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Test::TypeNeedingCast> BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
</del><ins>+PassRefPtr<Inspector::Protocol::Test::TypeNeedingCast> BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Inspector::InspectorObject> object;
</span><span class="cx"> bool castRes = value->asObject(&object);
</span><span class="cx"> ASSERT_UNUSED(castRes, castRes);
</span><span class="cx"> #if !ASSERT_DISABLED
</span><del>- BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::assertValueHasExpectedType(object.get());
</del><ins>+ BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::assertValueHasExpectedType(object.get());
</ins><span class="cx"> #endif // !ASSERT_DISABLED
</span><del>- COMPILE_ASSERT(sizeof(Inspector::TypeBuilder::Test::TypeNeedingCast) == sizeof(Inspector::InspectorObjectBase), type_cast_problem);
- return static_cast<Inspector::TypeBuilder::Test::TypeNeedingCast*>(static_cast<Inspector::InspectorObjectBase*>(object.get()));
</del><ins>+ COMPILE_ASSERT(sizeof(Inspector::Protocol::Test::TypeNeedingCast) == sizeof(Inspector::InspectorObjectBase), type_cast_problem);
+ return static_cast<Inspector::Protocol::Test::TypeNeedingCast*>(static_cast<Inspector::InspectorObjectBase*>(object.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><del>-void BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</del><ins>+void BindingTraits<Inspector::Protocol::Test::RecursiveObject1>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> object;
</span><span class="cx"> bool castRes = value->asObject(&object);
</span><span class="lines">@@ -689,7 +689,7 @@
</span><span class="cx"> {
</span><span class="cx"> InspectorObject::iterator objPos = object->find(ASCIILiteral("obj"));
</span><span class="cx"> if (objPos != object->end()) {
</span><del>- BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject2>::assertValueHasExpectedType(objPos->value.get());
</del><ins>+ BindingTraits<Inspector::Protocol::Test::RecursiveObject2>::assertValueHasExpectedType(objPos->value.get());
</ins><span class="cx"> ++foundPropertiesCount;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -699,7 +699,7 @@
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><del>-void BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject2>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</del><ins>+void BindingTraits<Inspector::Protocol::Test::RecursiveObject2>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> object;
</span><span class="cx"> bool castRes = value->asObject(&object);
</span><span class="lines">@@ -709,7 +709,7 @@
</span><span class="cx"> {
</span><span class="cx"> InspectorObject::iterator objPos = object->find(ASCIILiteral("obj"));
</span><span class="cx"> if (objPos != object->end()) {
</span><del>- BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1>::assertValueHasExpectedType(objPos->value.get());
</del><ins>+ BindingTraits<Inspector::Protocol::Test::RecursiveObject1>::assertValueHasExpectedType(objPos->value.get());
</ins><span class="cx"> ++foundPropertiesCount;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -718,10 +718,10 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx">
</span><del>-} // namespace TypeBuilder
</del><ins>+} // namespace Protocol
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-### End File: InspectorTestTypeBuilders.cpp
</del><ins>+### End File: InspectorTestProtocolTypes.cpp
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTypeProfilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TypeProfiler.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TypeProfiler.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/runtime/TypeProfiler.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TypeProfiler.h"
</span><span class="cx">
</span><del>-#include "InspectorJSTypeBuilders.h"
</del><ins>+#include "InspectorJSProtocolTypes.h"
</ins><span class="cx"> #include "TypeLocation.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> bucket.append(location);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TypeProfiler::getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor descriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::TypeBuilder::Runtime::TypeDescription>& description)
</del><ins>+void TypeProfiler::getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor descriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::Protocol::Runtime::TypeDescription>& description)
</ins><span class="cx"> {
</span><span class="cx"> TypeLocation* location = findLocation(divot, sourceID, descriptor);
</span><span class="cx"> if (!location)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTypeProfilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TypeProfiler.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TypeProfiler.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/runtime/TypeProfiler.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-namespace Inspector { namespace TypeBuilder { namespace Runtime {
</del><ins>+namespace Inspector { namespace Protocol { namespace Runtime {
</ins><span class="cx"> class TypeDescription;
</span><span class="cx"> }}}
</span><span class="cx">
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> class TypeProfiler {
</span><span class="cx"> public:
</span><span class="cx"> void logTypesForTypeLocation(TypeLocation*);
</span><del>- void getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::TypeBuilder::Runtime::TypeDescription>&);
</del><ins>+ void getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::Protocol::Runtime::TypeDescription>&);
</ins><span class="cx"> void insertNewLocation(TypeLocation*);
</span><span class="cx"> FunctionHasExecutedCache* functionHasExecutedCache() { return &m_functionHasExecutedCache; }
</span><span class="cx"> TypeLocationCache* typeLocationCache() { return &m_typeLocationCache; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTypeSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TypeSet.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TypeSet.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/runtime/TypeSet.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TypeSet.h"
</span><span class="cx">
</span><del>-#include "InspectorJSTypeBuilders.h"
</del><ins>+#include "InspectorJSProtocolTypes.h"
</ins><span class="cx"> #include "JSCJSValue.h"
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -213,9 +213,9 @@
</span><span class="cx"> return "(many)";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<String>> TypeSet::allPrimitiveTypeNames() const
</del><ins>+PassRefPtr<Inspector::Protocol::Array<String>> TypeSet::allPrimitiveTypeNames() const
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> seen = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> seen = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> if (m_seenTypes & TypeUndefined)
</span><span class="cx"> seen->addItem("Undefined");
</span><span class="cx"> if (m_seenTypes & TypeNull)
</span><span class="lines">@@ -232,9 +232,9 @@
</span><span class="cx"> return seen.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>> TypeSet::allStructureRepresentations() const
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> TypeSet::allStructureRepresentations() const
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>> description = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> description = Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>::create();
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < m_structureHistory.size(); i++)
</span><span class="cx"> description->addItem(m_structureHistory.at(i)->inspectorRepresentation());
</span><span class="lines">@@ -360,14 +360,14 @@
</span><span class="cx"> return representation.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> StructureShape::inspectorRepresentation()
</del><ins>+PassRefPtr<Inspector::Protocol::Runtime::StructureDescription> StructureShape::inspectorRepresentation()
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> base = Inspector::TypeBuilder::Runtime::StructureDescription::create();
- RefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> currentObject = base;
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::StructureDescription> base = Inspector::Protocol::Runtime::StructureDescription::create();
+ RefPtr<Inspector::Protocol::Runtime::StructureDescription> currentObject = base;
</ins><span class="cx"> RefPtr<StructureShape> currentShape = this;
</span><span class="cx">
</span><span class="cx"> while (currentShape) {
</span><del>- auto fields = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ auto fields = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> for (auto it = currentShape->m_fields.begin(), end = currentShape->m_fields.end(); it != end; ++it)
</span><span class="cx"> fields->addItem((*it).get());
</span><span class="cx">
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> currentObject->setConstructorName(currentShape->m_constructorName);
</span><span class="cx">
</span><span class="cx"> if (currentShape->m_proto) {
</span><del>- RefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> nextObject = Inspector::TypeBuilder::Runtime::StructureDescription::create();
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::StructureDescription> nextObject = Inspector::Protocol::Runtime::StructureDescription::create();
</ins><span class="cx"> currentObject->setPrototypeStructure(nextObject);
</span><span class="cx"> currentObject = nextObject;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTypeSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TypeSet.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TypeSet.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/JavaScriptCore/runtime/TypeSet.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><del>-namespace TypeBuilder {
</del><ins>+namespace Protocol {
</ins><span class="cx"> template<typename T> class Array;
</span><span class="cx">
</span><span class="cx"> namespace Runtime {
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> void markAsFinal();
</span><span class="cx"> void addProperty(RefPtr<StringImpl>);
</span><span class="cx"> String stringRepresentation();
</span><del>- PassRefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> inspectorRepresentation();
</del><ins>+ PassRefPtr<Inspector::Protocol::Runtime::StructureDescription> inspectorRepresentation();
</ins><span class="cx"> void setConstructorName(String name) { m_constructorName = (name.isEmpty() ? "Object" : name); }
</span><span class="cx"> String constructorName() { return m_constructorName; }
</span><span class="cx"> void setProto(PassRefPtr<StructureShape> shape) { m_proto = shape; }
</span><span class="lines">@@ -94,8 +94,8 @@
</span><span class="cx"> static RuntimeType getRuntimeTypeForValue(JSValue);
</span><span class="cx"> JS_EXPORT_PRIVATE String seenTypes() const;
</span><span class="cx"> String displayName() const;
</span><del>- PassRefPtr<Inspector::TypeBuilder::Array<String>> allPrimitiveTypeNames() const;
- PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>> allStructureRepresentations() const;
</del><ins>+ PassRefPtr<Inspector::Protocol::Array<String>> allPrimitiveTypeNames() const;
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> allStructureRepresentations() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> String leastCommonAncestor() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -792,8 +792,8 @@
</span><span class="cx"> ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_backend_dispatcher_implementation.py
</span><span class="cx"> ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_header.py
</span><span class="cx"> ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_implementation.py
</span><del>- ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_type_builder_header.py
- ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_type_builder_implementation.py
</del><ins>+ ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_header.py
+ ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_implementation.py
</ins><span class="cx"> ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator.py
</span><span class="cx"> ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator_templates.py
</span><span class="cx"> ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/__init__.py
</span><span class="lines">@@ -3219,8 +3219,8 @@
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.h
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.cpp
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.h
</span><del>- ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.cpp
- ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.h
</del><ins>+ ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebProtocolTypes.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebProtocolTypes.h
</ins><span class="cx"> ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorWebBackendCommands.js
</span><span class="cx"> MAIN_DEPENDENCY ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json
</span><span class="cx"> DEPENDS ${WebCore_INSPECTOR_PROTOCOL_SCRIPTS}
</span><span class="lines">@@ -3231,7 +3231,7 @@
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.cpp
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.cpp
</span><del>- ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.cpp
</del><ins>+ ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebProtocolTypes.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/ChangeLog 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -1,3 +1,167 @@
</span><ins>+2014-08-24 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: rename Inspector::TypeBuilder to Inspector::Protocol
+ https://bugs.webkit.org/show_bug.cgi?id=136031
+
+ Reviewed by Timothy Hatcher.
+
+ Rename TypeBuilder namespace to Protocol. Disambiguate where
+ necessary. Also rename InspectorTypeBuilder to ProtocolTypes.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * ForwardingHeaders/inspector/InspectorJSTypeBuilders.h: Removed.
+ * ForwardingHeaders/inspector/InspectorTypeBuilder.h: Removed.
+ * WebCore.order:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/CommandLineAPIHost.cpp:
+ (WebCore::CommandLineAPIHost::inspectImpl):
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ (WebCore::InspectorApplicationCacheAgent::getFramesWithManifests):
+ (WebCore::InspectorApplicationCacheAgent::getApplicationCacheForFrame):
+ (WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCache):
+ (WebCore::InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources):
+ (WebCore::InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource):
+ * inspector/InspectorApplicationCacheAgent.h:
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::getMatchedStylesForNode):
+ (WebCore::InspectorCSSAgent::getInlineStylesForNode):
+ (WebCore::InspectorCSSAgent::getComputedStyleForNode):
+ (WebCore::InspectorCSSAgent::getAllStyleSheets):
+ (WebCore::InspectorCSSAgent::getStyleSheet):
+ (WebCore::InspectorCSSAgent::setStyleText):
+ (WebCore::InspectorCSSAgent::setPropertyText):
+ (WebCore::InspectorCSSAgent::toggleProperty):
+ (WebCore::InspectorCSSAgent::setRuleSelector):
+ (WebCore::InspectorCSSAgent::addRule):
+ (WebCore::InspectorCSSAgent::getSupportedCSSProperties):
+ (WebCore::InspectorCSSAgent::getNamedFlowCollection):
+ (WebCore::InspectorCSSAgent::asInspectorStyleSheet):
+ (WebCore::InspectorCSSAgent::collectStyleSheets):
+ (WebCore::InspectorCSSAgent::viaInspectorStyleSheet):
+ (WebCore::InspectorCSSAgent::detectOrigin):
+ (WebCore::InspectorCSSAgent::buildObjectForRule):
+ (WebCore::InspectorCSSAgent::buildArrayForRuleList):
+ (WebCore::InspectorCSSAgent::buildArrayForMatchedRuleList):
+ (WebCore::InspectorCSSAgent::buildObjectForAttributesStyle):
+ (WebCore::InspectorCSSAgent::buildArrayForRegions):
+ (WebCore::InspectorCSSAgent::buildObjectForNamedFlow):
+ * inspector/InspectorCSSAgent.h:
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorDOMAgent::getDocument):
+ (WebCore::InspectorDOMAgent::pushChildNodesToFrontend):
+ (WebCore::InspectorDOMAgent::querySelectorAll):
+ (WebCore::InspectorDOMAgent::pushNodePathToFrontend):
+ (WebCore::InspectorDOMAgent::getEventListenersForNode):
+ (WebCore::InspectorDOMAgent::getAccessibilityPropertiesForNode):
+ (WebCore::InspectorDOMAgent::getSearchResults):
+ (WebCore::InspectorDOMAgent::resolveNode):
+ (WebCore::InspectorDOMAgent::getAttributes):
+ (WebCore::InspectorDOMAgent::buildObjectForNode):
+ (WebCore::InspectorDOMAgent::buildArrayForElementAttributes):
+ (WebCore::InspectorDOMAgent::buildArrayForContainerChildren):
+ (WebCore::InspectorDOMAgent::buildObjectForEventListener):
+ (WebCore::InspectorDOMAgent::processAccessibilityChildren):
+ (WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
+ (WebCore::InspectorDOMAgent::didCommitLoad):
+ (WebCore::InspectorDOMAgent::didInsertDOMNode):
+ (WebCore::InspectorDOMAgent::styleAttributeInvalidated):
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDOMDebuggerAgent.cpp:
+ (WebCore::InspectorDOMDebuggerAgent::descriptionForDOMEvent):
+ * inspector/InspectorDOMStorageAgent.cpp:
+ (WebCore::InspectorDOMStorageAgent::getDOMStorageItems):
+ (WebCore::InspectorDOMStorageAgent::storageId):
+ (WebCore::InspectorDOMStorageAgent::didDispatchDOMStorageEvent):
+ * inspector/InspectorDOMStorageAgent.h:
+ * inspector/InspectorDatabaseAgent.cpp:
+ (WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
+ * inspector/InspectorDatabaseAgent.h:
+ * inspector/InspectorDatabaseResource.cpp:
+ (WebCore::InspectorDatabaseResource::bind):
+ * inspector/InspectorIndexedDBAgent.cpp:
+ * inspector/InspectorLayerTreeAgent.cpp:
+ (WebCore::InspectorLayerTreeAgent::layersForNode):
+ (WebCore::InspectorLayerTreeAgent::gatherLayersUsingRenderObjectHierarchy):
+ (WebCore::InspectorLayerTreeAgent::gatherLayersUsingRenderLayerHierarchy):
+ (WebCore::InspectorLayerTreeAgent::buildObjectForLayer):
+ (WebCore::InspectorLayerTreeAgent::buildObjectForIntRect):
+ (WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer):
+ * inspector/InspectorLayerTreeAgent.h:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::resourceTypeJson):
+ (WebCore::InspectorPageAgent::cachedResourceTypeJson):
+ (WebCore::buildObjectForCookie):
+ (WebCore::buildArrayForCookies):
+ (WebCore::InspectorPageAgent::getCookies):
+ (WebCore::InspectorPageAgent::getResourceTree):
+ (WebCore::InspectorPageAgent::searchInResource):
+ (WebCore::buildObjectForSearchResult):
+ (WebCore::InspectorPageAgent::searchInResources):
+ (WebCore::InspectorPageAgent::buildObjectForFrame):
+ (WebCore::InspectorPageAgent::buildObjectForFrameTree):
+ * inspector/InspectorPageAgent.h:
+ * inspector/InspectorReplayAgent.cpp:
+ (WebCore::buildInspectorObjectForPosition):
+ (WebCore::buildInspectorObjectForInput):
+ (WebCore::buildInspectorObjectForSession):
+ (WebCore::buildInspectorObjectForSessionState):
+ (WebCore::buildInspectorObjectForSegmentState):
+ (WebCore::SerializeInputToJSONFunctor::SerializeInputToJSONFunctor):
+ (WebCore::SerializeInputToJSONFunctor::operator()):
+ (WebCore::buildInspectorObjectForSegment):
+ (WebCore::InspectorReplayAgent::switchSession):
+ (WebCore::InspectorReplayAgent::insertSessionSegment):
+ (WebCore::InspectorReplayAgent::removeSessionSegment):
+ (WebCore::InspectorReplayAgent::currentReplayState):
+ (WebCore::InspectorReplayAgent::getAvailableSessions):
+ (WebCore::InspectorReplayAgent::getSessionData):
+ (WebCore::InspectorReplayAgent::getSegmentData):
+ * inspector/InspectorReplayAgent.h:
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::buildObjectForTiming):
+ (WebCore::buildObjectForResourceRequest):
+ (WebCore::buildObjectForResourceResponse):
+ (WebCore::buildObjectForCachedResource):
+ (WebCore::InspectorResourceAgent::willSendRequest):
+ (WebCore::InspectorResourceAgent::didReceiveResponse):
+ (WebCore::InspectorResourceAgent::didLoadResourceFromMemoryCache):
+ (WebCore::InspectorResourceAgent::buildInitiatorObject):
+ (WebCore::InspectorResourceAgent::willSendWebSocketHandshakeRequest):
+ (WebCore::InspectorResourceAgent::didReceiveWebSocketHandshakeResponse):
+ (WebCore::InspectorResourceAgent::didReceiveWebSocketFrame):
+ (WebCore::InspectorResourceAgent::didSendWebSocketFrame):
+ * inspector/InspectorResourceAgent.h:
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::buildSourceRangeObject):
+ (WebCore::buildMediaObject):
+ (WebCore::fillMediaListChain):
+ (WebCore::InspectorStyle::buildObjectForStyle):
+ (WebCore::InspectorStyle::buildArrayForComputedStyle):
+ (WebCore::InspectorStyle::styleWithProperties):
+ (WebCore::InspectorStyleSheet::create):
+ (WebCore::InspectorStyleSheet::InspectorStyleSheet):
+ (WebCore::InspectorStyleSheet::buildObjectForStyleSheet):
+ (WebCore::InspectorStyleSheet::buildObjectForStyleSheetInfo):
+ (WebCore::selectorsFromSource):
+ (WebCore::InspectorStyleSheet::buildObjectForSelectorList):
+ (WebCore::InspectorStyleSheet::buildObjectForRule):
+ (WebCore::InspectorStyleSheet::buildObjectForStyle):
+ (WebCore::InspectorStyleSheet::resourceStyleSheetText):
+ (WebCore::InspectorStyleSheet::buildArrayForRuleList):
+ (WebCore::InspectorStyleSheetForInlineStyle::create):
+ (WebCore::InspectorStyleSheetForInlineStyle::InspectorStyleSheetForInlineStyle):
+ * inspector/InspectorStyleSheet.h:
+ (WebCore::InspectorStyleSheet::canBind):
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::toProtocol):
+ (WebCore::InspectorTimelineAgent::addRecordToTimeline):
+ (WebCore::InspectorTimelineAgent::sendEvent):
+ * inspector/PageRuntimeAgent.cpp:
+
</ins><span class="cx"> 2014-08-25 Brendan Long <b.long@cablelabs.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] ASSERT failure in WebKitWebSource in StreamingClient
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/DerivedSources.make 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -1172,8 +1172,8 @@
</span><span class="cx"> $(InspectorScripts)/generate_backend_dispatcher_implementation.py \
</span><span class="cx"> $(InspectorScripts)/generate_frontend_dispatcher_header.py \
</span><span class="cx"> $(InspectorScripts)/generate_frontend_dispatcher_implementation.py \
</span><del>- $(InspectorScripts)/generate_type_builder_header.py \
- $(InspectorScripts)/generate_type_builder_implementation.py \
</del><ins>+ $(InspectorScripts)/generate_protocol_types_header.py \
+ $(InspectorScripts)/generate_protocol_types_implementation.py \
</ins><span class="cx"> $(InspectorScripts)/generator_templates.py \
</span><span class="cx"> $(InspectorScripts)/generator.py \
</span><span class="cx"> $(InspectorScripts)/generate-combined-inspector-json.py \
</span></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectorInspectorJSProtocolTypesh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorJSProtocolTypes.h (0 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorJSProtocolTypes.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorJSProtocolTypes.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_InspectorJSProtocolTypes_h
+#define WebCore_FWD_InspectorJSProtocolTypes_h
+#include <JavaScriptCore/InspectorJSProtocolTypes.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectorInspectorJSTypeBuildersh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorJSTypeBuilders.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorJSTypeBuilders.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorJSTypeBuilders.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -1,4 +0,0 @@
</span><del>-#ifndef WebCore_FWD_InspectorJSTypeBuilders_h
-#define WebCore_FWD_InspectorJSTypeBuilders_h
-#include <JavaScriptCore/InspectorJSTypeBuilders.h>
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectorInspectorProtocolTypesh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorProtocolTypes.h (0 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorProtocolTypes.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorProtocolTypes.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_InspectorProtocolTypes_h
+#define WebCore_FWD_InspectorProtocolTypes_h
+#include <JavaScriptCore/InspectorProtocolTypes.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectorInspectorTypeBuilderh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorTypeBuilder.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorTypeBuilder.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/InspectorTypeBuilder.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -1,4 +0,0 @@
</span><del>-#ifndef WebCore_FWD_InspectorTypeBuilder_h
-#define WebCore_FWD_InspectorTypeBuilder_h
-#include <JavaScriptCore/InspectorTypeBuilder.h>
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreWebCoreorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.order (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.order 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/WebCore.order 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -21004,7 +21004,7 @@
</span><span class="cx"> __ZTVN7WebCore19InspectorStyleSheetE
</span><span class="cx"> __ZTVN7WebCore33InspectorStyleSheetForInlineStyleE
</span><span class="cx"> __ZTVN7WebCore22InspectorTimelineAgentE
</span><del>-__ZN7WebCore11TypeBuilderL20enum_constant_valuesE
</del><ins>+__ZN7WebCore8ProtocolL20enum_constant_valuesE
</ins><span class="cx"> __ZTVN7WebCore19InspectorObjectBaseE
</span><span class="cx"> __ZTVN7WebCore18InspectorArrayBaseE
</span><span class="cx"> __ZTVN7WebCore14InspectorValueE
</span><span class="lines">@@ -23996,7 +23996,7 @@
</span><span class="cx"> ___block_descriptor_tmp
</span><span class="cx"> ___block_descriptor_tmp
</span><span class="cx"> ___block_descriptor_tmp
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_9LayerTree5LayerEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_9LayerTree5LayerEEE
</ins><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_23InspectorLayerTreeAgentEEE
</span><span class="cx"> __ZTVN7WebCore15InspectorObjectE
</span><span class="cx"> __ZZN7WebCoreL20guidForOriginAndNameERKN3WTF6StringES3_E14currentNewGUID
</span><span class="lines">@@ -24061,10 +24061,10 @@
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN3JSC19SourceProviderCacheEEE
</span><span class="cx"> __ZTVN7WebCore22CanvasRenderingContextE
</span><span class="cx"> __ZTVN7WebCore9ClipboardE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_7Runtime12RemoteObjectEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_7Runtime12RemoteObjectEEE
</ins><span class="cx"> __ZTVN7WebCore18InjectedScriptBaseE
</span><span class="cx"> __ZTVN7WebCore11ScriptValueE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_4Page11SearchMatchEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_4Page11SearchMatchEEE
</ins><span class="cx"> __ZTVN7WebCore15ContextFeaturesE
</span><span class="cx"> __ZTVN7WebCore21ContextFeaturesClientE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore17CSSPrimitiveValueEEE
</span><span class="lines">@@ -24360,7 +24360,7 @@
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore15GraphicsContextEEE
</span><span class="cx"> __ZTVN7WebCore5TimerINS_11EventSenderINS_11ImageLoaderEEEEE
</span><span class="cx"> __ZTVN7WebCore14InjectedScriptE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_8Debugger9CallFrameEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_8Debugger9CallFrameEEE
</ins><span class="cx"> __ZTVN7WebCore12ScriptObjectE
</span><span class="cx"> __ZTVN7WebCore20InjectedScriptModuleE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore12RenderObjectEEE
</span><span class="lines">@@ -24369,8 +24369,8 @@
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore14RenderOverflowEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore13InlineTextBoxEEE
</span><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_14InspectorAgentEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_16ApplicationCache24ApplicationCacheResourceEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_16ApplicationCache17FrameWithManifestEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_16ApplicationCache24ApplicationCacheResourceEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_16ApplicationCache17FrameWithManifestEEE
</ins><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_30InspectorApplicationCacheAgentEEE
</span><span class="cx"> __ZN7WebCore26InspectorBackendDispatcher12commandNamesE
</span><span class="cx"> __ZZN7WebCore30InspectorBackendDispatcherImpl8dispatchERKN3WTF6StringEE8handlers
</span><span class="lines">@@ -24393,19 +24393,19 @@
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore21InjectedScriptManagerEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore19InstrumentingAgentsEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore14InspectorAgentEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS6RegionEEE
-__ZTVN7WebCore11TypeBuilder5ArrayIiEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS9RuleMatchEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS7CSSRuleEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS9NamedFlowEEE
-__ZTVN7WebCore11TypeBuilder5ArrayIN3WTF6StringEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS15CSSPropertyInfoEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS19CSSStyleSheetHeaderEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS19InheritedStyleEntryEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS15PseudoIdMatchesEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS6RegionEEE
+__ZTVN7WebCore8Protocol5ArrayIiEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS9RuleMatchEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS7CSSRuleEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS9NamedFlowEEE
+__ZTVN7WebCore8Protocol5ArrayIN3WTF6StringEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS15CSSPropertyInfoEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS19CSSStyleSheetHeaderEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS19InheritedStyleEntryEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS15PseudoIdMatchesEEE
</ins><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_17InspectorCSSAgentEEE
</span><span class="cx"> __ZTVN7WebCore5TimerINS_22UpdateRegionLayoutTaskEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS20SelectorProfileEntryEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS20SelectorProfileEntryEEE
</ins><span class="cx"> __ZTVN7WebCore15SelectorProfileE
</span><span class="cx"> __ZTVN7WebCore17InspectorCSSAgent13AddRuleActionE
</span><span class="cx"> __ZTVN7WebCore17InspectorCSSAgent16StyleSheetActionE
</span><span class="lines">@@ -24414,19 +24414,19 @@
</span><span class="cx"> __ZTVN7WebCore17InspectorCSSAgent21SetPropertyTextActionE
</span><span class="cx"> __ZTVN7WebCore17InspectorCSSAgent23SetStyleSheetTextActionE
</span><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorDatabaseAgentEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS_14InspectorValueEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS_14InspectorValueEEE
</ins><span class="cx"> __ZN7WebCoreL12nextUnusedIdE
</span><span class="cx"> __ZN7WebCore22InspectorDebuggerAgent20backtraceObjectGroupE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore15InspectorObjectEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN3JSC9ExecStateEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_8Debugger8LocationEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_8Debugger8LocationEEE
</ins><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorDebuggerAgentEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3DOM13EventListenerEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3DOM4NodeEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_3DOM13EventListenerEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3DOM4NodeEEE
</ins><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_17InspectorDOMAgentEEE
</span><span class="cx"> __ZTVN7WebCore5TimerINS_28RevalidateStyleAttributeTaskEEE
</span><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_25InspectorDOMDebuggerAgentEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS1_IN3WTF6StringEEEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS1_IN3WTF6StringEEEEE
</ins><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_24InspectorDOMStorageAgentEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore11StorageAreaEEE
</span><span class="cx"> __ZTVN7WebCore5TimerINS_28InspectorBackendDispatchTaskEEE
</span><span class="lines">@@ -24437,42 +24437,42 @@
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore31MemoryInstrumentationClientImplEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore25MemoryInstrumentationImplEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore20InspectorMemoryAgentEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_6Memory11MemoryBlockEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_6Memory11MemoryBlockEEE
</ins><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore11MemoryCacheEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperINS_15ArrayBufferViewEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperINS_11ArrayBufferEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_6Memory13ListenerCountEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_6Memory9NodeCountEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_6Memory8DOMGroupEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_6Memory13ListenerCountEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_6Memory9NodeCountEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_6Memory8DOMGroupEEE
</ins><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore7IntRectEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_4Page17FrameResourceTreeEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_4Page17FrameResourceTree9ResourcesEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_4Page12SearchResultEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_4Page6CookieEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_4Page17FrameResourceTreeEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_4Page17FrameResourceTree9ResourcesEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_4Page12SearchResultEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_4Page6CookieEEE
</ins><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_18InspectorPageAgentEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore18ScriptHeapSnapshotEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore13ScriptProfileEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore21InspectorConsoleAgentEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_8Profiler13ProfileHeaderEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_8Profiler13ProfileHeaderEEE
</ins><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorProfilerAgentEEE
</span><span class="cx"> __ZTVN7WebCore19WorkerProfilerAgentE
</span><span class="cx"> __ZTVN7WebCore17PageProfilerAgentE
</span><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorResourceAgentEEE
</span><del>-__ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore11TypeBuilder7Network9InitiatorEEE
</del><ins>+__ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore8Protocol7Network9InitiatorEEE
</ins><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore13XHRReplayDataEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore22ThreadableLoaderClientEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore20NetworkResourcesDataEEE
</span><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_21InspectorRuntimeAgentEEE
</span><span class="cx"> __ZTVN7WebCore14InspectorStateE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS8CSSMediaEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS14ShorthandEntryEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS11CSSPropertyEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS24CSSComputedStylePropertyEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS8CSSMediaEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS14ShorthandEntryEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS11CSSPropertyEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS24CSSComputedStylePropertyEEE
</ins><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorTimelineAgentEEE
</span><del>-__ZN7WebCore11TypeBuilder7Network8Response8MimeTypeE
-__ZN7WebCore11TypeBuilder3CSS11CSSProperty8PriorityE
-__ZN7WebCore11TypeBuilder3CSS11CSSProperty8ParsedOkE
-__ZN7WebCore11TypeBuilder3CSS11CSSProperty6StatusE
</del><ins>+__ZN7WebCore8Protocol7Network8Response8MimeTypeE
+__ZN7WebCore8Protocol3CSS11CSSProperty8PriorityE
+__ZN7WebCore8Protocol3CSS11CSSProperty8ParsedOkE
+__ZN7WebCore8Protocol3CSS11CSSProperty6StatusE
</ins><span class="cx"> __ZN7WebCore20InspectorWorkerAgent21WorkerFrontendChannel8s_nextIdE
</span><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_20InspectorWorkerAgentEEE
</span><span class="cx"> __ZTVN7WebCore20InspectorWorkerAgent21WorkerFrontendChannelE
</span><span class="lines">@@ -26237,7 +26237,7 @@
</span><span class="cx"> __ZTVN7WebCore6ScreenE
</span><span class="cx"> __ZTVN7WebCore24ScriptableDocumentParserE
</span><span class="cx"> __ZTVN3JSC9WeakGCMapIPvNS_8JSObjectENS_33DefaultWeakGCMapFinalizerCallbackIS1_S2_EEN3WTF7PtrHashIS1_EENS5_10HashTraitsIS1_EEEE
</span><del>-__ZTVN7WebCore11TypeBuilder5ArrayINS0_7Console9CallFrameEEE
</del><ins>+__ZTVN7WebCore8Protocol5ArrayINS0_7Console9CallFrameEEE
</ins><span class="cx"> __ZTVN7WebCore5TimerINS_17ScriptDebugServerEEE
</span><span class="cx"> __ZTVN7WebCore5TimerINS_27ScriptedAnimationControllerEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore10FileThreadEEE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -805,7 +805,7 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLNames.cpp" />
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebBackendDispatchers.cpp" />
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.cpp" />
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebTypeBuilders.cpp" />
</del><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.cpp" />
</ins><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -18308,7 +18308,7 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorOverlayPage.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebBackendDispatchers.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.h" />
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebTypeBuilders.h" />
</del><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.h" />
</ins><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSAttr.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSBarProp.h" />
</span><span class="lines">@@ -18865,8 +18865,8 @@
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InspectorFrontendChannel.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSBackendDispatchers.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSFrontendDispatchers.h" />
</span><del>- <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSTypeBuilders.h" />
- <ClInclude Include="..\ForwardingHeaders\inspector\InspectorTypeBuilder.h" />
</del><ins>+ <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSProtocolTypes.h" />
+ <ClInclude Include="..\ForwardingHeaders\inspector\InspectorProtocolTypes.h" />
</ins><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InspectorValues.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\ScriptArguments.h" />
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\ScriptBreakpoint.h" />
</span><span class="lines">@@ -21381,4 +21381,4 @@
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -5203,7 +5203,7 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebTypeBuilders.cpp">
</del><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.cpp">
</ins><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.cpp">
</span><span class="lines">@@ -12309,10 +12309,10 @@
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSFrontendDispatchers.h">
</span><span class="cx"> <Filter>ForwardingHeaders\inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSTypeBuilders.h">
</del><ins>+ <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSProtocolTypes.h">
</ins><span class="cx"> <Filter>ForwardingHeaders\inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\ForwardingHeaders\inspector\InspectorTypeBuilder.h">
</del><ins>+ <ClInclude Include="..\ForwardingHeaders\inspector\InspectorProtocolTypes.h">
</ins><span class="cx"> <Filter>ForwardingHeaders\inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\ForwardingHeaders\inspector\InspectorValues.h">
</span><span class="lines">@@ -13130,7 +13130,7 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebTypeBuilders.h">
</del><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.h">
</ins><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.h">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -2046,9 +2046,9 @@
</span><span class="cx"> 53EF766C16531994004CBE49 /* SettingsMacros.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 53EF766A16530A61004CBE49 /* SettingsMacros.h */; };
</span><span class="cx"> 550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BC7085F6039007353D6 /* QualifiedName.cpp */; };
</span><span class="cx"> 550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 573D134714CE39FF0057ABCA /* InspectorWebTypeBuilders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573D134514CE39FF0057ABCA /* InspectorWebTypeBuilders.cpp */; };
</del><ins>+ 573D134714CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573D134514CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp */; };
</ins><span class="cx"> 578DA20E1520EB8C006141C1 /* InspectorWebFrontendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F4F5FFC11CBD30100A186BF /* InspectorWebFrontendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 578DA20F1520EBA3006141C1 /* InspectorWebTypeBuilders.h in Headers */ = {isa = PBXBuildFile; fileRef = 573D134614CE39FF0057ABCA /* InspectorWebTypeBuilders.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 578DA20F1520EBA3006141C1 /* InspectorWebProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 573D134614CE39FF0057ABCA /* InspectorWebProtocolTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 57B791A314C6A62900F202D1 /* ContentDistributor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B7919F14C6A62900F202D1 /* ContentDistributor.cpp */; };
</span><span class="cx"> 57B791A414C6A62900F202D1 /* ContentDistributor.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B791A014C6A62900F202D1 /* ContentDistributor.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 57CF497414EE36D700ECFF14 /* InsertionPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */; };
</span><span class="lines">@@ -9144,8 +9144,8 @@
</span><span class="cx"> 53EF766A16530A61004CBE49 /* SettingsMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsMacros.h; sourceTree = "<group>"; };
</span><span class="cx"> 550A0BC7085F6039007353D6 /* QualifiedName.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifiedName.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><span class="cx"> 550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</span><del>- 573D134514CE39FF0057ABCA /* InspectorWebTypeBuilders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorWebTypeBuilders.cpp; sourceTree = "<group>"; };
- 573D134614CE39FF0057ABCA /* InspectorWebTypeBuilders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWebTypeBuilders.h; sourceTree = "<group>"; };
</del><ins>+ 573D134514CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorWebProtocolTypes.cpp; sourceTree = "<group>"; };
+ 573D134614CE39FF0057ABCA /* InspectorWebProtocolTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWebProtocolTypes.h; sourceTree = "<group>"; };
</ins><span class="cx"> 57B7919F14C6A62900F202D1 /* ContentDistributor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentDistributor.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 57B791A014C6A62900F202D1 /* ContentDistributor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentDistributor.h; sourceTree = "<group>"; };
</span><span class="cx"> 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InsertionPoint.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -15141,8 +15141,8 @@
</span><span class="cx"> 4F707A9811EF679400ACDA69 /* InspectorWebBackendDispatchers.h */,
</span><span class="cx"> 4F4F5FFA11CBD2D200A186BF /* InspectorWebFrontendDispatchers.cpp */,
</span><span class="cx"> 4F4F5FFC11CBD30100A186BF /* InspectorWebFrontendDispatchers.h */,
</span><del>- 573D134514CE39FF0057ABCA /* InspectorWebTypeBuilders.cpp */,
- 573D134614CE39FF0057ABCA /* InspectorWebTypeBuilders.h */,
</del><ins>+ 573D134514CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp */,
+ 573D134614CE39FF0057ABCA /* InspectorWebProtocolTypes.h */,
</ins><span class="cx"> A584FE391864E2D800843B10 /* JSCommandLineAPIHost.cpp */,
</span><span class="cx"> A584FE3A1864E2D800843B10 /* JSCommandLineAPIHost.h */,
</span><span class="cx"> 7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */,
</span><span class="lines">@@ -24578,7 +24578,7 @@
</span><span class="cx"> A593CF8B1840535200BFCE27 /* InspectorWebAgentBase.h in Headers */,
</span><span class="cx"> 4F707A9A11EF679400ACDA69 /* InspectorWebBackendDispatchers.h in Headers */,
</span><span class="cx"> 578DA20E1520EB8C006141C1 /* InspectorWebFrontendDispatchers.h in Headers */,
</span><del>- 578DA20F1520EBA3006141C1 /* InspectorWebTypeBuilders.h in Headers */,
</del><ins>+ 578DA20F1520EBA3006141C1 /* InspectorWebProtocolTypes.h in Headers */,
</ins><span class="cx"> F3810C1C1365A49600ED6E33 /* InspectorWorkerAgent.h in Headers */,
</span><span class="cx"> F375CC071150D300008DDB81 /* InspectorWorkerResource.h in Headers */,
</span><span class="cx"> F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */,
</span><span class="lines">@@ -28003,7 +28003,7 @@
</span><span class="cx"> 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */,
</span><span class="cx"> 4F707A9911EF679400ACDA69 /* InspectorWebBackendDispatchers.cpp in Sources */,
</span><span class="cx"> 4F4F5FFB11CBD2E100A186BF /* InspectorWebFrontendDispatchers.cpp in Sources */,
</span><del>- 573D134714CE39FF0057ABCA /* InspectorWebTypeBuilders.cpp in Sources */,
</del><ins>+ 573D134714CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp in Sources */,
</ins><span class="cx"> F3810C1B1365A49600ED6E33 /* InspectorWorkerAgent.cpp in Sources */,
</span><span class="cx"> F350B73513F1377D00880C43 /* InstrumentingAgents.cpp in Sources */,
</span><span class="cx"> 2D46F04E17B96FBD005647F0 /* IntPoint.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorCommandLineAPIHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> void CommandLineAPIHost::inspectImpl(PassRefPtr<InspectorValue> object, PassRefPtr<InspectorValue> hints)
</span><span class="cx"> {
</span><span class="cx"> if (m_inspectorAgent) {
</span><del>- RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> remoteObject = BindingTraits<Inspector::TypeBuilder::Runtime::RemoteObject>::runtimeCast(object);
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::RemoteObject> remoteObject = BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(object);
</ins><span class="cx"> m_inspectorAgent->inspect(remoteObject, hints->asObject());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -94,9 +94,9 @@
</span><span class="cx"> m_frontendDispatcher->networkStateUpdated(isNowOnline);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::FrameWithManifest>>& result)
</del><ins>+void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>>& result)
</ins><span class="cx"> {
</span><del>- result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::FrameWithManifest>::create();
</del><ins>+ result = Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>::create();
</ins><span class="cx">
</span><span class="cx"> Frame* mainFrame = m_pageAgent->mainFrame();
</span><span class="cx"> for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext(mainFrame)) {
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
</span><span class="cx"> String manifestURL = info.m_manifest.string();
</span><span class="cx"> if (!manifestURL.isEmpty()) {
</span><del>- RefPtr<Inspector::TypeBuilder::ApplicationCache::FrameWithManifest> value = Inspector::TypeBuilder::ApplicationCache::FrameWithManifest::create()
</del><ins>+ RefPtr<Inspector::Protocol::ApplicationCache::FrameWithManifest> value = Inspector::Protocol::ApplicationCache::FrameWithManifest::create()
</ins><span class="cx"> .setFrameId(m_pageAgent->frameId(frame))
</span><span class="cx"> .setManifestURL(manifestURL)
</span><span class="cx"> .setStatus(static_cast<int>(host->status()));
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> *manifestURL = info.m_manifest.string();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* errorString, const String& frameId, RefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache>& applicationCache)
</del><ins>+void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* errorString, const String& frameId, RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache>& applicationCache)
</ins><span class="cx"> {
</span><span class="cx"> DocumentLoader* documentLoader = assertFrameWithDocumentLoader(errorString, frameId);
</span><span class="cx"> if (!documentLoader)
</span><span class="lines">@@ -151,9 +151,9 @@
</span><span class="cx"> applicationCache = buildObjectForApplicationCache(resources, info);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
</del><ins>+PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
</ins><span class="cx"> {
</span><del>- return Inspector::TypeBuilder::ApplicationCache::ApplicationCache::create()
</del><ins>+ return Inspector::Protocol::ApplicationCache::ApplicationCache::create()
</ins><span class="cx"> .setManifestURL(applicationCacheInfo.m_manifest.string())
</span><span class="cx"> .setSize(applicationCacheInfo.m_size)
</span><span class="cx"> .setCreationTime(applicationCacheInfo.m_creationTime)
</span><span class="lines">@@ -162,9 +162,9 @@
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource>> resources = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> resources = Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>::create();
</ins><span class="cx">
</span><span class="cx"> for (const auto& resourceInfo : applicationCacheResources)
</span><span class="cx"> resources->addItem(buildObjectForApplicationCacheResource(resourceInfo));
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> return resources;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
</del><ins>+PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder types;
</span><span class="cx">
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> if (resourceInfo.m_isExplicit)
</span><span class="cx"> types.appendLiteral("Explicit ");
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource> value = Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource::create()
</del><ins>+ RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> value = Inspector::Protocol::ApplicationCache::ApplicationCacheResource::create()
</ins><span class="cx"> .setUrl(resourceInfo.m_resource.string())
</span><span class="cx"> .setSize(static_cast<int>(resourceInfo.m_size))
</span><span class="cx"> .setType(types.toString());
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -62,14 +62,14 @@
</span><span class="cx"> void networkStateChanged();
</span><span class="cx">
</span><span class="cx"> virtual void enable(ErrorString*) override;
</span><del>- virtual void getFramesWithManifests(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::FrameWithManifest>>& result) override;
</del><ins>+ virtual void getFramesWithManifests(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>>& result) override;
</ins><span class="cx"> virtual void getManifestForFrame(ErrorString*, const String& frameId, String* manifestURL) override;
</span><del>- virtual void getApplicationCacheForFrame(ErrorString*, const String& frameId, RefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache>&) override;
</del><ins>+ virtual void getApplicationCacheForFrame(ErrorString*, const String& frameId, RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache>&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- PassRefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache> buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
- PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource>> buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList&);
- PassRefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource> buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
</del><ins>+ PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache> buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList&);
+ PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
</ins><span class="cx">
</span><span class="cx"> DocumentLoader* assertFrameWithDocumentLoader(ErrorString*, String frameId);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #include "HTMLStyleElement.h"
</span><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="cx"> #include "InspectorHistory.h"
</span><del>-#include "InspectorWebTypeBuilders.h"
</del><ins>+#include "InspectorWebProtocolTypes.h"
</ins><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="cx"> #include "NamedFlowCollection.h"
</span><span class="cx"> #include "Node.h"
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getMatchedStylesForNode(ErrorString* errorString, int nodeId, const bool* includePseudo, const bool* includeInherited, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::PseudoIdMatches>>& pseudoIdMatches, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::InheritedStyleEntry>>& inheritedEntries)
</del><ins>+void InspectorCSSAgent::getMatchedStylesForNode(ErrorString* errorString, int nodeId, const bool* includePseudo, const bool* includeInherited, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>>& pseudoIdMatches, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>>& inheritedEntries)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = elementForId(errorString, nodeId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -613,11 +613,11 @@
</span><span class="cx">
</span><span class="cx"> // Pseudo elements.
</span><span class="cx"> if (!includePseudo || *includePseudo) {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::PseudoIdMatches>> pseudoElements = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::PseudoIdMatches>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>> pseudoElements = Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>::create();
</ins><span class="cx"> for (PseudoId pseudoId = FIRST_PUBLIC_PSEUDOID; pseudoId < AFTER_LAST_INTERNAL_PSEUDOID; pseudoId = static_cast<PseudoId>(pseudoId + 1)) {
</span><span class="cx"> auto matchedRules = styleResolver.pseudoStyleRulesForElement(element, pseudoId, StyleResolver::AllCSSRules);
</span><span class="cx"> if (!matchedRules.isEmpty()) {
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::PseudoIdMatches> matches = Inspector::TypeBuilder::CSS::PseudoIdMatches::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::PseudoIdMatches> matches = Inspector::Protocol::CSS::PseudoIdMatches::create()
</ins><span class="cx"> .setPseudoId(static_cast<int>(pseudoId))
</span><span class="cx"> .setMatches(buildArrayForMatchedRuleList(matchedRules, styleResolver, element));
</span><span class="cx"> pseudoElements->addItem(matches.release());
</span><span class="lines">@@ -629,12 +629,12 @@
</span><span class="cx">
</span><span class="cx"> // Inherited styles.
</span><span class="cx"> if (!includeInherited || *includeInherited) {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::InheritedStyleEntry>> entries = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::InheritedStyleEntry>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>> entries = Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>::create();
</ins><span class="cx"> Element* parentElement = element->parentElement();
</span><span class="cx"> while (parentElement) {
</span><span class="cx"> StyleResolver& parentStyleResolver = parentElement->document().ensureStyleResolver();
</span><span class="cx"> auto parentMatchedRules = parentStyleResolver.styleRulesForElement(parentElement, StyleResolver::AllCSSRules);
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::InheritedStyleEntry> entry = Inspector::TypeBuilder::CSS::InheritedStyleEntry::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::InheritedStyleEntry> entry = Inspector::Protocol::CSS::InheritedStyleEntry::create()
</ins><span class="cx"> .setMatchedCSSRules(buildArrayForMatchedRuleList(parentMatchedRules, styleResolver, parentElement));
</span><span class="cx"> if (parentElement->style() && parentElement->style()->length()) {
</span><span class="cx"> InspectorStyleSheetForInlineStyle* styleSheet = asInspectorStyleSheet(parentElement);
</span><span class="lines">@@ -650,7 +650,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getInlineStylesForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& attributesStyle)
</del><ins>+void InspectorCSSAgent::getInlineStylesForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::Protocol::CSS::CSSStyle>& attributesStyle)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = elementForId(errorString, nodeId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -661,11 +661,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> inlineStyle = styleSheet->buildObjectForStyle(element->style());
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSStyle> attributes = buildObjectForAttributesStyle(element);
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSStyle> attributes = buildObjectForAttributesStyle(element);
</ins><span class="cx"> attributesStyle = attributes ? attributes.release() : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getComputedStyleForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSComputedStyleProperty>>& style)
</del><ins>+void InspectorCSSAgent::getComputedStyleForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>>& style)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = elementForId(errorString, nodeId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -676,9 +676,9 @@
</span><span class="cx"> style = inspectorStyle->buildArrayForComputedStyle();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getAllStyleSheets(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader>>& styleInfos)
</del><ins>+void InspectorCSSAgent::getAllStyleSheets(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>>& styleInfos)
</ins><span class="cx"> {
</span><del>- styleInfos = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader>::create();
</del><ins>+ styleInfos = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>::create();
</ins><span class="cx"> Vector<Document*> documents = m_domAgent->documents();
</span><span class="cx"> for (Vector<Document*>::iterator it = documents.begin(); it != documents.end(); ++it) {
</span><span class="cx"> StyleSheetList* list = (*it)->styleSheets();
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getStyleSheet(ErrorString* errorString, const String& styleSheetId, RefPtr<Inspector::TypeBuilder::CSS::CSSStyleSheetBody>& styleSheetObject)
</del><ins>+void InspectorCSSAgent::getStyleSheet(ErrorString* errorString, const String& styleSheetId, RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody>& styleSheetObject)
</ins><span class="cx"> {
</span><span class="cx"> InspectorStyleSheet* inspectorStyleSheet = assertStyleSheetForId(errorString, styleSheetId);
</span><span class="cx"> if (!inspectorStyleSheet)
</span><span class="lines">@@ -719,7 +719,7 @@
</span><span class="cx"> *errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::setStyleText(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, const String& text, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result)
</del><ins>+void InspectorCSSAgent::setStyleText(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, const String& text, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
</ins><span class="cx"> {
</span><span class="cx"> InspectorCSSId compoundId(fullStyleId);
</span><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="lines">@@ -735,7 +735,7 @@
</span><span class="cx"> *errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::setPropertyText(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result)
</del><ins>+void InspectorCSSAgent::setPropertyText(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
</ins><span class="cx"> {
</span><span class="cx"> InspectorCSSId compoundId(fullStyleId);
</span><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="lines">@@ -751,7 +751,7 @@
</span><span class="cx"> *errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::toggleProperty(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, bool disable, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result)
</del><ins>+void InspectorCSSAgent::toggleProperty(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, bool disable, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
</ins><span class="cx"> {
</span><span class="cx"> InspectorCSSId compoundId(fullStyleId);
</span><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="lines">@@ -767,7 +767,7 @@
</span><span class="cx"> *errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::setRuleSelector(ErrorString* errorString, const RefPtr<InspectorObject>& fullRuleId, const String& selector, RefPtr<Inspector::TypeBuilder::CSS::CSSRule>& result)
</del><ins>+void InspectorCSSAgent::setRuleSelector(ErrorString* errorString, const RefPtr<InspectorObject>& fullRuleId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result)
</ins><span class="cx"> {
</span><span class="cx"> InspectorCSSId compoundId(fullRuleId);
</span><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="lines">@@ -784,7 +784,7 @@
</span><span class="cx"> *errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::addRule(ErrorString* errorString, const int contextNodeId, const String& selector, RefPtr<Inspector::TypeBuilder::CSS::CSSRule>& result)
</del><ins>+void InspectorCSSAgent::addRule(ErrorString* errorString, const int contextNodeId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = m_domAgent->assertNode(errorString, contextNodeId);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -810,12 +810,12 @@
</span><span class="cx"> result = inspectorStyleSheet->buildObjectForRule(rule);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getSupportedCSSProperties(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSPropertyInfo>>& cssProperties)
</del><ins>+void InspectorCSSAgent::getSupportedCSSProperties(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>>& cssProperties)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSPropertyInfo>> properties = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSPropertyInfo>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>> properties = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>::create();
</ins><span class="cx"> for (int i = firstCSSProperty; i <= lastCSSProperty; ++i) {
</span><span class="cx"> CSSPropertyID id = convertToCSSPropertyID(i);
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSPropertyInfo> property = Inspector::TypeBuilder::CSS::CSSPropertyInfo::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSPropertyInfo> property = Inspector::Protocol::CSS::CSSPropertyInfo::create()
</ins><span class="cx"> .setName(getPropertyNameString(id));
</span><span class="cx">
</span><span class="cx"> const StylePropertyShorthand& shorthand = shorthandForProperty(id);
</span><span class="lines">@@ -823,7 +823,7 @@
</span><span class="cx"> properties->addItem(property.release());
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> longhands = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> longhands = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> for (unsigned j = 0; j < shorthand.length(); ++j) {
</span><span class="cx"> CSSPropertyID longhandID = shorthand.properties()[j];
</span><span class="cx"> longhands->addItem(getPropertyNameString(longhandID));
</span><span class="lines">@@ -854,7 +854,7 @@
</span><span class="cx"> element->document().styleResolverChanged(RecalcStyleImmediately);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getNamedFlowCollection(ErrorString* errorString, int documentNodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::NamedFlow>>& result)
</del><ins>+void InspectorCSSAgent::getNamedFlowCollection(ErrorString* errorString, int documentNodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>>& result)
</ins><span class="cx"> {
</span><span class="cx"> Document* document = m_domAgent->assertDocument(errorString, documentNodeId);
</span><span class="cx"> if (!document)
</span><span class="lines">@@ -863,7 +863,7 @@
</span><span class="cx"> m_namedFlowCollectionsRequested.add(documentNodeId);
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<WebKitNamedFlow>> namedFlowsVector = document->namedFlows()->namedFlows();
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::NamedFlow>> namedFlows = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::NamedFlow>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>> namedFlows = Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>::create();
</ins><span class="cx">
</span><span class="cx"> for (Vector<RefPtr<WebKitNamedFlow>>::iterator it = namedFlowsVector.begin(); it != namedFlowsVector.end(); ++it)
</span><span class="cx"> namedFlows->addItem(buildObjectForNamedFlow(errorString, it->get(), documentNodeId));
</span><span class="lines">@@ -880,7 +880,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> String newStyleSheetId = String::number(m_lastStyleSheetId++);
</span><del>- RefPtr<InspectorStyleSheetForInlineStyle> inspectorStyleSheet = InspectorStyleSheetForInlineStyle::create(m_domAgent->pageAgent(), newStyleSheetId, element, Inspector::TypeBuilder::CSS::StyleSheetOrigin::Regular, this);
</del><ins>+ RefPtr<InspectorStyleSheetForInlineStyle> inspectorStyleSheet = InspectorStyleSheetForInlineStyle::create(m_domAgent->pageAgent(), newStyleSheetId, element, Inspector::Protocol::CSS::StyleSheetOrigin::Regular, this);
</ins><span class="cx"> m_idToInspectorStyleSheet.set(newStyleSheetId, inspectorStyleSheet);
</span><span class="cx"> m_nodeToInspectorStyleSheet.set(element, inspectorStyleSheet);
</span><span class="cx"> return inspectorStyleSheet.get();
</span><span class="lines">@@ -912,7 +912,7 @@
</span><span class="cx"> return documentNodeId;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::collectStyleSheets(CSSStyleSheet* styleSheet, Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader>* result)
</del><ins>+void InspectorCSSAgent::collectStyleSheets(CSSStyleSheet* styleSheet, Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>* result)
</ins><span class="cx"> {
</span><span class="cx"> InspectorStyleSheet* inspectorStyleSheet = bindStyleSheet(static_cast<CSSStyleSheet*>(styleSheet));
</span><span class="cx"> result->addItem(inspectorStyleSheet->buildObjectForStyleSheetInfo());
</span><span class="lines">@@ -983,7 +983,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> String id = String::number(m_lastStyleSheetId++);
</span><del>- inspectorStyleSheet = InspectorStyleSheet::create(m_domAgent->pageAgent(), id, cssStyleSheet, Inspector::TypeBuilder::CSS::StyleSheetOrigin::Inspector, InspectorDOMAgent::documentURLString(document), this);
</del><ins>+ inspectorStyleSheet = InspectorStyleSheet::create(m_domAgent->pageAgent(), id, cssStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin::Inspector, InspectorDOMAgent::documentURLString(document), this);
</ins><span class="cx"> m_idToInspectorStyleSheet.set(id, inspectorStyleSheet);
</span><span class="cx"> m_cssStyleSheetToInspectorStyleSheet.set(cssStyleSheet, inspectorStyleSheet);
</span><span class="cx"> m_documentToInspectorStyleSheet.set(document, inspectorStyleSheet);
</span><span class="lines">@@ -1000,22 +1000,22 @@
</span><span class="cx"> return it->value.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Inspector::TypeBuilder::CSS::StyleSheetOrigin InspectorCSSAgent::detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument)
</del><ins>+Inspector::Protocol::CSS::StyleSheetOrigin InspectorCSSAgent::detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument)
</ins><span class="cx"> {
</span><del>- Inspector::TypeBuilder::CSS::StyleSheetOrigin origin = Inspector::TypeBuilder::CSS::StyleSheetOrigin::Regular;
</del><ins>+ Inspector::Protocol::CSS::StyleSheetOrigin origin = Inspector::Protocol::CSS::StyleSheetOrigin::Regular;
</ins><span class="cx"> if (pageStyleSheet && !pageStyleSheet->ownerNode() && pageStyleSheet->href().isEmpty())
</span><del>- origin = Inspector::TypeBuilder::CSS::StyleSheetOrigin::UserAgent;
</del><ins>+ origin = Inspector::Protocol::CSS::StyleSheetOrigin::UserAgent;
</ins><span class="cx"> else if (pageStyleSheet && pageStyleSheet->ownerNode() && pageStyleSheet->ownerNode()->nodeName() == "#document")
</span><del>- origin = Inspector::TypeBuilder::CSS::StyleSheetOrigin::User;
</del><ins>+ origin = Inspector::Protocol::CSS::StyleSheetOrigin::User;
</ins><span class="cx"> else {
</span><span class="cx"> InspectorStyleSheet* viaInspectorStyleSheetForOwner = viaInspectorStyleSheet(ownerDocument, false);
</span><span class="cx"> if (viaInspectorStyleSheetForOwner && pageStyleSheet == viaInspectorStyleSheetForOwner->pageStyleSheet())
</span><del>- origin = Inspector::TypeBuilder::CSS::StyleSheetOrigin::Inspector;
</del><ins>+ origin = Inspector::Protocol::CSS::StyleSheetOrigin::Inspector;
</ins><span class="cx"> }
</span><span class="cx"> return origin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(StyleRule* styleRule, StyleResolver& styleResolver)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(StyleRule* styleRule, StyleResolver& styleResolver)
</ins><span class="cx"> {
</span><span class="cx"> if (!styleRule)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1029,7 +1029,7 @@
</span><span class="cx"> return inspectorStyleSheet ? inspectorStyleSheet->buildObjectForRule(cssomWrapper) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(CSSStyleRule* rule)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(CSSStyleRule* rule)
</ins><span class="cx"> {
</span><span class="cx"> if (!rule)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1039,15 +1039,15 @@
</span><span class="cx"> return inspectorStyleSheet ? inspectorStyleSheet->buildObjectForRule(rule) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>> InspectorCSSAgent::buildArrayForRuleList(CSSRuleList* ruleList)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> InspectorCSSAgent::buildArrayForRuleList(CSSRuleList* ruleList)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>> result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> result = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>::create();
</ins><span class="cx"> if (!ruleList)
</span><span class="cx"> return result.release();
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0, size = ruleList->length(); i < size; ++i) {
</span><span class="cx"> CSSStyleRule* rule = asCSSStyleRule(ruleList->item(i));
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSRule> ruleObject = buildObjectForRule(rule);
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSRule> ruleObject = buildObjectForRule(rule);
</ins><span class="cx"> if (!ruleObject)
</span><span class="cx"> continue;
</span><span class="cx"> result->addItem(ruleObject);
</span><span class="lines">@@ -1055,18 +1055,18 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>> InspectorCSSAgent::buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>& matchedRules, StyleResolver& styleResolver, Element* element)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> InspectorCSSAgent::buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>& matchedRules, StyleResolver& styleResolver, Element* element)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>> result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> result = Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>::create();
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < matchedRules.size(); ++i) {
</span><span class="cx"> if (!matchedRules[i]->isStyleRule())
</span><span class="cx"> continue;
</span><span class="cx"> StyleRule* matchedStyleRule = static_cast<StyleRule*>(matchedRules[i].get());
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSRule> ruleObject = buildObjectForRule(matchedStyleRule, styleResolver);
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSRule> ruleObject = buildObjectForRule(matchedStyleRule, styleResolver);
</ins><span class="cx"> if (!ruleObject)
</span><span class="cx"> continue;
</span><del>- RefPtr<Inspector::TypeBuilder::Array<int>> matchingSelectors = Inspector::TypeBuilder::Array<int>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<int>> matchingSelectors = Inspector::Protocol::Array<int>::create();
</ins><span class="cx"> const CSSSelectorList& selectorList = matchedStyleRule->selectorList();
</span><span class="cx"> long index = 0;
</span><span class="cx"> for (const CSSSelector* selector = selectorList.first(); selector; selector = CSSSelectorList::next(selector)) {
</span><span class="lines">@@ -1075,7 +1075,7 @@
</span><span class="cx"> matchingSelectors->addItem(index);
</span><span class="cx"> ++index;
</span><span class="cx"> }
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::RuleMatch> match = Inspector::TypeBuilder::CSS::RuleMatch::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::RuleMatch> match = Inspector::Protocol::CSS::RuleMatch::create()
</ins><span class="cx"> .setRule(ruleObject)
</span><span class="cx"> .setMatchingSelectors(matchingSelectors);
</span><span class="cx"> result->addItem(match);
</span><span class="lines">@@ -1084,7 +1084,7 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyle> InspectorCSSAgent::buildObjectForAttributesStyle(Element* element)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorCSSAgent::buildObjectForAttributesStyle(Element* element)
</ins><span class="cx"> {
</span><span class="cx"> if (!element->isStyledElement())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1101,22 +1101,22 @@
</span><span class="cx"> return inspectorStyle->buildObjectForStyle();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::Region>> InspectorCSSAgent::buildArrayForRegions(ErrorString* errorString, PassRefPtr<NodeList> regionList, int documentNodeId)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> InspectorCSSAgent::buildArrayForRegions(ErrorString* errorString, PassRefPtr<NodeList> regionList, int documentNodeId)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::Region>> regions = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::Region>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> regions = Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>::create();
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < regionList->length(); ++i) {
</span><del>- Inspector::TypeBuilder::CSS::Region::RegionOverset regionOverset;
</del><ins>+ Inspector::Protocol::CSS::Region::RegionOverset regionOverset;
</ins><span class="cx">
</span><span class="cx"> switch (toElement(regionList->item(i))->regionOversetState()) {
</span><span class="cx"> case RegionFit:
</span><del>- regionOverset = Inspector::TypeBuilder::CSS::Region::RegionOverset::Fit;
</del><ins>+ regionOverset = Inspector::Protocol::CSS::Region::RegionOverset::Fit;
</ins><span class="cx"> break;
</span><span class="cx"> case RegionEmpty:
</span><del>- regionOverset = Inspector::TypeBuilder::CSS::Region::RegionOverset::Empty;
</del><ins>+ regionOverset = Inspector::Protocol::CSS::Region::RegionOverset::Empty;
</ins><span class="cx"> break;
</span><span class="cx"> case RegionOverset:
</span><del>- regionOverset = Inspector::TypeBuilder::CSS::Region::RegionOverset::Overset;
</del><ins>+ regionOverset = Inspector::Protocol::CSS::Region::RegionOverset::Overset;
</ins><span class="cx"> break;
</span><span class="cx"> case RegionUndefined:
</span><span class="cx"> continue;
</span><span class="lines">@@ -1125,7 +1125,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::Region> region = Inspector::TypeBuilder::CSS::Region::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::Region> region = Inspector::Protocol::CSS::Region::create()
</ins><span class="cx"> .setRegionOverset(regionOverset)
</span><span class="cx"> // documentNodeId was previously asserted
</span><span class="cx"> .setNodeId(m_domAgent->pushNodeToFrontend(errorString, documentNodeId, regionList->item(i)));
</span><span class="lines">@@ -1136,17 +1136,17 @@
</span><span class="cx"> return regions.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::CSS::NamedFlow> InspectorCSSAgent::buildObjectForNamedFlow(ErrorString* errorString, WebKitNamedFlow* webkitNamedFlow, int documentNodeId)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::NamedFlow> InspectorCSSAgent::buildObjectForNamedFlow(ErrorString* errorString, WebKitNamedFlow* webkitNamedFlow, int documentNodeId)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<NodeList> contentList = webkitNamedFlow->getContent();
</span><del>- RefPtr<Inspector::TypeBuilder::Array<int>> content = Inspector::TypeBuilder::Array<int>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<int>> content = Inspector::Protocol::Array<int>::create();
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < contentList->length(); ++i) {
</span><span class="cx"> // documentNodeId was previously asserted
</span><span class="cx"> content->addItem(m_domAgent->pushNodeToFrontend(errorString, documentNodeId, contentList->item(i)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::NamedFlow> namedFlow = Inspector::TypeBuilder::CSS::NamedFlow::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::NamedFlow> namedFlow = Inspector::Protocol::CSS::NamedFlow::create()
</ins><span class="cx"> .setDocumentNodeId(documentNodeId)
</span><span class="cx"> .setName(webkitNamedFlow->name().string())
</span><span class="cx"> .setOverset(webkitNamedFlow->overset())
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -109,21 +109,21 @@
</span><span class="cx"> void didRegisterNamedFlowContentElement(Document*, WebKitNamedFlow*, Node* contentElement, Node* nextContentElement = nullptr);
</span><span class="cx"> void didUnregisterNamedFlowContentElement(Document*, WebKitNamedFlow*, Node* contentElement);
</span><span class="cx">
</span><del>- virtual void getComputedStyleForNode(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSComputedStyleProperty>>&) override;
- virtual void getInlineStylesForNode(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& attributes) override;
- virtual void getMatchedStylesForNode(ErrorString*, int nodeId, const bool* includePseudo, const bool* includeInherited, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::PseudoIdMatches>>& pseudoIdMatches, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::InheritedStyleEntry>>& inheritedEntries) override;
- virtual void getAllStyleSheets(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader>>& styleSheetInfos) override;
- virtual void getStyleSheet(ErrorString*, const String& styleSheetId, RefPtr<Inspector::TypeBuilder::CSS::CSSStyleSheetBody>& result) override;
</del><ins>+ virtual void getComputedStyleForNode(ErrorString*, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>>&) override;
+ virtual void getInlineStylesForNode(ErrorString*, int nodeId, RefPtr<Inspector::Protocol::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::Protocol::CSS::CSSStyle>& attributes) override;
+ virtual void getMatchedStylesForNode(ErrorString*, int nodeId, const bool* includePseudo, const bool* includeInherited, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>>& pseudoIdMatches, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>>& inheritedEntries) override;
+ virtual void getAllStyleSheets(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>>& styleSheetInfos) override;
+ virtual void getStyleSheet(ErrorString*, const String& styleSheetId, RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody>& result) override;
</ins><span class="cx"> virtual void getStyleSheetText(ErrorString*, const String& styleSheetId, String* result) override;
</span><span class="cx"> virtual void setStyleSheetText(ErrorString*, const String& styleSheetId, const String& text) override;
</span><del>- virtual void setStyleText(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, const String& text, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result) override;
- virtual void setPropertyText(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result) override;
- virtual void toggleProperty(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, bool disable, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result) override;
- virtual void setRuleSelector(ErrorString*, const RefPtr<Inspector::InspectorObject>& ruleId, const String& selector, RefPtr<Inspector::TypeBuilder::CSS::CSSRule>& result) override;
- virtual void addRule(ErrorString*, int contextNodeId, const String& selector, RefPtr<Inspector::TypeBuilder::CSS::CSSRule>& result) override;
- virtual void getSupportedCSSProperties(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSPropertyInfo>>& result) override;
</del><ins>+ virtual void setStyleText(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, const String& text, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
+ virtual void setPropertyText(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
+ virtual void toggleProperty(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, bool disable, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
+ virtual void setRuleSelector(ErrorString*, const RefPtr<Inspector::InspectorObject>& ruleId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result) override;
+ virtual void addRule(ErrorString*, int contextNodeId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result) override;
+ virtual void getSupportedCSSProperties(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>>& result) override;
</ins><span class="cx"> virtual void forcePseudoState(ErrorString*, int nodeId, const RefPtr<Inspector::InspectorArray>& forcedPseudoClasses) override;
</span><del>- virtual void getNamedFlowCollection(ErrorString*, int documentNodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::NamedFlow>>& result) override;
</del><ins>+ virtual void getNamedFlowCollection(ErrorString*, int documentNodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>>& result) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> class StyleSheetAction;
</span><span class="lines">@@ -144,20 +144,20 @@
</span><span class="cx"> InspectorStyleSheetForInlineStyle* asInspectorStyleSheet(Element* element);
</span><span class="cx"> Element* elementForId(ErrorString*, int nodeId);
</span><span class="cx"> int documentNodeWithRequestedFlowsId(Document*);
</span><del>- void collectStyleSheets(CSSStyleSheet*, Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader>*);
</del><ins>+ void collectStyleSheets(CSSStyleSheet*, Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>*);
</ins><span class="cx">
</span><span class="cx"> InspectorStyleSheet* bindStyleSheet(CSSStyleSheet*);
</span><span class="cx"> InspectorStyleSheet* viaInspectorStyleSheet(Document*, bool createIfAbsent);
</span><span class="cx"> InspectorStyleSheet* assertStyleSheetForId(ErrorString*, const String&);
</span><del>- Inspector::TypeBuilder::CSS::StyleSheetOrigin detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument);
</del><ins>+ Inspector::Protocol::CSS::StyleSheetOrigin detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument);
</ins><span class="cx">
</span><del>- PassRefPtr<Inspector::TypeBuilder::CSS::CSSRule> buildObjectForRule(StyleRule*, StyleResolver&);
- PassRefPtr<Inspector::TypeBuilder::CSS::CSSRule> buildObjectForRule(CSSStyleRule*);
- PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>> buildArrayForRuleList(CSSRuleList*);
- PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>> buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>&, StyleResolver&, Element*);
- PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyle> buildObjectForAttributesStyle(Element*);
- PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::Region>> buildArrayForRegions(ErrorString*, PassRefPtr<NodeList>, int documentNodeId);
- PassRefPtr<Inspector::TypeBuilder::CSS::NamedFlow> buildObjectForNamedFlow(ErrorString*, WebKitNamedFlow*, int documentNodeId);
</del><ins>+ PassRefPtr<Inspector::Protocol::CSS::CSSRule> buildObjectForRule(StyleRule*, StyleResolver&);
+ PassRefPtr<Inspector::Protocol::CSS::CSSRule> buildObjectForRule(CSSStyleRule*);
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> buildArrayForRuleList(CSSRuleList*);
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>&, StyleResolver&, Element*);
+ PassRefPtr<Inspector::Protocol::CSS::CSSStyle> buildObjectForAttributesStyle(Element*);
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> buildArrayForRegions(ErrorString*, PassRefPtr<NodeList>, int documentNodeId);
+ PassRefPtr<Inspector::Protocol::CSS::NamedFlow> buildObjectForNamedFlow(ErrorString*, WebKitNamedFlow*, int documentNodeId);
</ins><span class="cx">
</span><span class="cx"> // InspectorDOMAgent::DOMListener implementation
</span><span class="cx"> virtual void didRemoveDocument(Document*) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> ASSERT(!m_searchingForNode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</del><ins>+void InspectorDOMAgent::didCreateFrontendAndBackend(InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
</ins><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher = std::make_unique<InspectorDOMFrontendDispatcher>(frontendChannel);
</span><span class="cx"> m_backendDispatcher = InspectorDOMBackendDispatcher::create(backendDispatcher, this);
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> return element;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::getDocument(ErrorString* errorString, RefPtr<Inspector::TypeBuilder::DOM::Node>& root)
</del><ins>+void InspectorDOMAgent::getDocument(ErrorString* errorString, RefPtr<Inspector::Protocol::DOM::Node>& root)
</ins><span class="cx"> {
</span><span class="cx"> m_documentRequested = true;
</span><span class="cx">
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodeMap);
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodeMap);
</ins><span class="cx"> m_frontendDispatcher->setChildNodes(nodeId, children.release());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> *elementId = pushNodePathToFrontend(element.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::querySelectorAll(ErrorString* errorString, int nodeId, const String& selectors, RefPtr<Inspector::TypeBuilder::Array<int>>& result)
</del><ins>+void InspectorDOMAgent::querySelectorAll(ErrorString* errorString, int nodeId, const String& selectors, RefPtr<Inspector::Protocol::Array<int>>& result)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- result = Inspector::TypeBuilder::Array<int>::create();
</del><ins>+ result = Inspector::Protocol::Array<int>::create();
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < nodes->length(); ++i)
</span><span class="cx"> result->addItem(pushNodePathToFrontend(nodes->item(i)));
</span><span class="lines">@@ -588,7 +588,7 @@
</span><span class="cx"> auto newMap = std::make_unique<NodeToIdMap>();
</span><span class="cx"> danglingMap = newMap.get();
</span><span class="cx"> m_danglingNodeToIdMaps.append(newMap.release());
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> children = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
</ins><span class="cx"> children->addItem(buildObjectForNode(node, 0, danglingMap));
</span><span class="cx"> m_frontendDispatcher->setChildNodes(0, children);
</span><span class="cx"> break;
</span><span class="lines">@@ -809,9 +809,9 @@
</span><span class="cx"> m_domEditor->replaceWholeText(toText(node), value, errorString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::getEventListenersForNode(ErrorString* errorString, int nodeId, const String* objectGroup, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::EventListener>>& listenersArray)
</del><ins>+void InspectorDOMAgent::getEventListenersForNode(ErrorString* errorString, int nodeId, const String* objectGroup, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>>& listenersArray)
</ins><span class="cx"> {
</span><del>- listenersArray = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::EventListener>::create();
</del><ins>+ listenersArray = Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>::create();
</ins><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="lines">@@ -876,7 +876,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::getAccessibilityPropertiesForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::TypeBuilder::DOM::AccessibilityProperties>& axProperties)
</del><ins>+void InspectorDOMAgent::getAccessibilityPropertiesForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::DOM::AccessibilityProperties>& axProperties)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -926,7 +926,7 @@
</span><span class="cx"> *resultCount = resultsVector.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::getSearchResults(ErrorString* errorString, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::TypeBuilder::Array<int>>& nodeIds)
</del><ins>+void InspectorDOMAgent::getSearchResults(ErrorString* errorString, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::Protocol::Array<int>>& nodeIds)
</ins><span class="cx"> {
</span><span class="cx"> SearchResults::iterator it = m_searchResults.find(searchId);
</span><span class="cx"> if (it == m_searchResults.end()) {
</span><span class="lines">@@ -940,7 +940,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- nodeIds = Inspector::TypeBuilder::Array<int>::create();
</del><ins>+ nodeIds = Inspector::Protocol::Array<int>::create();
</ins><span class="cx"> for (int i = fromIndex; i < toIndex; ++i)
</span><span class="cx"> nodeIds->addItem(pushNodePathToFrontend((it->value)[i].get()));
</span><span class="cx"> }
</span><span class="lines">@@ -1186,7 +1186,7 @@
</span><span class="cx"> element->focus();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::resolveNode(ErrorString* errorString, int nodeId, const String* const objectGroup, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result)
</del><ins>+void InspectorDOMAgent::resolveNode(ErrorString* errorString, int nodeId, const String* const objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result)
</ins><span class="cx"> {
</span><span class="cx"> String objectGroupName = objectGroup ? *objectGroup : "";
</span><span class="cx"> Node* node = nodeForId(nodeId);
</span><span class="lines">@@ -1194,7 +1194,7 @@
</span><span class="cx"> *errorString = "No node with given id found";
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> object = resolveNode(node, objectGroupName);
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::RemoteObject> object = resolveNode(node, objectGroupName);
</ins><span class="cx"> if (!object) {
</span><span class="cx"> *errorString = "Node with given id does not belong to the document";
</span><span class="cx"> return;
</span><span class="lines">@@ -1202,7 +1202,7 @@
</span><span class="cx"> result = object;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::getAttributes(ErrorString* errorString, int nodeId, RefPtr<Inspector::TypeBuilder::Array<String>>& result)
</del><ins>+void InspectorDOMAgent::getAttributes(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::Array<String>>& result)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = assertElement(errorString, nodeId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -1233,7 +1233,7 @@
</span><span class="cx"> return document->completeURL("").string();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* node, int depth, NodeToIdMap* nodesMap)
</del><ins>+PassRefPtr<Inspector::Protocol::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* node, int depth, NodeToIdMap* nodesMap)
</ins><span class="cx"> {
</span><span class="cx"> int id = bind(node, nodesMap);
</span><span class="cx"> String nodeName;
</span><span class="lines">@@ -1262,7 +1262,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::DOM::Node> value = Inspector::TypeBuilder::DOM::Node::create()
</del><ins>+ RefPtr<Inspector::Protocol::DOM::Node> value = Inspector::Protocol::DOM::Node::create()
</ins><span class="cx"> .setNodeId(id)
</span><span class="cx"> .setNodeType(static_cast<int>(node->nodeType()))
</span><span class="cx"> .setNodeName(nodeName)
</span><span class="lines">@@ -1272,7 +1272,7 @@
</span><span class="cx"> if (node->isContainerNode()) {
</span><span class="cx"> int nodeCount = innerChildNodeCount(node);
</span><span class="cx"> value->setChildNodeCount(nodeCount);
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodesMap);
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodesMap);
</ins><span class="cx"> if (children->length() > 0)
</span><span class="cx"> value->setChildren(children.release());
</span><span class="cx"> }
</span><span class="lines">@@ -1291,7 +1291,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (ShadowRoot* root = element->shadowRoot()) {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> shadowRoots = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> shadowRoots = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
</ins><span class="cx"> shadowRoots->addItem(buildObjectForNode(root, 0, nodesMap));
</span><span class="cx"> value->setShadowRoots(shadowRoots);
</span><span class="cx"> }
</span><span class="lines">@@ -1329,9 +1329,9 @@
</span><span class="cx"> return value.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<String>> InspectorDOMAgent::buildArrayForElementAttributes(Element* element)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<String>> InspectorDOMAgent::buildArrayForElementAttributes(Element* element)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> attributesValue = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> attributesValue = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> // Go through all attributes and serialize them.
</span><span class="cx"> if (!element->hasAttributes())
</span><span class="cx"> return attributesValue.release();
</span><span class="lines">@@ -1343,9 +1343,9 @@
</span><span class="cx"> return attributesValue.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> InspectorDOMAgent::buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> InspectorDOMAgent::buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> children = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
</ins><span class="cx"> if (depth == 0) {
</span><span class="cx"> // Special-case the only text child - pretend that container's children have been requested.
</span><span class="cx"> Node* firstChild = container->firstChild();
</span><span class="lines">@@ -1367,7 +1367,7 @@
</span><span class="cx"> return children.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::DOM::EventListener> InspectorDOMAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, const AtomicString& eventType, Node* node, const String* objectGroupId)
</del><ins>+PassRefPtr<Inspector::Protocol::DOM::EventListener> InspectorDOMAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, const AtomicString& eventType, Node* node, const String* objectGroupId)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<EventListener> eventListener = registeredEventListener.listener;
</span><span class="cx">
</span><span class="lines">@@ -1395,7 +1395,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::DOM::EventListener> value = Inspector::TypeBuilder::DOM::EventListener::create()
</del><ins>+ RefPtr<Inspector::Protocol::DOM::EventListener> value = Inspector::Protocol::DOM::EventListener::create()
</ins><span class="cx"> .setType(eventType)
</span><span class="cx"> .setUseCapture(registeredEventListener.useCapture)
</span><span class="cx"> .setIsAttribute(eventListener->isAttribute())
</span><span class="lines">@@ -1407,7 +1407,7 @@
</span><span class="cx"> value->setHandler(injectedScript.wrapObject(Deprecated::ScriptValue(state->vm(), handler), *objectGroupId));
</span><span class="cx"> }
</span><span class="cx"> if (!scriptID.isNull()) {
</span><del>- RefPtr<Inspector::TypeBuilder::Debugger::Location> location = Inspector::TypeBuilder::Debugger::Location::create()
</del><ins>+ RefPtr<Inspector::Protocol::Debugger::Location> location = Inspector::Protocol::Debugger::Location::create()
</ins><span class="cx"> .setScriptId(scriptID)
</span><span class="cx"> .setLineNumber(lineNumber);
</span><span class="cx"> value->setLocation(location.release());
</span><span class="lines">@@ -1417,14 +1417,14 @@
</span><span class="cx"> return value.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::processAccessibilityChildren(PassRefPtr<AccessibilityObject> axObject, RefPtr<Inspector::TypeBuilder::Array<int>>& childNodeIds)
</del><ins>+void InspectorDOMAgent::processAccessibilityChildren(PassRefPtr<AccessibilityObject> axObject, RefPtr<Inspector::Protocol::Array<int>>& childNodeIds)
</ins><span class="cx"> {
</span><span class="cx"> const auto& children = axObject->children();
</span><span class="cx"> if (!children.size())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!childNodeIds)
</span><del>- childNodeIds = Inspector::TypeBuilder::Array<int>::create();
</del><ins>+ childNodeIds = Inspector::Protocol::Array<int>::create();
</ins><span class="cx">
</span><span class="cx"> for (const auto& childObject : children) {
</span><span class="cx"> if (Node* childNode = childObject->node())
</span><span class="lines">@@ -1434,7 +1434,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<TypeBuilder::DOM::AccessibilityProperties> InspectorDOMAgent::buildObjectForAccessibilityProperties(Node* node)
</del><ins>+PassRefPtr<Inspector::Protocol::DOM::AccessibilityProperties> InspectorDOMAgent::buildObjectForAccessibilityProperties(Node* node)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(node);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -1445,31 +1445,31 @@
</span><span class="cx">
</span><span class="cx"> Node* activeDescendantNode = nullptr;
</span><span class="cx"> bool busy = false;
</span><del>- TypeBuilder::DOM::AccessibilityProperties::Checked checked = TypeBuilder::DOM::AccessibilityProperties::Checked::False;
- RefPtr<Inspector::TypeBuilder::Array<int>> childNodeIds;
- RefPtr<Inspector::TypeBuilder::Array<int>> controlledNodeIds;
</del><ins>+ Inspector::Protocol::DOM::AccessibilityProperties::Checked checked = Inspector::Protocol::DOM::AccessibilityProperties::Checked::False;
+ RefPtr<Inspector::Protocol::Array<int>> childNodeIds;
+ RefPtr<Inspector::Protocol::Array<int>> controlledNodeIds;
</ins><span class="cx"> bool exists = false;
</span><span class="cx"> bool expanded = false;
</span><span class="cx"> bool disabled = false;
</span><del>- RefPtr<Inspector::TypeBuilder::Array<int>> flowedNodeIds;
</del><ins>+ RefPtr<Inspector::Protocol::Array<int>> flowedNodeIds;
</ins><span class="cx"> bool focused = false;
</span><span class="cx"> bool ignored = true;
</span><span class="cx"> bool ignoredByDefault = false;
</span><del>- TypeBuilder::DOM::AccessibilityProperties::Invalid invalid = TypeBuilder::DOM::AccessibilityProperties::Invalid::False;
</del><ins>+ Inspector::Protocol::DOM::AccessibilityProperties::Invalid invalid = Inspector::Protocol::DOM::AccessibilityProperties::Invalid::False;
</ins><span class="cx"> bool hidden = false;
</span><span class="cx"> String label;
</span><span class="cx"> bool liveRegionAtomic = false;
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> liveRegionRelevant;
- TypeBuilder::DOM::AccessibilityProperties::LiveRegionStatus liveRegionStatus = TypeBuilder::DOM::AccessibilityProperties::LiveRegionStatus::Off;
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> liveRegionRelevant;
+ Inspector::Protocol::DOM::AccessibilityProperties::LiveRegionStatus liveRegionStatus = Inspector::Protocol::DOM::AccessibilityProperties::LiveRegionStatus::Off;
</ins><span class="cx"> Node* mouseEventNode = nullptr;
</span><del>- RefPtr<Inspector::TypeBuilder::Array<int>> ownedNodeIds;
</del><ins>+ RefPtr<Inspector::Protocol::Array<int>> ownedNodeIds;
</ins><span class="cx"> Node* parentNode = nullptr;
</span><span class="cx"> bool pressed = false;
</span><span class="cx"> bool readonly = false;
</span><span class="cx"> bool required = false;
</span><span class="cx"> String role;
</span><span class="cx"> bool selected = false;
</span><del>- RefPtr<Inspector::TypeBuilder::Array<int>> selectedChildNodeIds;
</del><ins>+ RefPtr<Inspector::Protocol::Array<int>> selectedChildNodeIds;
</ins><span class="cx"> bool supportsChecked = false;
</span><span class="cx"> bool supportsExpanded = false;
</span><span class="cx"> bool supportsLiveRegion = false;
</span><span class="lines">@@ -1494,11 +1494,11 @@
</span><span class="cx"> if (supportsChecked) {
</span><span class="cx"> int checkValue = axObject->checkboxOrRadioValue(); // Element using aria-checked.
</span><span class="cx"> if (checkValue == 1)
</span><del>- checked = TypeBuilder::DOM::AccessibilityProperties::Checked::True;
</del><ins>+ checked = Inspector::Protocol::DOM::AccessibilityProperties::Checked::True;
</ins><span class="cx"> else if (checkValue == 2)
</span><del>- checked = TypeBuilder::DOM::AccessibilityProperties::Checked::Mixed;
</del><ins>+ checked = Inspector::Protocol::DOM::AccessibilityProperties::Checked::Mixed;
</ins><span class="cx"> else if (axObject->isChecked()) // Native checkbox.
</span><del>- checked = TypeBuilder::DOM::AccessibilityProperties::Checked::True;
</del><ins>+ checked = Inspector::Protocol::DOM::AccessibilityProperties::Checked::True;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> processAccessibilityChildren(axObject, childNodeIds);
</span><span class="lines">@@ -1507,7 +1507,7 @@
</span><span class="cx"> Vector<Element*> controlledElements;
</span><span class="cx"> axObject->elementsFromAttribute(controlledElements, aria_controlsAttr);
</span><span class="cx"> if (controlledElements.size()) {
</span><del>- controlledNodeIds = Inspector::TypeBuilder::Array<int>::create();
</del><ins>+ controlledNodeIds = Inspector::Protocol::Array<int>::create();
</ins><span class="cx"> for (Element* controlledElement : controlledElements)
</span><span class="cx"> controlledNodeIds->addItem(pushNodePathToFrontend(controlledElement));
</span><span class="cx"> }
</span><span class="lines">@@ -1524,7 +1524,7 @@
</span><span class="cx"> Vector<Element*> flowedElements;
</span><span class="cx"> axObject->elementsFromAttribute(flowedElements, aria_flowtoAttr);
</span><span class="cx"> if (flowedElements.size()) {
</span><del>- flowedNodeIds = Inspector::TypeBuilder::Array<int>::create();
</del><ins>+ flowedNodeIds = Inspector::Protocol::Array<int>::create();
</ins><span class="cx"> for (Element* flowedElement : flowedElements)
</span><span class="cx"> flowedNodeIds->addItem(pushNodePathToFrontend(flowedElement));
</span><span class="cx"> }
</span><span class="lines">@@ -1541,13 +1541,13 @@
</span><span class="cx">
</span><span class="cx"> String invalidValue = axObject->invalidStatus();
</span><span class="cx"> if (invalidValue == "false")
</span><del>- invalid = TypeBuilder::DOM::AccessibilityProperties::Invalid::False;
</del><ins>+ invalid = Inspector::Protocol::DOM::AccessibilityProperties::Invalid::False;
</ins><span class="cx"> else if (invalidValue == "grammar")
</span><del>- invalid = TypeBuilder::DOM::AccessibilityProperties::Invalid::Grammar;
</del><ins>+ invalid = Inspector::Protocol::DOM::AccessibilityProperties::Invalid::Grammar;
</ins><span class="cx"> else if (invalidValue == "spelling")
</span><del>- invalid = TypeBuilder::DOM::AccessibilityProperties::Invalid::Spelling;
</del><ins>+ invalid = Inspector::Protocol::DOM::AccessibilityProperties::Invalid::Spelling;
</ins><span class="cx"> else // Future versions of ARIA may allow additional truthy values. Ex. format, order, or size.
</span><del>- invalid = TypeBuilder::DOM::AccessibilityProperties::Invalid::True;
</del><ins>+ invalid = Inspector::Protocol::DOM::AccessibilityProperties::Invalid::True;
</ins><span class="cx">
</span><span class="cx"> if (axObject->isARIAHidden() || axObject->isDOMHidden())
</span><span class="cx"> hidden = true;
</span><span class="lines">@@ -1561,10 +1561,10 @@
</span><span class="cx"> String ariaRelevantAttrValue = axObject->ariaLiveRegionRelevant();
</span><span class="cx"> if (!ariaRelevantAttrValue.isEmpty()) {
</span><span class="cx"> // FIXME: Pass enum values rather than strings once unblocked. http://webkit.org/b/133711
</span><del>- String ariaRelevantAdditions = TypeBuilder::getWebEnumConstantValue(TypeBuilder::DOM::LiveRegionRelevant::Additions);
- String ariaRelevantRemovals = TypeBuilder::getWebEnumConstantValue(TypeBuilder::DOM::LiveRegionRelevant::Removals);
- String ariaRelevantText = TypeBuilder::getWebEnumConstantValue(TypeBuilder::DOM::LiveRegionRelevant::Text);
- liveRegionRelevant = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ String ariaRelevantAdditions = Inspector::Protocol::getWebEnumConstantValue(Inspector::Protocol::DOM::LiveRegionRelevant::Additions);
+ String ariaRelevantRemovals = Inspector::Protocol::getWebEnumConstantValue(Inspector::Protocol::DOM::LiveRegionRelevant::Removals);
+ String ariaRelevantText = Inspector::Protocol::getWebEnumConstantValue(Inspector::Protocol::DOM::LiveRegionRelevant::Text);
+ liveRegionRelevant = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> const SpaceSplitString& values = SpaceSplitString(ariaRelevantAttrValue, true);
</span><span class="cx"> // @aria-relevant="all" is exposed as ["additions","removals","text"], in order.
</span><span class="cx"> // This order is controlled in WebCore and expected in WebInspectorUI.
</span><span class="lines">@@ -1584,9 +1584,9 @@
</span><span class="cx">
</span><span class="cx"> String ariaLive = axObject->ariaLiveRegionStatus();
</span><span class="cx"> if (ariaLive == "assertive")
</span><del>- liveRegionStatus = TypeBuilder::DOM::AccessibilityProperties::LiveRegionStatus::Assertive;
</del><ins>+ liveRegionStatus = Inspector::Protocol::DOM::AccessibilityProperties::LiveRegionStatus::Assertive;
</ins><span class="cx"> else if (ariaLive == "polite")
</span><del>- liveRegionStatus = TypeBuilder::DOM::AccessibilityProperties::LiveRegionStatus::Polite;
</del><ins>+ liveRegionStatus = Inspector::Protocol::DOM::AccessibilityProperties::LiveRegionStatus::Polite;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (axObject->isAccessibilityNodeObject())
</span><span class="lines">@@ -1596,7 +1596,7 @@
</span><span class="cx"> Vector<Element*> ownedElements;
</span><span class="cx"> axObject->elementsFromAttribute(ownedElements, aria_ownsAttr);
</span><span class="cx"> if (ownedElements.size()) {
</span><del>- ownedNodeIds = Inspector::TypeBuilder::Array<int>::create();
</del><ins>+ ownedNodeIds = Inspector::Protocol::Array<int>::create();
</ins><span class="cx"> for (Element* ownedElement : ownedElements)
</span><span class="cx"> ownedNodeIds->addItem(pushNodePathToFrontend(ownedElement));
</span><span class="cx"> }
</span><span class="lines">@@ -1622,7 +1622,7 @@
</span><span class="cx"> AccessibilityObject::AccessibilityChildrenVector selectedChildren;
</span><span class="cx"> axObject->selectedChildren(selectedChildren);
</span><span class="cx"> if (selectedChildren.size()) {
</span><del>- selectedChildNodeIds = Inspector::TypeBuilder::Array<int>::create();
</del><ins>+ selectedChildNodeIds = Inspector::Protocol::Array<int>::create();
</ins><span class="cx"> for (auto& selectedChildObject : selectedChildren) {
</span><span class="cx"> if (Node* selectedChildNode = selectedChildObject->node())
</span><span class="cx"> selectedChildNodeIds->addItem(pushNodePathToFrontend(selectedChildNode));
</span><span class="lines">@@ -1631,7 +1631,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<TypeBuilder::DOM::AccessibilityProperties> value = TypeBuilder::DOM::AccessibilityProperties::create()
</del><ins>+ RefPtr<Inspector::Protocol::DOM::AccessibilityProperties> value = Inspector::Protocol::DOM::AccessibilityProperties::create()
</ins><span class="cx"> .setExists(exists)
</span><span class="cx"> .setLabel(label)
</span><span class="cx"> .setRole(role)
</span><span class="lines">@@ -1660,7 +1660,7 @@
</span><span class="cx"> value->setIgnored(ignored);
</span><span class="cx"> if (ignoredByDefault)
</span><span class="cx"> value->setIgnoredByDefault(ignoredByDefault);
</span><del>- if (invalid != TypeBuilder::DOM::AccessibilityProperties::Invalid::False)
</del><ins>+ if (invalid != Inspector::Protocol::DOM::AccessibilityProperties::Invalid::False)
</ins><span class="cx"> value->setInvalid(invalid);
</span><span class="cx"> if (hidden)
</span><span class="cx"> value->setHidden(hidden);
</span><span class="lines">@@ -1764,7 +1764,7 @@
</span><span class="cx"> m_frontendDispatcher->childNodeRemoved(parentId, frameOwnerId);
</span><span class="cx"> unbind(frameOwner, &m_documentNodeToIdMap);
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::DOM::Node> value = buildObjectForNode(frameOwner, 0, &m_documentNodeToIdMap);
</del><ins>+ RefPtr<Inspector::Protocol::DOM::Node> value = buildObjectForNode(frameOwner, 0, &m_documentNodeToIdMap);
</ins><span class="cx"> Node* previousSibling = innerPreviousSibling(frameOwner);
</span><span class="cx"> int prevId = previousSibling ? m_documentNodeToIdMap.get(previousSibling) : 0;
</span><span class="cx"> m_frontendDispatcher->childNodeInserted(parentId, prevId, value.release());
</span><span class="lines">@@ -1794,7 +1794,7 @@
</span><span class="cx"> // Children have been requested -> return value of a new child.
</span><span class="cx"> Node* prevSibling = innerPreviousSibling(node);
</span><span class="cx"> int prevId = prevSibling ? m_documentNodeToIdMap.get(prevSibling) : 0;
</span><del>- RefPtr<Inspector::TypeBuilder::DOM::Node> value = buildObjectForNode(node, 0, &m_documentNodeToIdMap);
</del><ins>+ RefPtr<Inspector::Protocol::DOM::Node> value = buildObjectForNode(node, 0, &m_documentNodeToIdMap);
</ins><span class="cx"> m_frontendDispatcher->childNodeInserted(parentId, prevId, value.release());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1859,7 +1859,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::styleAttributeInvalidated(const Vector<Element*>& elements)
</span><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<int>> nodeIds = Inspector::TypeBuilder::Array<int>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<int>> nodeIds = Inspector::Protocol::Array<int>::create();
</ins><span class="cx"> for (unsigned i = 0, size = elements.size(); i < size; ++i) {
</span><span class="cx"> Element* element = elements.at(i);
</span><span class="cx"> int id = boundNodeId(element);
</span><span class="lines">@@ -1991,7 +1991,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(Node* node, const String& objectGroup)
</del><ins>+PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(Node* node, const String& objectGroup)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = node->document().frame();
</span><span class="cx"> if (!frame)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -119,8 +119,8 @@
</span><span class="cx">
</span><span class="cx"> // Methods called from the frontend for DOM nodes inspection.
</span><span class="cx"> virtual void querySelector(ErrorString*, int nodeId, const String& selectors, int* elementId) override;
</span><del>- virtual void querySelectorAll(ErrorString*, int nodeId, const String& selectors, RefPtr<Inspector::TypeBuilder::Array<int>>& result) override;
- virtual void getDocument(ErrorString*, RefPtr<Inspector::TypeBuilder::DOM::Node>& root) override;
</del><ins>+ virtual void querySelectorAll(ErrorString*, int nodeId, const String& selectors, RefPtr<Inspector::Protocol::Array<int>>& result) override;
+ virtual void getDocument(ErrorString*, RefPtr<Inspector::Protocol::DOM::Node>& root) override;
</ins><span class="cx"> virtual void requestChildNodes(ErrorString*, int nodeId, const int* depth) override;
</span><span class="cx"> virtual void setAttributeValue(ErrorString*, int elementId, const String& name, const String& value) override;
</span><span class="cx"> virtual void setAttributesAsText(ErrorString*, int elementId, const String& text, const String* name) override;
</span><span class="lines">@@ -130,13 +130,13 @@
</span><span class="cx"> virtual void getOuterHTML(ErrorString*, int nodeId, WTF::String* outerHTML) override;
</span><span class="cx"> virtual void setOuterHTML(ErrorString*, int nodeId, const String& outerHTML) override;
</span><span class="cx"> virtual void setNodeValue(ErrorString*, int nodeId, const String& value) override;
</span><del>- virtual void getEventListenersForNode(ErrorString*, int nodeId, const WTF::String* objectGroup, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::EventListener>>& listenersArray) override;
- virtual void getAccessibilityPropertiesForNode(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::DOM::AccessibilityProperties>& axProperties) override;
</del><ins>+ virtual void getEventListenersForNode(ErrorString*, int nodeId, const WTF::String* objectGroup, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>>& listenersArray) override;
+ virtual void getAccessibilityPropertiesForNode(ErrorString*, int nodeId, RefPtr<Inspector::Protocol::DOM::AccessibilityProperties>& axProperties) override;
</ins><span class="cx"> virtual void performSearch(ErrorString*, const String& whitespaceTrimmedQuery, const RefPtr<Inspector::InspectorArray>* nodeIds, String* searchId, int* resultCount) override;
</span><del>- virtual void getSearchResults(ErrorString*, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::TypeBuilder::Array<int>>&) override;
</del><ins>+ virtual void getSearchResults(ErrorString*, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::Protocol::Array<int>>&) override;
</ins><span class="cx"> virtual void discardSearchResults(ErrorString*, const String& searchId) override;
</span><del>- virtual void resolveNode(ErrorString*, int nodeId, const String* objectGroup, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result) override;
- virtual void getAttributes(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::Array<String>>& result) override;
</del><ins>+ virtual void resolveNode(ErrorString*, int nodeId, const String* objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result) override;
+ virtual void getAttributes(ErrorString*, int nodeId, RefPtr<Inspector::Protocol::Array<String>>& result) override;
</ins><span class="cx"> virtual void setInspectModeEnabled(ErrorString*, bool enabled, const RefPtr<Inspector::InspectorObject>* highlightConfig) override;
</span><span class="cx"> virtual void requestNode(ErrorString*, const String& objectId, int* nodeId) override;
</span><span class="cx"> virtual void pushNodeByPathToFrontend(ErrorString*, const String& path, int* nodeId) override;
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx">
</span><span class="cx"> static String documentURLString(Document*);
</span><span class="cx">
</span><del>- PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> resolveNode(Node*, const String& objectGroup);
</del><ins>+ PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> resolveNode(Node*, const String& objectGroup);
</ins><span class="cx"> bool handleMousePress();
</span><span class="cx"> bool handleTouchEvent(Node*);
</span><span class="cx"> void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
</span><span class="lines">@@ -230,12 +230,12 @@
</span><span class="cx"> void updateSubtreeBreakpoints(Node* root, uint32_t rootMask, bool value);
</span><span class="cx"> void descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, PassRefPtr<Inspector::InspectorObject> description);
</span><span class="cx">
</span><del>- PassRefPtr<Inspector::TypeBuilder::DOM::Node> buildObjectForNode(Node*, int depth, NodeToIdMap*);
- PassRefPtr<Inspector::TypeBuilder::Array<String>> buildArrayForElementAttributes(Element*);
- PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap);
- PassRefPtr<Inspector::TypeBuilder::DOM::EventListener> buildObjectForEventListener(const RegisteredEventListener&, const AtomicString& eventType, Node*, const String* objectGroupId);
- PassRefPtr<Inspector::TypeBuilder::DOM::AccessibilityProperties> buildObjectForAccessibilityProperties(Node*);
- void processAccessibilityChildren(PassRefPtr<AccessibilityObject>, RefPtr<Inspector::TypeBuilder::Array<int>>&);
</del><ins>+ PassRefPtr<Inspector::Protocol::DOM::Node> buildObjectForNode(Node*, int depth, NodeToIdMap*);
+ PassRefPtr<Inspector::Protocol::Array<String>> buildArrayForElementAttributes(Element*);
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap);
+ PassRefPtr<Inspector::Protocol::DOM::EventListener> buildObjectForEventListener(const RegisteredEventListener&, const AtomicString& eventType, Node*, const String* objectGroupId);
+ PassRefPtr<Inspector::Protocol::DOM::AccessibilityProperties> buildObjectForAccessibilityProperties(Node*);
+ void processAccessibilityChildren(PassRefPtr<AccessibilityObject>, RefPtr<Inspector::Protocol::Array<int>>&);
</ins><span class="cx">
</span><span class="cx"> Node* nodeForPath(const String& path);
</span><span class="cx"> Node* nodeForObjectId(const String& objectId);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> if ((1 << breakpointType) & inheritableDOMBreakpointTypesMask) {
</span><span class="cx"> // For inheritable breakpoint types, target node isn't always the same as the node that owns a breakpoint.
</span><span class="cx"> // Target node may be unknown to frontend, so we need to push it first.
</span><del>- RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> targetNodeObject = m_domAgent->resolveNode(target, InspectorDebuggerAgent::backtraceObjectGroup);
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::RemoteObject> targetNodeObject = m_domAgent->resolveNode(target, InspectorDebuggerAgent::backtraceObjectGroup);
</ins><span class="cx"> description->setValue("targetNode", targetNodeObject);
</span><span class="cx">
</span><span class="cx"> // Find breakpoint owner node.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMStorageAgent::getDOMStorageItems(ErrorString* errorString, const RefPtr<InspectorObject>& storageId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Array<String>>>& items)
</del><ins>+void InspectorDOMStorageAgent::getDOMStorageItems(ErrorString* errorString, const RefPtr<InspectorObject>& storageId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Array<String>>>& items)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame;
</span><span class="cx"> RefPtr<StorageArea> storageArea = findStorageArea(errorString, storageId, frame);
</span><span class="lines">@@ -104,13 +104,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Array<String>>> storageItems = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Array<String>>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Array<String>>> storageItems = Inspector::Protocol::Array<Inspector::Protocol::Array<String>>::create();
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < storageArea->length(); ++i) {
</span><span class="cx"> String key = storageArea->key(i);
</span><span class="cx"> String value = storageArea->item(key);
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> entry = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> entry = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> entry->addItem(key);
</span><span class="cx"> entry->addItem(value);
</span><span class="cx"> storageItems->addItem(entry.release());
</span><span class="lines">@@ -158,9 +158,9 @@
</span><span class="cx"> return storageId(securityOrigin.get(), isLocalStorage)->toJSONString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::DOMStorage::StorageId> InspectorDOMStorageAgent::storageId(SecurityOrigin* securityOrigin, bool isLocalStorage)
</del><ins>+PassRefPtr<Inspector::Protocol::DOMStorage::StorageId> InspectorDOMStorageAgent::storageId(SecurityOrigin* securityOrigin, bool isLocalStorage)
</ins><span class="cx"> {
</span><del>- return Inspector::TypeBuilder::DOMStorage::StorageId::create()
</del><ins>+ return Inspector::Protocol::DOMStorage::StorageId::create()
</ins><span class="cx"> .setSecurityOrigin(securityOrigin->toRawString())
</span><span class="cx"> .setIsLocalStorage(isLocalStorage).release();
</span><span class="cx"> }
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> if (!m_frontendDispatcher || !m_enabled)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::DOMStorage::StorageId> id = storageId(securityOrigin, storageType == LocalStorage);
</del><ins>+ RefPtr<Inspector::Protocol::DOMStorage::StorageId> id = storageId(securityOrigin, storageType == LocalStorage);
</ins><span class="cx">
</span><span class="cx"> if (key.isNull())
</span><span class="cx"> m_frontendDispatcher->domStorageItemsCleared(id);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -63,13 +63,13 @@
</span><span class="cx"> // Called from the front-end.
</span><span class="cx"> virtual void enable(ErrorString*) override;
</span><span class="cx"> virtual void disable(ErrorString*) override;
</span><del>- virtual void getDOMStorageItems(ErrorString*, const RefPtr<Inspector::InspectorObject>& storageId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Array<String>>>& items) override;
</del><ins>+ virtual void getDOMStorageItems(ErrorString*, const RefPtr<Inspector::InspectorObject>& storageId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Array<String>>>& items) override;
</ins><span class="cx"> virtual void setDOMStorageItem(ErrorString*, const RefPtr<Inspector::InspectorObject>& storageId, const String& key, const String& value) override;
</span><span class="cx"> virtual void removeDOMStorageItem(ErrorString*, const RefPtr<Inspector::InspectorObject>& storageId, const String& key) override;
</span><span class="cx">
</span><span class="cx"> // Called from the injected script.
</span><span class="cx"> String storageId(Storage*);
</span><del>- PassRefPtr<Inspector::TypeBuilder::DOMStorage::StorageId> storageId(SecurityOrigin*, bool isLocalStorage);
</del><ins>+ PassRefPtr<Inspector::Protocol::DOMStorage::StorageId> storageId(SecurityOrigin*, bool isLocalStorage);
</ins><span class="cx">
</span><span class="cx"> // Called from InspectorInstrumentation
</span><span class="cx"> void didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> void reportTransactionFailed(ExecuteSQLCallback* requestCallback, SQLError* error)
</span><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Database::Error> errorObject = Inspector::TypeBuilder::Database::Error::create()
</del><ins>+ RefPtr<Inspector::Protocol::Database::Error> errorObject = Inspector::Protocol::Database::Error::create()
</ins><span class="cx"> .setMessage(error->message())
</span><span class="cx"> .setCode(error->code());
</span><span class="cx"> requestCallback->sendSuccess(nullptr, nullptr, errorObject.release());
</span><span class="lines">@@ -80,12 +80,12 @@
</span><span class="cx"> {
</span><span class="cx"> SQLResultSetRowList* rowList = resultSet->rows();
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> columnNames = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> columnNames = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> const Vector<String>& columns = rowList->columnNames();
</span><span class="cx"> for (size_t i = 0; i < columns.size(); ++i)
</span><span class="cx"> columnNames->addItem(columns[i]);
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Array<InspectorValue>> values = Inspector::TypeBuilder::Array<InspectorValue>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<InspectorValue>> values = Inspector::Protocol::Array<InspectorValue>::create();
</ins><span class="cx"> const Vector<SQLValue>& data = rowList->values();
</span><span class="cx"> for (size_t i = 0; i < data.size(); ++i) {
</span><span class="cx"> const SQLValue& value = rowList->values()[i];
</span><span class="lines">@@ -254,14 +254,14 @@
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString* error, const String& databaseId, RefPtr<Inspector::TypeBuilder::Array<String>>& names)
</del><ins>+void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString* error, const String& databaseId, RefPtr<Inspector::Protocol::Array<String>>& names)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_enabled) {
</span><span class="cx"> *error = "Database agent is not enabled";
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- names = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ names = Inspector::Protocol::Array<String>::create();
</ins><span class="cx">
</span><span class="cx"> Database* database = databaseForId(databaseId);
</span><span class="cx"> if (database) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> // Called from the front-end.
</span><span class="cx"> virtual void enable(ErrorString*) override;
</span><span class="cx"> virtual void disable(ErrorString*) override;
</span><del>- virtual void getDatabaseTableNames(ErrorString*, const String& databaseId, RefPtr<Inspector::TypeBuilder::Array<String>>& names) override;
</del><ins>+ virtual void getDatabaseTableNames(ErrorString*, const String& databaseId, RefPtr<Inspector::Protocol::Array<String>>& names) override;
</ins><span class="cx"> virtual void executeSQL(ErrorString*, const String& databaseId, const String& query, PassRefPtr<ExecuteSQLCallback>) override;
</span><span class="cx">
</span><span class="cx"> // Called from the injected script.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDatabaseResource::bind(InspectorDatabaseFrontendDispatcher* databaseFrontendDispatcher)
</span><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Database::Database> jsonObject = Inspector::TypeBuilder::Database::Database::create()
</del><ins>+ RefPtr<Inspector::Protocol::Database::Database> jsonObject = Inspector::Protocol::Database::Database::create()
</ins><span class="cx"> .setId(m_id)
</span><span class="cx"> .setDomain(m_domain)
</span><span class="cx"> .setName(m_name)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -67,14 +67,14 @@
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-using Inspector::TypeBuilder::Array;
-using Inspector::TypeBuilder::IndexedDB::DatabaseWithObjectStores;
-using Inspector::TypeBuilder::IndexedDB::DataEntry;
-using Inspector::TypeBuilder::IndexedDB::Key;
-using Inspector::TypeBuilder::IndexedDB::KeyPath;
-using Inspector::TypeBuilder::IndexedDB::KeyRange;
-using Inspector::TypeBuilder::IndexedDB::ObjectStore;
-using Inspector::TypeBuilder::IndexedDB::ObjectStoreIndex;
</del><ins>+using Inspector::Protocol::Array;
+using Inspector::Protocol::IndexedDB::DatabaseWithObjectStores;
+using Inspector::Protocol::IndexedDB::DataEntry;
+using Inspector::Protocol::IndexedDB::Key;
+using Inspector::Protocol::IndexedDB::KeyPath;
+using Inspector::Protocol::IndexedDB::KeyRange;
+using Inspector::Protocol::IndexedDB::ObjectStore;
+using Inspector::Protocol::IndexedDB::ObjectStoreIndex;
</ins><span class="cx">
</span><span class="cx"> typedef Inspector::InspectorBackendDispatcher::CallbackBase RequestCallback;
</span><span class="cx"> typedef Inspector::InspectorIndexedDBBackendDispatcherHandler::RequestDatabaseNamesCallback RequestDatabaseNamesCallback;
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<DOMStringList> databaseNamesList = requestResult->domStringList();
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> databaseNames = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> databaseNames = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> for (size_t i = 0; i < databaseNamesList->length(); ++i)
</span><span class="cx"> databaseNames->addItem(databaseNamesList->item(i));
</span><span class="cx"> m_requestCallback->sendSuccess(databaseNames.release());
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case IDBKeyPath::ArrayType: {
</span><span class="cx"> keyPath = KeyPath::create().setType(KeyPath::Type::Array);
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> array = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> array = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> const Vector<String>& stringArray = idbKeyPath.array();
</span><span class="cx"> for (size_t i = 0; i < stringArray.size(); ++i)
</span><span class="cx"> array->addItem(stringArray[i]);
</span><span class="lines">@@ -282,10 +282,10 @@
</span><span class="cx">
</span><span class="cx"> const IDBDatabaseMetadata databaseMetadata = idbDatabase->metadata();
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::IndexedDB::ObjectStore>> objectStores = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::IndexedDB::ObjectStore>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStore>> objectStores = Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStore>::create();
</ins><span class="cx">
</span><span class="cx"> for (const IDBObjectStoreMetadata& objectStoreMetadata : databaseMetadata.objectStores.values()) {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::IndexedDB::ObjectStoreIndex>> indexes = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::IndexedDB::ObjectStoreIndex>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStoreIndex>> indexes = Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStoreIndex>::create();
</ins><span class="cx">
</span><span class="cx"> for (const IDBIndexMetadata& indexMetadata : objectStoreMetadata.indexes.values()) {
</span><span class="cx"> RefPtr<ObjectStoreIndex> objectStoreIndex = ObjectStoreIndex::create()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -106,9 +106,9 @@
</span><span class="cx"> unbindPseudoElement(pseudoElement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::layersForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::LayerTree::Layer>>& layers)
</del><ins>+void InspectorLayerTreeAgent::layersForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>& layers)
</ins><span class="cx"> {
</span><del>- layers = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::LayerTree::Layer>::create();
</del><ins>+ layers = Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>::create();
</ins><span class="cx">
</span><span class="cx"> Node* node = m_instrumentingAgents->inspectorDOMAgent()->nodeForId(nodeId);
</span><span class="cx"> if (!node) {
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> gatherLayersUsingRenderObjectHierarchy(errorString, renderer, layers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::gatherLayersUsingRenderObjectHierarchy(ErrorString* errorString, RenderObject* renderer, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::LayerTree::Layer>>& layers)
</del><ins>+void InspectorLayerTreeAgent::gatherLayersUsingRenderObjectHierarchy(ErrorString* errorString, RenderObject* renderer, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>& layers)
</ins><span class="cx"> {
</span><span class="cx"> if (renderer->hasLayer()) {
</span><span class="cx"> gatherLayersUsingRenderLayerHierarchy(errorString, toRenderLayerModelObject(renderer)->layer(), layers);
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> gatherLayersUsingRenderObjectHierarchy(errorString, renderer, layers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::gatherLayersUsingRenderLayerHierarchy(ErrorString* errorString, RenderLayer* renderLayer, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::LayerTree::Layer>>& layers)
</del><ins>+void InspectorLayerTreeAgent::gatherLayersUsingRenderLayerHierarchy(ErrorString* errorString, RenderLayer* renderLayer, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>& layers)
</ins><span class="cx"> {
</span><span class="cx"> if (renderLayer->isComposited())
</span><span class="cx"> layers->addItem(buildObjectForLayer(errorString, renderLayer));
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> gatherLayersUsingRenderLayerHierarchy(errorString, renderLayer, layers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::LayerTree::Layer> InspectorLayerTreeAgent::buildObjectForLayer(ErrorString* errorString, RenderLayer* renderLayer)
</del><ins>+PassRefPtr<Inspector::Protocol::LayerTree::Layer> InspectorLayerTreeAgent::buildObjectForLayer(ErrorString* errorString, RenderLayer* renderLayer)
</ins><span class="cx"> {
</span><span class="cx"> RenderObject* renderer = &renderLayer->renderer();
</span><span class="cx"> RenderLayerBacking* backing = renderLayer->backing();
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> node = renderer->parent()->element();
</span><span class="cx">
</span><span class="cx"> // Basic set of properties.
</span><del>- RefPtr<Inspector::TypeBuilder::LayerTree::Layer> layerObject = Inspector::TypeBuilder::LayerTree::Layer::create()
</del><ins>+ RefPtr<Inspector::Protocol::LayerTree::Layer> layerObject = Inspector::Protocol::LayerTree::Layer::create()
</ins><span class="cx"> .setLayerId(bind(renderLayer))
</span><span class="cx"> .setNodeId(idForNode(errorString, node))
</span><span class="cx"> .setBounds(buildObjectForIntRect(renderer->absoluteBoundingBoxRect()))
</span><span class="lines">@@ -217,16 +217,16 @@
</span><span class="cx"> return nodeId;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::LayerTree::IntRect> InspectorLayerTreeAgent::buildObjectForIntRect(const IntRect& rect)
</del><ins>+PassRefPtr<Inspector::Protocol::LayerTree::IntRect> InspectorLayerTreeAgent::buildObjectForIntRect(const IntRect& rect)
</ins><span class="cx"> {
</span><del>- return Inspector::TypeBuilder::LayerTree::IntRect::create()
</del><ins>+ return Inspector::Protocol::LayerTree::IntRect::create()
</ins><span class="cx"> .setX(rect.x())
</span><span class="cx"> .setY(rect.y())
</span><span class="cx"> .setWidth(rect.width())
</span><span class="cx"> .setHeight(rect.height()).release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::reasonsForCompositingLayer(ErrorString* errorString, const String& layerId, RefPtr<Inspector::TypeBuilder::LayerTree::CompositingReasons>& compositingReasons)
</del><ins>+void InspectorLayerTreeAgent::reasonsForCompositingLayer(ErrorString* errorString, const String& layerId, RefPtr<Inspector::Protocol::LayerTree::CompositingReasons>& compositingReasons)
</ins><span class="cx"> {
</span><span class="cx"> const RenderLayer* renderLayer = m_idToLayer.get(layerId);
</span><span class="cx">
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CompositingReasons reasonsBitmask = renderLayer->compositor().reasonsForCompositing(*renderLayer);
</span><del>- compositingReasons = Inspector::TypeBuilder::LayerTree::CompositingReasons::create();
</del><ins>+ compositingReasons = Inspector::Protocol::LayerTree::CompositingReasons::create();
</ins><span class="cx">
</span><span class="cx"> if (reasonsBitmask & CompositingReason3DTransform)
</span><span class="cx"> compositingReasons->setTransform3D(true);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "InspectorWebAgentBase.h"
</span><span class="cx"> #include "InspectorWebBackendDispatchers.h"
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><del>-#include "InspectorWebTypeBuilders.h"
</del><ins>+#include "InspectorWebProtocolTypes.h"
</ins><span class="cx"> #include "RenderLayer.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -63,19 +63,19 @@
</span><span class="cx"> // Called from the front-end.
</span><span class="cx"> virtual void enable(ErrorString*) override;
</span><span class="cx"> virtual void disable(ErrorString*) override;
</span><del>- virtual void layersForNode(ErrorString*, int nodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::LayerTree::Layer>>&) override;
- virtual void reasonsForCompositingLayer(ErrorString*, const String& layerId, RefPtr<Inspector::TypeBuilder::LayerTree::CompositingReasons>&) override;
</del><ins>+ virtual void layersForNode(ErrorString*, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>&) override;
+ virtual void reasonsForCompositingLayer(ErrorString*, const String& layerId, RefPtr<Inspector::Protocol::LayerTree::CompositingReasons>&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // RenderLayer-related methods.
</span><span class="cx"> String bind(const RenderLayer*);
</span><span class="cx"> void unbind(const RenderLayer*);
</span><span class="cx">
</span><del>- void gatherLayersUsingRenderObjectHierarchy(ErrorString*, RenderObject*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::LayerTree::Layer>>&);
- void gatherLayersUsingRenderLayerHierarchy(ErrorString*, RenderLayer*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::LayerTree::Layer>>&);
</del><ins>+ void gatherLayersUsingRenderObjectHierarchy(ErrorString*, RenderObject*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>&);
+ void gatherLayersUsingRenderLayerHierarchy(ErrorString*, RenderLayer*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>&);
</ins><span class="cx">
</span><del>- PassRefPtr<Inspector::TypeBuilder::LayerTree::Layer> buildObjectForLayer(ErrorString*, RenderLayer*);
- PassRefPtr<Inspector::TypeBuilder::LayerTree::IntRect> buildObjectForIntRect(const IntRect&);
</del><ins>+ PassRefPtr<Inspector::Protocol::LayerTree::Layer> buildObjectForLayer(ErrorString*, RenderLayer*);
+ PassRefPtr<Inspector::Protocol::LayerTree::IntRect> buildObjectForIntRect(const IntRect&);
</ins><span class="cx">
</span><span class="cx"> int idForNode(ErrorString*, Node*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -276,27 +276,27 @@
</span><span class="cx"> return cachedResource;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Inspector::TypeBuilder::Page::ResourceType InspectorPageAgent::resourceTypeJson(InspectorPageAgent::ResourceType resourceType)
</del><ins>+Inspector::Protocol::Page::ResourceType InspectorPageAgent::resourceTypeJson(InspectorPageAgent::ResourceType resourceType)
</ins><span class="cx"> {
</span><span class="cx"> switch (resourceType) {
</span><span class="cx"> case DocumentResource:
</span><del>- return Inspector::TypeBuilder::Page::ResourceType::Document;
</del><ins>+ return Inspector::Protocol::Page::ResourceType::Document;
</ins><span class="cx"> case ImageResource:
</span><del>- return Inspector::TypeBuilder::Page::ResourceType::Image;
</del><ins>+ return Inspector::Protocol::Page::ResourceType::Image;
</ins><span class="cx"> case FontResource:
</span><del>- return Inspector::TypeBuilder::Page::ResourceType::Font;
</del><ins>+ return Inspector::Protocol::Page::ResourceType::Font;
</ins><span class="cx"> case StylesheetResource:
</span><del>- return Inspector::TypeBuilder::Page::ResourceType::Stylesheet;
</del><ins>+ return Inspector::Protocol::Page::ResourceType::Stylesheet;
</ins><span class="cx"> case ScriptResource:
</span><del>- return Inspector::TypeBuilder::Page::ResourceType::Script;
</del><ins>+ return Inspector::Protocol::Page::ResourceType::Script;
</ins><span class="cx"> case XHRResource:
</span><del>- return Inspector::TypeBuilder::Page::ResourceType::XHR;
</del><ins>+ return Inspector::Protocol::Page::ResourceType::XHR;
</ins><span class="cx"> case WebSocketResource:
</span><del>- return Inspector::TypeBuilder::Page::ResourceType::WebSocket;
</del><ins>+ return Inspector::Protocol::Page::ResourceType::WebSocket;
</ins><span class="cx"> case OtherResource:
</span><del>- return Inspector::TypeBuilder::Page::ResourceType::Other;
</del><ins>+ return Inspector::Protocol::Page::ResourceType::Other;
</ins><span class="cx"> }
</span><del>- return Inspector::TypeBuilder::Page::ResourceType::Other;
</del><ins>+ return Inspector::Protocol::Page::ResourceType::Other;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorPageAgent::ResourceType InspectorPageAgent::cachedResourceType(const CachedResource& cachedResource)
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> return InspectorPageAgent::OtherResource;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Inspector::TypeBuilder::Page::ResourceType InspectorPageAgent::cachedResourceTypeJson(const CachedResource& cachedResource)
</del><ins>+Inspector::Protocol::Page::ResourceType InspectorPageAgent::cachedResourceTypeJson(const CachedResource& cachedResource)
</ins><span class="cx"> {
</span><span class="cx"> return resourceTypeJson(cachedResourceType(cachedResource));
</span><span class="cx"> }
</span><span class="lines">@@ -421,9 +421,9 @@
</span><span class="cx"> frame.loader().changeLocation(frame.document()->securityOrigin(), frame.document()->completeURL(url), "", LockHistory::No, LockBackForwardList::No);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::Page::Cookie> buildObjectForCookie(const Cookie& cookie)
</del><ins>+static PassRefPtr<Inspector::Protocol::Page::Cookie> buildObjectForCookie(const Cookie& cookie)
</ins><span class="cx"> {
</span><del>- return Inspector::TypeBuilder::Page::Cookie::create()
</del><ins>+ return Inspector::Protocol::Page::Cookie::create()
</ins><span class="cx"> .setName(cookie.name)
</span><span class="cx"> .setValue(cookie.value)
</span><span class="cx"> .setDomain(cookie.domain)
</span><span class="lines">@@ -436,9 +436,9 @@
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::Cookie>> buildArrayForCookies(ListHashSet<Cookie>& cookiesList)
</del><ins>+static PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>> buildArrayForCookies(ListHashSet<Cookie>& cookiesList)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::Cookie>> cookies = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::Cookie>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>> cookies = Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>::create();
</ins><span class="cx">
</span><span class="cx"> for (auto& cookie : cookiesList)
</span><span class="cx"> cookies->addItem(buildObjectForCookie(cookie));
</span><span class="lines">@@ -486,7 +486,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::getCookies(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::Cookie>>& cookies)
</del><ins>+void InspectorPageAgent::getCookies(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>>& cookies)
</ins><span class="cx"> {
</span><span class="cx"> // If we can get raw cookies.
</span><span class="cx"> ListHashSet<Cookie> rawCookiesList;
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx"> if (rawCookiesImplemented)
</span><span class="cx"> cookies = buildArrayForCookies(rawCookiesList);
</span><span class="cx"> else
</span><del>- cookies = Inspector::TypeBuilder::Array<TypeBuilder::Page::Cookie>::create();
</del><ins>+ cookies = Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>::create();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorPageAgent::deleteCookie(ErrorString*, const String& cookieName, const String& url)
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> WebCore::deleteCookie(frame->document(), parsedURL, cookieName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::getResourceTree(ErrorString*, RefPtr<Inspector::TypeBuilder::Page::FrameResourceTree>& object)
</del><ins>+void InspectorPageAgent::getResourceTree(ErrorString*, RefPtr<Inspector::Protocol::Page::FrameResourceTree>& object)
</ins><span class="cx"> {
</span><span class="cx"> object = buildObjectForFrameTree(&m_page->mainFrame());
</span><span class="cx"> }
</span><span class="lines">@@ -562,9 +562,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>& results)
</del><ins>+void InspectorPageAgent::searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>& results)
</ins><span class="cx"> {
</span><del>- results = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>::create();
</del><ins>+ results = Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>::create();
</ins><span class="cx">
</span><span class="cx"> bool isRegex = optionalIsRegex ? *optionalIsRegex : false;
</span><span class="cx"> bool caseSensitive = optionalCaseSensitive ? *optionalCaseSensitive : false;
</span><span class="lines">@@ -596,18 +596,18 @@
</span><span class="cx"> results = ContentSearchUtilities::searchInTextByLines(content, query, caseSensitive, isRegex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::Page::SearchResult> buildObjectForSearchResult(const String& frameId, const String& url, int matchesCount)
</del><ins>+static PassRefPtr<Inspector::Protocol::Page::SearchResult> buildObjectForSearchResult(const String& frameId, const String& url, int matchesCount)
</ins><span class="cx"> {
</span><del>- return Inspector::TypeBuilder::Page::SearchResult::create()
</del><ins>+ return Inspector::Protocol::Page::SearchResult::create()
</ins><span class="cx"> .setUrl(url)
</span><span class="cx"> .setFrameId(frameId)
</span><span class="cx"> .setMatchesCount(matchesCount)
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::searchInResources(ErrorString*, const String& text, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::SearchResult>>& results)
</del><ins>+void InspectorPageAgent::searchInResources(ErrorString*, const String& text, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>>& results)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::SearchResult>> searchResults = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::SearchResult>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>> searchResults = Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>::create();
</ins><span class="cx">
</span><span class="cx"> bool isRegex = optionalIsRegex ? *optionalIsRegex : false;
</span><span class="cx"> bool caseSensitive = optionalCaseSensitive ? *optionalCaseSensitive : false;
</span><span class="lines">@@ -936,9 +936,9 @@
</span><span class="cx"> m_frontendDispatcher->scriptsEnabled(isEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Page::Frame> InspectorPageAgent::buildObjectForFrame(Frame* frame)
</del><ins>+PassRefPtr<Inspector::Protocol::Page::Frame> InspectorPageAgent::buildObjectForFrame(Frame* frame)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Page::Frame> frameObject = Inspector::TypeBuilder::Page::Frame::create()
</del><ins>+ RefPtr<Inspector::Protocol::Page::Frame> frameObject = Inspector::Protocol::Page::Frame::create()
</ins><span class="cx"> .setId(frameId(frame))
</span><span class="cx"> .setLoaderId(loaderId(frame->loader().documentLoader()))
</span><span class="cx"> .setUrl(frame->document()->url().string())
</span><span class="lines">@@ -956,16 +956,16 @@
</span><span class="cx"> return frameObject;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Page::FrameResourceTree> InspectorPageAgent::buildObjectForFrameTree(Frame* frame)
</del><ins>+PassRefPtr<Inspector::Protocol::Page::FrameResourceTree> InspectorPageAgent::buildObjectForFrameTree(Frame* frame)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Page::Frame> frameObject = buildObjectForFrame(frame);
- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::FrameResource>> subresources = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::FrameResource>::create();
- RefPtr<Inspector::TypeBuilder::Page::FrameResourceTree> result = Inspector::TypeBuilder::Page::FrameResourceTree::create()
</del><ins>+ RefPtr<Inspector::Protocol::Page::Frame> frameObject = buildObjectForFrame(frame);
+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::FrameResource>> subresources = Inspector::Protocol::Array<Inspector::Protocol::Page::FrameResource>::create();
+ RefPtr<Inspector::Protocol::Page::FrameResourceTree> result = Inspector::Protocol::Page::FrameResourceTree::create()
</ins><span class="cx"> .setFrame(frameObject)
</span><span class="cx"> .setResources(subresources);
</span><span class="cx">
</span><span class="cx"> for (auto* cachedResource : cachedResourcesForFrame(frame)) {
</span><del>- RefPtr<Inspector::TypeBuilder::Page::FrameResource> resourceObject = Inspector::TypeBuilder::Page::FrameResource::create()
</del><ins>+ RefPtr<Inspector::Protocol::Page::FrameResource> resourceObject = Inspector::Protocol::Page::FrameResource::create()
</ins><span class="cx"> .setUrl(cachedResource->url())
</span><span class="cx"> .setType(cachedResourceTypeJson(*cachedResource))
</span><span class="cx"> .setMimeType(cachedResource->response().mimeType());
</span><span class="lines">@@ -979,10 +979,10 @@
</span><span class="cx"> subresources->addItem(resourceObject);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::FrameResourceTree>> childrenArray;
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::FrameResourceTree>> childrenArray;
</ins><span class="cx"> for (Frame* child = frame->tree().firstChild(); child; child = child->tree().nextSibling()) {
</span><span class="cx"> if (!childrenArray) {
</span><del>- childrenArray = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::FrameResourceTree>::create();
</del><ins>+ childrenArray = Inspector::Protocol::Array<Inspector::Protocol::Page::FrameResourceTree>::create();
</ins><span class="cx"> result->setChildFrames(childrenArray);
</span><span class="cx"> }
</span><span class="cx"> childrenArray->addItem(buildObjectForFrameTree(child));
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -90,9 +90,9 @@
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<SharedBuffer> resourceData(Frame*, const URL&, String* textEncodingName);
</span><span class="cx"> static CachedResource* cachedResource(Frame*, const URL&);
</span><del>- static Inspector::TypeBuilder::Page::ResourceType resourceTypeJson(ResourceType);
</del><ins>+ static Inspector::Protocol::Page::ResourceType resourceTypeJson(ResourceType);
</ins><span class="cx"> static ResourceType cachedResourceType(const CachedResource&);
</span><del>- static Inspector::TypeBuilder::Page::ResourceType cachedResourceTypeJson(const CachedResource&);
</del><ins>+ static Inspector::Protocol::Page::ResourceType cachedResourceTypeJson(const CachedResource&);
</ins><span class="cx">
</span><span class="cx"> // Page API for InspectorFrontend
</span><span class="cx"> virtual void enable(ErrorString*) override;
</span><span class="lines">@@ -101,12 +101,12 @@
</span><span class="cx"> virtual void removeScriptToEvaluateOnLoad(ErrorString*, const String& identifier) override;
</span><span class="cx"> virtual void reload(ErrorString*, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad) override;
</span><span class="cx"> virtual void navigate(ErrorString*, const String& url) override;
</span><del>- virtual void getCookies(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::Cookie>>& cookies) override;
</del><ins>+ virtual void getCookies(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>>& cookies) override;
</ins><span class="cx"> virtual void deleteCookie(ErrorString*, const String& cookieName, const String& url) override;
</span><del>- virtual void getResourceTree(ErrorString*, RefPtr<Inspector::TypeBuilder::Page::FrameResourceTree>&) override;
</del><ins>+ virtual void getResourceTree(ErrorString*, RefPtr<Inspector::Protocol::Page::FrameResourceTree>&) override;
</ins><span class="cx"> virtual void getResourceContent(ErrorString*, const String& frameId, const String& url, String* content, bool* base64Encoded) override;
</span><del>- virtual void searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>&) override;
- virtual void searchInResources(ErrorString*, const String&, const bool* caseSensitive, const bool* isRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Page::SearchResult>>&) override;
</del><ins>+ virtual void searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) override;
+ virtual void searchInResources(ErrorString*, const String&, const bool* caseSensitive, const bool* isRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>>&) override;
</ins><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><span class="cx"> virtual void canShowDebugBorders(ErrorString*, bool*) override;
</span><span class="lines">@@ -170,8 +170,8 @@
</span><span class="cx"> static bool mainResourceContent(Frame*, bool withBase64Encode, String* result);
</span><span class="cx"> static bool dataContent(const char* data, unsigned size, const String& textEncodingName, bool withBase64Encode, String* result);
</span><span class="cx">
</span><del>- PassRefPtr<Inspector::TypeBuilder::Page::Frame> buildObjectForFrame(Frame*);
- PassRefPtr<Inspector::TypeBuilder::Page::FrameResourceTree> buildObjectForFrameTree(Frame*);
</del><ins>+ PassRefPtr<Inspector::Protocol::Page::Frame> buildObjectForFrame(Frame*);
+ PassRefPtr<Inspector::Protocol::Page::FrameResourceTree> buildObjectForFrameTree(Frame*);
</ins><span class="cx"> Page* m_page;
</span><span class="cx"> InspectorClient* m_client;
</span><span class="cx"> std::unique_ptr<Inspector::InspectorPageFrontendDispatcher> m_frontendDispatcher;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include "FunctorInputCursor.h"
</span><span class="cx"> #include "InspectorController.h"
</span><span class="cx"> #include "InspectorPageAgent.h"
</span><del>-#include "InspectorWebTypeBuilders.h"
</del><ins>+#include "InspectorWebProtocolTypes.h"
</ins><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "Page.h"
</span><span class="lines">@@ -54,19 +54,19 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static PassRefPtr<TypeBuilder::Replay::ReplayPosition> buildInspectorObjectForPosition(const ReplayPosition& position)
</del><ins>+static PassRefPtr<Inspector::Protocol::Replay::ReplayPosition> buildInspectorObjectForPosition(const ReplayPosition& position)
</ins><span class="cx"> {
</span><del>- RefPtr<TypeBuilder::Replay::ReplayPosition> positionObject = TypeBuilder::Replay::ReplayPosition::create()
</del><ins>+ RefPtr<Inspector::Protocol::Replay::ReplayPosition> positionObject = Inspector::Protocol::Replay::ReplayPosition::create()
</ins><span class="cx"> .setSegmentOffset(position.segmentOffset)
</span><span class="cx"> .setInputOffset(position.inputOffset);
</span><span class="cx">
</span><span class="cx"> return positionObject.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<TypeBuilder::Replay::ReplayInput> buildInspectorObjectForInput(const NondeterministicInputBase& input, size_t offset)
</del><ins>+static PassRefPtr<Inspector::Protocol::Replay::ReplayInput> buildInspectorObjectForInput(const NondeterministicInputBase& input, size_t offset)
</ins><span class="cx"> {
</span><span class="cx"> EncodedValue encodedInput = EncodingTraits<NondeterministicInputBase>::encodeValue(input);
</span><del>- RefPtr<TypeBuilder::Replay::ReplayInput> inputObject = TypeBuilder::Replay::ReplayInput::create()
</del><ins>+ RefPtr<Inspector::Protocol::Replay::ReplayInput> inputObject = Inspector::Protocol::Replay::ReplayInput::create()
</ins><span class="cx"> .setType(input.type())
</span><span class="cx"> .setOffset(offset)
</span><span class="cx"> .setData(encodedInput.asObject());
</span><span class="lines">@@ -74,15 +74,15 @@
</span><span class="cx"> return inputObject.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<TypeBuilder::Replay::ReplaySession> buildInspectorObjectForSession(PassRefPtr<ReplaySession> prpSession)
</del><ins>+static PassRefPtr<Inspector::Protocol::Replay::ReplaySession> buildInspectorObjectForSession(PassRefPtr<ReplaySession> prpSession)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ReplaySession> session = prpSession;
</span><del>- RefPtr<TypeBuilder::Array<SegmentIdentifier>> segments = TypeBuilder::Array<SegmentIdentifier>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<SegmentIdentifier>> segments = Inspector::Protocol::Array<SegmentIdentifier>::create();
</ins><span class="cx">
</span><span class="cx"> for (auto it = session->begin(); it != session->end(); ++it)
</span><span class="cx"> segments->addItem((*it)->identifier());
</span><span class="cx">
</span><del>- RefPtr<TypeBuilder::Replay::ReplaySession> sessionObject = TypeBuilder::Replay::ReplaySession::create()
</del><ins>+ RefPtr<Inspector::Protocol::Replay::ReplaySession> sessionObject = Inspector::Protocol::Replay::ReplaySession::create()
</ins><span class="cx"> .setId(session->identifier())
</span><span class="cx"> .setTimestamp(session->timestamp())
</span><span class="cx"> .setSegments(segments.release());
</span><span class="lines">@@ -90,65 +90,65 @@
</span><span class="cx"> return sessionObject.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static TypeBuilder::Replay::SessionState buildInspectorObjectForSessionState(WebCore::SessionState sessionState)
</del><ins>+static Inspector::Protocol::Replay::SessionState buildInspectorObjectForSessionState(WebCore::SessionState sessionState)
</ins><span class="cx"> {
</span><span class="cx"> switch (sessionState) {
</span><del>- case WebCore::SessionState::Capturing: return TypeBuilder::Replay::SessionState::Capturing;
- case WebCore::SessionState::Inactive: return TypeBuilder::Replay::SessionState::Inactive;
- case WebCore::SessionState::Replaying: return TypeBuilder::Replay::SessionState::Replaying;
</del><ins>+ case WebCore::SessionState::Capturing: return Inspector::Protocol::Replay::SessionState::Capturing;
+ case WebCore::SessionState::Inactive: return Inspector::Protocol::Replay::SessionState::Inactive;
+ case WebCore::SessionState::Replaying: return Inspector::Protocol::Replay::SessionState::Replaying;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static TypeBuilder::Replay::SegmentState buildInspectorObjectForSegmentState(WebCore::SegmentState segmentState)
</del><ins>+static Inspector::Protocol::Replay::SegmentState buildInspectorObjectForSegmentState(WebCore::SegmentState segmentState)
</ins><span class="cx"> {
</span><span class="cx"> switch (segmentState) {
</span><del>- case WebCore::SegmentState::Appending: return TypeBuilder::Replay::SegmentState::Appending;
- case WebCore::SegmentState::Unloaded: return TypeBuilder::Replay::SegmentState::Unloaded;
- case WebCore::SegmentState::Loaded: return TypeBuilder::Replay::SegmentState::Loaded;
- case WebCore::SegmentState::Dispatching: return TypeBuilder::Replay::SegmentState::Dispatching;
</del><ins>+ case WebCore::SegmentState::Appending: return Inspector::Protocol::Replay::SegmentState::Appending;
+ case WebCore::SegmentState::Unloaded: return Inspector::Protocol::Replay::SegmentState::Unloaded;
+ case WebCore::SegmentState::Loaded: return Inspector::Protocol::Replay::SegmentState::Loaded;
+ case WebCore::SegmentState::Dispatching: return Inspector::Protocol::Replay::SegmentState::Dispatching;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class SerializeInputToJSONFunctor {
</span><span class="cx"> public:
</span><del>- typedef PassRefPtr<TypeBuilder::Array<TypeBuilder::Replay::ReplayInput>> ReturnType;
</del><ins>+ typedef PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInput>> ReturnType;
</ins><span class="cx">
</span><span class="cx"> SerializeInputToJSONFunctor()
</span><del>- : m_inputs(TypeBuilder::Array<TypeBuilder::Replay::ReplayInput>::create()) { }
</del><ins>+ : m_inputs(Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInput>::create()) { }
</ins><span class="cx"> ~SerializeInputToJSONFunctor() { }
</span><span class="cx">
</span><span class="cx"> void operator()(size_t index, const NondeterministicInputBase* input)
</span><span class="cx"> {
</span><span class="cx"> LOG(WebReplay, "%-25s Writing %5zu: %s\n", "[SerializeInput]", index, input->type().string().ascii().data());
</span><span class="cx">
</span><del>- if (RefPtr<TypeBuilder::Replay::ReplayInput> serializedInput = buildInspectorObjectForInput(*input, index))
</del><ins>+ if (RefPtr<Inspector::Protocol::Replay::ReplayInput> serializedInput = buildInspectorObjectForInput(*input, index))
</ins><span class="cx"> m_inputs->addItem(serializedInput.release());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ReturnType returnValue() { return m_inputs.release(); }
</span><span class="cx"> private:
</span><del>- RefPtr<TypeBuilder::Array<TypeBuilder::Replay::ReplayInput>> m_inputs;
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInput>> m_inputs;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-static PassRefPtr<TypeBuilder::Replay::SessionSegment> buildInspectorObjectForSegment(PassRefPtr<ReplaySessionSegment> prpSegment)
</del><ins>+static PassRefPtr<Inspector::Protocol::Replay::SessionSegment> buildInspectorObjectForSegment(PassRefPtr<ReplaySessionSegment> prpSegment)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ReplaySessionSegment> segment = prpSegment;
</span><del>- RefPtr<TypeBuilder::Array<TypeBuilder::Replay::ReplayInputQueue>> queuesObject = TypeBuilder::Array<TypeBuilder::Replay::ReplayInputQueue>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInputQueue>> queuesObject = Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInputQueue>::create();
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < static_cast<size_t>(InputQueue::Count); i++) {
</span><span class="cx"> SerializeInputToJSONFunctor collector;
</span><span class="cx"> InputQueue queue = static_cast<InputQueue>(i);
</span><span class="cx"> RefPtr<FunctorInputCursor> functorCursor = FunctorInputCursor::create(segment);
</span><del>- RefPtr<TypeBuilder::Array<TypeBuilder::Replay::ReplayInput>> queueInputs = functorCursor->forEachInputInQueue(queue, collector);
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInput>> queueInputs = functorCursor->forEachInputInQueue(queue, collector);
</ins><span class="cx">
</span><del>- RefPtr<TypeBuilder::Replay::ReplayInputQueue> queueObject = TypeBuilder::Replay::ReplayInputQueue::create()
</del><ins>+ RefPtr<Inspector::Protocol::Replay::ReplayInputQueue> queueObject = Inspector::Protocol::Replay::ReplayInputQueue::create()
</ins><span class="cx"> .setType(EncodingTraits<InputQueue>::encodeValue(queue).convertTo<String>())
</span><span class="cx"> .setInputs(queueInputs);
</span><span class="cx">
</span><span class="cx"> queuesObject->addItem(queueObject.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<TypeBuilder::Replay::SessionSegment> segmentObject = TypeBuilder::Replay::SessionSegment::create()
</del><ins>+ RefPtr<Inspector::Protocol::Replay::SessionSegment> segmentObject = Inspector::Protocol::Replay::SessionSegment::create()
</ins><span class="cx"> .setId(segment->identifier())
</span><span class="cx"> .setTimestamp(segment->timestamp())
</span><span class="cx"> .setQueues(queuesObject.release());
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> m_page.replayController().cancelPlayback();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::switchSession(ErrorString* errorString, TypeBuilder::Replay::SessionIdentifier identifier)
</del><ins>+void InspectorReplayAgent::switchSession(ErrorString* errorString, Inspector::Protocol::Replay::SessionIdentifier identifier)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(identifier > 0);
</span><span class="cx">
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> m_page.replayController().switchSession(session);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::insertSessionSegment(ErrorString* errorString, TypeBuilder::Replay::SessionIdentifier sessionIdentifier, SegmentIdentifier segmentIdentifier, int segmentIndex)
</del><ins>+void InspectorReplayAgent::insertSessionSegment(ErrorString* errorString, Inspector::Protocol::Replay::SessionIdentifier sessionIdentifier, SegmentIdentifier segmentIdentifier, int segmentIndex)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(sessionIdentifier > 0);
</span><span class="cx"> ASSERT(segmentIdentifier > 0);
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> sessionModified(session);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::removeSessionSegment(ErrorString* errorString, TypeBuilder::Replay::SessionIdentifier identifier, int segmentIndex)
</del><ins>+void InspectorReplayAgent::removeSessionSegment(ErrorString* errorString, Inspector::Protocol::Replay::SessionIdentifier identifier, int segmentIndex)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(identifier > 0);
</span><span class="cx"> ASSERT(segmentIndex >= 0);
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx"> return it->value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::currentReplayState(ErrorString*, TypeBuilder::Replay::SessionIdentifier* sessionIdentifier, TypeBuilder::OptOutput<TypeBuilder::Replay::SegmentIdentifier>* segmentIdentifier, TypeBuilder::Replay::SessionState* sessionState, TypeBuilder::Replay::SegmentState* segmentState, RefPtr<TypeBuilder::Replay::ReplayPosition>& replayPosition)
</del><ins>+void InspectorReplayAgent::currentReplayState(ErrorString*, Inspector::Protocol::Replay::SessionIdentifier* sessionIdentifier, Inspector::Protocol::OptOutput<Inspector::Protocol::Replay::SegmentIdentifier>* segmentIdentifier, Inspector::Protocol::Replay::SessionState* sessionState, Inspector::Protocol::Replay::SegmentState* segmentState, RefPtr<Inspector::Protocol::Replay::ReplayPosition>& replayPosition)
</ins><span class="cx"> {
</span><span class="cx"> *sessionState = buildInspectorObjectForSessionState(m_page.replayController().sessionState());
</span><span class="cx"> *segmentState = buildInspectorObjectForSegmentState(m_page.replayController().segmentState());
</span><span class="lines">@@ -492,14 +492,14 @@
</span><span class="cx"> replayPosition = buildInspectorObjectForPosition(m_page.replayController().currentPosition());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::getAvailableSessions(ErrorString*, RefPtr<TypeBuilder::Array<SessionIdentifier>>& sessionsList)
</del><ins>+void InspectorReplayAgent::getAvailableSessions(ErrorString*, RefPtr<Inspector::Protocol::Array<SessionIdentifier>>& sessionsList)
</ins><span class="cx"> {
</span><del>- sessionsList = TypeBuilder::Array<TypeBuilder::Replay::SessionIdentifier>::create();
</del><ins>+ sessionsList = Inspector::Protocol::Array<Inspector::Protocol::Replay::SessionIdentifier>::create();
</ins><span class="cx"> for (auto& pair : m_sessionsMap)
</span><span class="cx"> sessionsList->addItem(pair.key);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::getSessionData(ErrorString* errorString, TypeBuilder::Replay::SessionIdentifier identifier, RefPtr<TypeBuilder::Replay::ReplaySession>& serializedObject)
</del><ins>+void InspectorReplayAgent::getSessionData(ErrorString* errorString, Inspector::Protocol::Replay::SessionIdentifier identifier, RefPtr<Inspector::Protocol::Replay::ReplaySession>& serializedObject)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ReplaySession> session = findSession(errorString, identifier);
</span><span class="cx"> if (!session) {
</span><span class="lines">@@ -510,7 +510,7 @@
</span><span class="cx"> serializedObject = buildInspectorObjectForSession(session);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::getSegmentData(ErrorString* errorString, TypeBuilder::Replay::SegmentIdentifier identifier, RefPtr<TypeBuilder::Replay::SessionSegment>& serializedObject)
</del><ins>+void InspectorReplayAgent::getSegmentData(ErrorString* errorString, Inspector::Protocol::Replay::SegmentIdentifier identifier, RefPtr<Inspector::Protocol::Replay::SessionSegment>& serializedObject)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ReplaySessionSegment> segment = findSegment(errorString, identifier);
</span><span class="cx"> if (!segment) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -101,13 +101,13 @@
</span><span class="cx"> virtual void cancelPlayback(ErrorString*) override;
</span><span class="cx">
</span><span class="cx"> virtual void switchSession(ErrorString*, SessionIdentifier) override;
</span><del>- virtual void insertSessionSegment(ErrorString*, Inspector::TypeBuilder::Replay::SessionIdentifier, Inspector::TypeBuilder::Replay::SegmentIdentifier, int segmentIndex) override;
- virtual void removeSessionSegment(ErrorString*, Inspector::TypeBuilder::Replay::SessionIdentifier, int segmentIndex) override;
</del><ins>+ virtual void insertSessionSegment(ErrorString*, Inspector::Protocol::Replay::SessionIdentifier, Inspector::Protocol::Replay::SegmentIdentifier, int segmentIndex) override;
+ virtual void removeSessionSegment(ErrorString*, Inspector::Protocol::Replay::SessionIdentifier, int segmentIndex) override;
</ins><span class="cx">
</span><del>- virtual void currentReplayState(ErrorString*, Inspector::TypeBuilder::Replay::SessionIdentifier*, Inspector::TypeBuilder::OptOutput<Inspector::TypeBuilder::Replay::SegmentIdentifier>*, Inspector::TypeBuilder::Replay::SessionState*, Inspector::TypeBuilder::Replay::SegmentState* segmentState, RefPtr<Inspector::TypeBuilder::Replay::ReplayPosition>&) override;
- virtual void getAvailableSessions(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Replay::SessionIdentifier>>&) override;
- virtual void getSessionData(ErrorString*, Inspector::TypeBuilder::Replay::SessionIdentifier, RefPtr<Inspector::TypeBuilder::Replay::ReplaySession>&) override;
- virtual void getSegmentData(ErrorString*, Inspector::TypeBuilder::Replay::SegmentIdentifier, RefPtr<Inspector::TypeBuilder::Replay::SessionSegment>&) override;
</del><ins>+ virtual void currentReplayState(ErrorString*, Inspector::Protocol::Replay::SessionIdentifier*, Inspector::Protocol::OptOutput<Inspector::Protocol::Replay::SegmentIdentifier>*, Inspector::Protocol::Replay::SessionState*, Inspector::Protocol::Replay::SegmentState* segmentState, RefPtr<Inspector::Protocol::Replay::ReplayPosition>&) override;
+ virtual void getAvailableSessions(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::SessionIdentifier>>&) override;
+ virtual void getSessionData(ErrorString*, Inspector::Protocol::Replay::SessionIdentifier, RefPtr<Inspector::Protocol::Replay::ReplaySession>&) override;
+ virtual void getSegmentData(ErrorString*, Inspector::Protocol::Replay::SegmentIdentifier, RefPtr<Inspector::Protocol::Replay::SessionSegment>&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> PassRefPtr<ReplaySession> findSession(ErrorString*, SessionIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -201,9 +201,9 @@
</span><span class="cx"> return headersObject;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::Network::ResourceTiming> buildObjectForTiming(const ResourceLoadTiming& timing, DocumentLoader* loader)
</del><ins>+static PassRefPtr<Inspector::Protocol::Network::ResourceTiming> buildObjectForTiming(const ResourceLoadTiming& timing, DocumentLoader* loader)
</ins><span class="cx"> {
</span><del>- return Inspector::TypeBuilder::Network::ResourceTiming::create()
</del><ins>+ return Inspector::Protocol::Network::ResourceTiming::create()
</ins><span class="cx"> .setNavigationStart(loader->timing()->navigationStart())
</span><span class="cx"> .setDomainLookupStart(timing.domainLookupStart)
</span><span class="cx"> .setDomainLookupEnd(timing.domainLookupEnd)
</span><span class="lines">@@ -215,9 +215,9 @@
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::Network::Request> buildObjectForResourceRequest(const ResourceRequest& request)
</del><ins>+static PassRefPtr<Inspector::Protocol::Network::Request> buildObjectForResourceRequest(const ResourceRequest& request)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Network::Request> requestObject = Inspector::TypeBuilder::Network::Request::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::Request> requestObject = Inspector::Protocol::Network::Request::create()
</ins><span class="cx"> .setUrl(request.url().string())
</span><span class="cx"> .setMethod(request.httpMethod())
</span><span class="cx"> .setHeaders(buildObjectForHeaders(request.httpHeaderFields()));
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> return requestObject;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::Network::Response> buildObjectForResourceResponse(const ResourceResponse& response, DocumentLoader* loader)
</del><ins>+static PassRefPtr<Inspector::Protocol::Network::Response> buildObjectForResourceResponse(const ResourceResponse& response, DocumentLoader* loader)
</ins><span class="cx"> {
</span><span class="cx"> if (response.isNull())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> double status = response.httpStatusCode();
</span><span class="cx"> RefPtr<InspectorObject> headers = buildObjectForHeaders(response.httpHeaderFields());
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Network::Response> responseObject = Inspector::TypeBuilder::Network::Response::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::Response> responseObject = Inspector::Protocol::Network::Response::create()
</ins><span class="cx"> .setUrl(response.url().string())
</span><span class="cx"> .setStatus(status)
</span><span class="cx"> .setStatusText(response.httpStatusText())
</span><span class="lines">@@ -249,14 +249,14 @@
</span><span class="cx"> return responseObject;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::Network::CachedResource> buildObjectForCachedResource(CachedResource* cachedResource, DocumentLoader* loader)
</del><ins>+static PassRefPtr<Inspector::Protocol::Network::CachedResource> buildObjectForCachedResource(CachedResource* cachedResource, DocumentLoader* loader)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Network::CachedResource> resourceObject = Inspector::TypeBuilder::Network::CachedResource::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::CachedResource> resourceObject = Inspector::Protocol::Network::CachedResource::create()
</ins><span class="cx"> .setUrl(cachedResource->url())
</span><span class="cx"> .setType(InspectorPageAgent::cachedResourceTypeJson(*cachedResource))
</span><span class="cx"> .setBodySize(cachedResource->encodedSize());
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Network::Response> resourceResponse = buildObjectForResourceResponse(cachedResource->response(), loader);
</del><ins>+ RefPtr<Inspector::Protocol::Network::Response> resourceResponse = buildObjectForResourceResponse(cachedResource->response(), loader);
</ins><span class="cx"> if (resourceResponse)
</span><span class="cx"> resourceObject->setResponse(resourceResponse);
</span><span class="cx">
</span><span class="lines">@@ -317,9 +317,9 @@
</span><span class="cx"> request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Inspector::TypeBuilder::Page::ResourceType resourceType = InspectorPageAgent::resourceTypeJson(type);
</del><ins>+ Inspector::Protocol::Page::ResourceType resourceType = InspectorPageAgent::resourceTypeJson(type);
</ins><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Network::Initiator> initiatorObject = buildInitiatorObject(loader->frame() ? loader->frame()->document() : nullptr);
</del><ins>+ RefPtr<Inspector::Protocol::Network::Initiator> initiatorObject = buildInitiatorObject(loader->frame() ? loader->frame()->document() : nullptr);
</ins><span class="cx"> m_frontendDispatcher->requestWillBeSent(requestId, m_pageAgent->frameId(loader->frame()), m_pageAgent->loaderId(loader), loader->url().string(), buildObjectForResourceRequest(request), currentTime(), initiatorObject, buildObjectForResourceResponse(redirectResponse, loader), type != InspectorPageAgent::OtherResource ? &resourceType : nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> String requestId = IdentifiersFactory::requestId(identifier);
</span><del>- RefPtr<Inspector::TypeBuilder::Network::Response> resourceResponse = buildObjectForResourceResponse(response, loader);
</del><ins>+ RefPtr<Inspector::Protocol::Network::Response> resourceResponse = buildObjectForResourceResponse(response, loader);
</ins><span class="cx">
</span><span class="cx"> bool isNotModified = response.httpStatusCode() == 304;
</span><span class="cx">
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> if (cachedResource) {
</span><span class="cx"> // Use mime type from cached resource in case the one in response is empty.
</span><span class="cx"> if (resourceResponse && response.mimeType().isEmpty())
</span><del>- resourceResponse->setString(Inspector::TypeBuilder::Network::Response::MimeType, cachedResource->response().mimeType());
</del><ins>+ resourceResponse->setString(Inspector::Protocol::Network::Response::MimeType, cachedResource->response().mimeType());
</ins><span class="cx"> m_resourcesData->addCachedResource(requestId, cachedResource);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> m_resourcesData->reuseXHRReplayData(requestId, rawRequestId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Network::Initiator> initiatorObject = buildInitiatorObject(loader->frame() ? loader->frame()->document() : nullptr);
</del><ins>+ RefPtr<Inspector::Protocol::Network::Initiator> initiatorObject = buildInitiatorObject(loader->frame() ? loader->frame()->document() : nullptr);
</ins><span class="cx">
</span><span class="cx"> m_frontendDispatcher->requestServedFromMemoryCache(requestId, frameId, loaderId, loader->url().string(), currentTime(), initiatorObject, buildObjectForCachedResource(resource, loader));
</span><span class="cx"> }
</span><span class="lines">@@ -551,19 +551,19 @@
</span><span class="cx"> m_styleRecalculationInitiator = buildInitiatorObject(document);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Network::Initiator> InspectorResourceAgent::buildInitiatorObject(Document* document)
</del><ins>+PassRefPtr<Inspector::Protocol::Network::Initiator> InspectorResourceAgent::buildInitiatorObject(Document* document)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ScriptCallStack> stackTrace = createScriptCallStack(JSMainThreadExecState::currentState(), ScriptCallStack::maxCallStackSizeToCapture);
</span><span class="cx"> if (stackTrace && stackTrace->size() > 0) {
</span><del>- RefPtr<Inspector::TypeBuilder::Network::Initiator> initiatorObject = Inspector::TypeBuilder::Network::Initiator::create()
- .setType(Inspector::TypeBuilder::Network::Initiator::Type::Script);
</del><ins>+ RefPtr<Inspector::Protocol::Network::Initiator> initiatorObject = Inspector::Protocol::Network::Initiator::create()
+ .setType(Inspector::Protocol::Network::Initiator::Type::Script);
</ins><span class="cx"> initiatorObject->setStackTrace(stackTrace->buildInspectorArray());
</span><span class="cx"> return initiatorObject;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (document && document->scriptableDocumentParser()) {
</span><del>- RefPtr<Inspector::TypeBuilder::Network::Initiator> initiatorObject = Inspector::TypeBuilder::Network::Initiator::create()
- .setType(Inspector::TypeBuilder::Network::Initiator::Type::Parser);
</del><ins>+ RefPtr<Inspector::Protocol::Network::Initiator> initiatorObject = Inspector::Protocol::Network::Initiator::create()
+ .setType(Inspector::Protocol::Network::Initiator::Type::Parser);
</ins><span class="cx"> initiatorObject->setUrl(document->url().string());
</span><span class="cx"> initiatorObject->setLineNumber(document->scriptableDocumentParser()->textPosition().m_line.oneBasedInt());
</span><span class="cx"> return initiatorObject;
</span><span class="lines">@@ -572,8 +572,8 @@
</span><span class="cx"> if (m_isRecalculatingStyle && m_styleRecalculationInitiator)
</span><span class="cx"> return m_styleRecalculationInitiator;
</span><span class="cx">
</span><del>- return Inspector::TypeBuilder::Network::Initiator::create()
- .setType(Inspector::TypeBuilder::Network::Initiator::Type::Other)
</del><ins>+ return Inspector::Protocol::Network::Initiator::create()
+ .setType(Inspector::Protocol::Network::Initiator::Type::Other)
</ins><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -586,14 +586,14 @@
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::willSendWebSocketHandshakeRequest(unsigned long identifier, const ResourceRequest& request)
</span><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Network::WebSocketRequest> requestObject = Inspector::TypeBuilder::Network::WebSocketRequest::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::WebSocketRequest> requestObject = Inspector::Protocol::Network::WebSocketRequest::create()
</ins><span class="cx"> .setHeaders(buildObjectForHeaders(request.httpHeaderFields()));
</span><span class="cx"> m_frontendDispatcher->webSocketWillSendHandshakeRequest(IdentifiersFactory::requestId(identifier), currentTime(), requestObject);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didReceiveWebSocketHandshakeResponse(unsigned long identifier, const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Network::WebSocketResponse> responseObject = Inspector::TypeBuilder::Network::WebSocketResponse::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::WebSocketResponse> responseObject = Inspector::Protocol::Network::WebSocketResponse::create()
</ins><span class="cx"> .setStatus(response.httpStatusCode())
</span><span class="cx"> .setStatusText(response.httpStatusText())
</span><span class="cx"> .setHeaders(buildObjectForHeaders(response.httpHeaderFields()));
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didReceiveWebSocketFrame(unsigned long identifier, const WebSocketFrame& frame)
</span><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Network::WebSocketFrame> frameObject = Inspector::TypeBuilder::Network::WebSocketFrame::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::WebSocketFrame> frameObject = Inspector::Protocol::Network::WebSocketFrame::create()
</ins><span class="cx"> .setOpcode(frame.opCode)
</span><span class="cx"> .setMask(frame.masked)
</span><span class="cx"> .setPayloadData(String(frame.payload, frame.payloadLength));
</span><span class="lines">@@ -616,7 +616,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didSendWebSocketFrame(unsigned long identifier, const WebSocketFrame& frame)
</span><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Network::WebSocketFrame> frameObject = Inspector::TypeBuilder::Network::WebSocketFrame::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::WebSocketFrame> frameObject = Inspector::Protocol::Network::WebSocketFrame::create()
</ins><span class="cx"> .setOpcode(frame.opCode)
</span><span class="cx"> .setMask(frame.masked)
</span><span class="cx"> .setPayloadData(String(frame.payload, frame.payloadLength));
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> void didRecalculateStyle();
</span><span class="cx"> void didScheduleStyleRecalculation(Document*);
</span><span class="cx">
</span><del>- PassRefPtr<Inspector::TypeBuilder::Network::Initiator> buildInitiatorObject(Document*);
</del><ins>+ PassRefPtr<Inspector::Protocol::Network::Initiator> buildInitiatorObject(Document*);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx"> void didCreateWebSocket(unsigned long identifier, const URL& requestURL);
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> typedef HashMap<ThreadableLoaderClient*, RefPtr<XHRReplayData>> PendingXHRReplayDataMap;
</span><span class="cx"> PendingXHRReplayDataMap m_pendingXHRReplayData;
</span><span class="cx"> // FIXME: InspectorResourceAgent should now be aware of style recalculation.
</span><del>- RefPtr<Inspector::TypeBuilder::Network::Initiator> m_styleRecalculationInitiator;
</del><ins>+ RefPtr<Inspector::Protocol::Network::Initiator> m_styleRecalculationInitiator;
</ins><span class="cx"> bool m_isRecalculatingStyle;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <yarr/RegularExpression.h>
</span><span class="cx">
</span><del>-using Inspector::TypeBuilder::Array;
</del><ins>+using Inspector::Protocol::Array;
</ins><span class="cx"> using WebCore::RuleSourceDataList;
</span><span class="cx"> using WebCore::CSSRuleSourceData;
</span><span class="cx">
</span><span class="lines">@@ -148,14 +148,14 @@
</span><span class="cx"> MediaListSourceImportRule
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::CSS::SourceRange> buildSourceRangeObject(const SourceRange& range, Vector<size_t>* lineEndings)
</del><ins>+static PassRefPtr<Inspector::Protocol::CSS::SourceRange> buildSourceRangeObject(const SourceRange& range, Vector<size_t>* lineEndings)
</ins><span class="cx"> {
</span><span class="cx"> if (!lineEndings)
</span><span class="cx"> return nullptr;
</span><span class="cx"> TextPosition start = ContentSearchUtilities::textPositionFromOffset(range.start, *lineEndings);
</span><span class="cx"> TextPosition end = ContentSearchUtilities::textPositionFromOffset(range.end, *lineEndings);
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::SourceRange> result = Inspector::TypeBuilder::CSS::SourceRange::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::SourceRange> result = Inspector::Protocol::CSS::SourceRange::create()
</ins><span class="cx"> .setStartLine(start.m_line.zeroBasedInt())
</span><span class="cx"> .setStartColumn(start.m_column.zeroBasedInt())
</span><span class="cx"> .setEndLine(end.m_line.zeroBasedInt())
</span><span class="lines">@@ -163,26 +163,26 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::CSS::CSSMedia> buildMediaObject(const MediaList* media, MediaListSource mediaListSource, const String& sourceURL)
</del><ins>+static PassRefPtr<Inspector::Protocol::CSS::CSSMedia> buildMediaObject(const MediaList* media, MediaListSource mediaListSource, const String& sourceURL)
</ins><span class="cx"> {
</span><span class="cx"> // Make certain compilers happy by initializing |source| up-front.
</span><del>- Inspector::TypeBuilder::CSS::CSSMedia::Source source = Inspector::TypeBuilder::CSS::CSSMedia::Source::InlineSheet;
</del><ins>+ Inspector::Protocol::CSS::CSSMedia::Source source = Inspector::Protocol::CSS::CSSMedia::Source::InlineSheet;
</ins><span class="cx"> switch (mediaListSource) {
</span><span class="cx"> case MediaListSourceMediaRule:
</span><del>- source = Inspector::TypeBuilder::CSS::CSSMedia::Source::MediaRule;
</del><ins>+ source = Inspector::Protocol::CSS::CSSMedia::Source::MediaRule;
</ins><span class="cx"> break;
</span><span class="cx"> case MediaListSourceImportRule:
</span><del>- source = Inspector::TypeBuilder::CSS::CSSMedia::Source::ImportRule;
</del><ins>+ source = Inspector::Protocol::CSS::CSSMedia::Source::ImportRule;
</ins><span class="cx"> break;
</span><span class="cx"> case MediaListSourceLinkedSheet:
</span><del>- source = Inspector::TypeBuilder::CSS::CSSMedia::Source::LinkedSheet;
</del><ins>+ source = Inspector::Protocol::CSS::CSSMedia::Source::LinkedSheet;
</ins><span class="cx"> break;
</span><span class="cx"> case MediaListSourceInlineSheet:
</span><del>- source = Inspector::TypeBuilder::CSS::CSSMedia::Source::InlineSheet;
</del><ins>+ source = Inspector::Protocol::CSS::CSSMedia::Source::InlineSheet;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSMedia> mediaObject = Inspector::TypeBuilder::CSS::CSSMedia::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSMedia> mediaObject = Inspector::Protocol::CSS::CSSMedia::create()
</ins><span class="cx"> .setText(media->mediaText())
</span><span class="cx"> .setSource(source);
</span><span class="cx">
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void fillMediaListChain(CSSRule* rule, Array<Inspector::TypeBuilder::CSS::CSSMedia>* mediaArray)
</del><ins>+static void fillMediaListChain(CSSRule* rule, Array<Inspector::Protocol::CSS::CSSMedia>* mediaArray)
</ins><span class="cx"> {
</span><span class="cx"> MediaList* mediaList;
</span><span class="cx"> CSSRule* parentRule = rule;
</span><span class="lines">@@ -306,11 +306,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyle> InspectorStyle::buildObjectForStyle() const
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorStyle::buildObjectForStyle() const
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSStyle> result = styleWithProperties();
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSStyle> result = styleWithProperties();
</ins><span class="cx"> if (!m_styleId.isEmpty())
</span><del>- result->setStyleId(m_styleId.asProtocolValue<Inspector::TypeBuilder::CSS::CSSStyleId>());
</del><ins>+ result->setStyleId(m_styleId.asProtocolValue<Inspector::Protocol::CSS::CSSStyleId>());
</ins><span class="cx">
</span><span class="cx"> result->setWidth(m_style->getPropertyValue("width"));
</span><span class="cx"> result->setHeight(m_style->getPropertyValue("height"));
</span><span class="lines">@@ -322,15 +322,15 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSComputedStyleProperty>> InspectorStyle::buildArrayForComputedStyle() const
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>> InspectorStyle::buildArrayForComputedStyle() const
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSComputedStyleProperty>> result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSComputedStyleProperty>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>> result = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>::create();
</ins><span class="cx"> Vector<InspectorStyleProperty> properties;
</span><span class="cx"> populateAllProperties(&properties);
</span><span class="cx">
</span><span class="cx"> for (Vector<InspectorStyleProperty>::iterator it = properties.begin(), itEnd = properties.end(); it != itEnd; ++it) {
</span><span class="cx"> const CSSPropertySourceData& propertyEntry = it->sourceData;
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSComputedStyleProperty> entry = Inspector::TypeBuilder::CSS::CSSComputedStyleProperty::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSComputedStyleProperty> entry = Inspector::Protocol::CSS::CSSComputedStyleProperty::create()
</ins><span class="cx"> .setName(propertyEntry.name)
</span><span class="cx"> .setValue(propertyEntry.value);
</span><span class="cx"> result->addItem(entry);
</span><span class="lines">@@ -509,14 +509,14 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyle> InspectorStyle::styleWithProperties() const
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorStyle::styleWithProperties() const
</ins><span class="cx"> {
</span><span class="cx"> Vector<InspectorStyleProperty> properties;
</span><span class="cx"> populateAllProperties(&properties);
</span><span class="cx">
</span><del>- RefPtr<Array<Inspector::TypeBuilder::CSS::CSSProperty>> propertiesObject = Array<Inspector::TypeBuilder::CSS::CSSProperty>::create();
- RefPtr<Array<Inspector::TypeBuilder::CSS::ShorthandEntry>> shorthandEntries = Array<Inspector::TypeBuilder::CSS::ShorthandEntry>::create();
- HashMap<String, RefPtr<Inspector::TypeBuilder::CSS::CSSProperty>> propertyNameToPreviousActiveProperty;
</del><ins>+ RefPtr<Array<Inspector::Protocol::CSS::CSSProperty>> propertiesObject = Array<Inspector::Protocol::CSS::CSSProperty>::create();
+ RefPtr<Array<Inspector::Protocol::CSS::ShorthandEntry>> shorthandEntries = Array<Inspector::Protocol::CSS::ShorthandEntry>::create();
+ HashMap<String, RefPtr<Inspector::Protocol::CSS::CSSProperty>> propertyNameToPreviousActiveProperty;
</ins><span class="cx"> HashSet<String> foundShorthands;
</span><span class="cx"> String previousPriority;
</span><span class="cx"> String previousStatus;
</span><span class="lines">@@ -530,13 +530,13 @@
</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::TypeBuilder::CSS::CSSPropertyStatus status;
</del><ins>+ enum class Inspector::Protocol::CSS::CSSPropertyStatus status;
</ins><span class="cx"> #else
</span><del>- enum Inspector::TypeBuilder::CSS::CSSPropertyStatus status;
</del><ins>+ enum Inspector::Protocol::CSS::CSSPropertyStatus status;
</ins><span class="cx"> #endif
</span><del>- status = it->disabled ? Inspector::TypeBuilder::CSS::CSSPropertyStatus::Disabled : Inspector::TypeBuilder::CSS::CSSPropertyStatus::Active;
</del><ins>+ status = it->disabled ? Inspector::Protocol::CSS::CSSPropertyStatus::Disabled : Inspector::Protocol::CSS::CSSPropertyStatus::Active;
</ins><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSProperty> property = Inspector::TypeBuilder::CSS::CSSProperty::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSProperty> property = Inspector::Protocol::CSS::CSSProperty::create()
</ins><span class="cx"> .setName(name.lower())
</span><span class="cx"> .setValue(propertyEntry.value);
</span><span class="cx">
</span><span class="lines">@@ -569,22 +569,22 @@
</span><span class="cx"> CSSPropertyID propertyId = cssPropertyID(name);
</span><span class="cx"> // Canonicalize property names to treat non-prefixed and vendor-prefixed property names the same (opacity vs. -webkit-opacity).
</span><span class="cx"> String canonicalPropertyName = propertyId ? getPropertyNameString(propertyId) : name;
</span><del>- HashMap<String, RefPtr<Inspector::TypeBuilder::CSS::CSSProperty>>::iterator activeIt = propertyNameToPreviousActiveProperty.find(canonicalPropertyName);
</del><ins>+ HashMap<String, RefPtr<Inspector::Protocol::CSS::CSSProperty>>::iterator activeIt = propertyNameToPreviousActiveProperty.find(canonicalPropertyName);
</ins><span class="cx"> if (activeIt != propertyNameToPreviousActiveProperty.end()) {
</span><span class="cx"> if (propertyEntry.parsedOk) {
</span><del>- bool successPriority = activeIt->value->getString(Inspector::TypeBuilder::CSS::CSSProperty::Priority, &previousPriority);
- bool successStatus = activeIt->value->getString(Inspector::TypeBuilder::CSS::CSSProperty::Status, &previousStatus);
</del><ins>+ bool successPriority = activeIt->value->getString(Inspector::Protocol::CSS::CSSProperty::Priority, &previousPriority);
+ bool successStatus = activeIt->value->getString(Inspector::Protocol::CSS::CSSProperty::Status, &previousStatus);
</ins><span class="cx"> if (successStatus && previousStatus != "inactive") {
</span><span class="cx"> if (propertyEntry.important || !successPriority) // Priority not set == "not important".
</span><span class="cx"> shouldInactivate = true;
</span><del>- else if (status == Inspector::TypeBuilder::CSS::CSSPropertyStatus::Active) {
</del><ins>+ else if (status == Inspector::Protocol::CSS::CSSPropertyStatus::Active) {
</ins><span class="cx"> // Inactivate a non-important property following the same-named important property.
</span><del>- status = Inspector::TypeBuilder::CSS::CSSPropertyStatus::Inactive;
</del><ins>+ status = Inspector::Protocol::CSS::CSSPropertyStatus::Inactive;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> bool previousParsedOk;
</span><del>- bool success = activeIt->value->getBoolean(Inspector::TypeBuilder::CSS::CSSProperty::ParsedOk, &previousParsedOk);
</del><ins>+ bool success = activeIt->value->getBoolean(Inspector::Protocol::CSS::CSSProperty::ParsedOk, &previousParsedOk);
</ins><span class="cx"> if (success && !previousParsedOk)
</span><span class="cx"> shouldInactivate = true;
</span><span class="cx"> }
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx"> propertyNameToPreviousActiveProperty.set(canonicalPropertyName, property);
</span><span class="cx">
</span><span class="cx"> if (shouldInactivate) {
</span><del>- activeIt->value->setStatus(Inspector::TypeBuilder::CSS::CSSPropertyStatus::Inactive);
</del><ins>+ activeIt->value->setStatus(Inspector::Protocol::CSS::CSSPropertyStatus::Inactive);
</ins><span class="cx"> propertyNameToPreviousActiveProperty.set(canonicalPropertyName, property);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -600,13 +600,13 @@
</span><span class="cx"> // Default "implicit" == false.
</span><span class="cx"> if (implicit)
</span><span class="cx"> property->setImplicit(true);
</span><del>- status = Inspector::TypeBuilder::CSS::CSSPropertyStatus::Style;
</del><ins>+ status = Inspector::Protocol::CSS::CSSPropertyStatus::Style;
</ins><span class="cx">
</span><span class="cx"> String shorthand = m_style->getPropertyShorthand(name);
</span><span class="cx"> if (!shorthand.isEmpty()) {
</span><span class="cx"> if (!foundShorthands.contains(shorthand)) {
</span><span class="cx"> foundShorthands.add(shorthand);
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::ShorthandEntry> entry = Inspector::TypeBuilder::CSS::ShorthandEntry::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::ShorthandEntry> entry = Inspector::Protocol::CSS::ShorthandEntry::create()
</ins><span class="cx"> .setName(shorthand)
</span><span class="cx"> .setValue(shorthandValue(shorthand));
</span><span class="cx"> shorthandEntries->addItem(entry);
</span><span class="lines">@@ -616,11 +616,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Default "status" == "style".
</span><del>- if (status != Inspector::TypeBuilder::CSS::CSSPropertyStatus::Style)
</del><ins>+ if (status != Inspector::Protocol::CSS::CSSPropertyStatus::Style)
</ins><span class="cx"> property->setStatus(status);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSStyle> result = Inspector::TypeBuilder::CSS::CSSStyle::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSStyle> result = Inspector::Protocol::CSS::CSSStyle::create()
</ins><span class="cx"> .setCssProperties(propertiesObject)
</span><span class="cx"> .setShorthandEntries(shorthandEntries);
</span><span class="cx"> return result.release();
</span><span class="lines">@@ -755,7 +755,7 @@
</span><span class="cx"> return m_format;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<InspectorStyleSheet> InspectorStyleSheet::create(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::TypeBuilder::CSS::StyleSheetOrigin origin, const String& documentURL, Listener* listener)
</del><ins>+PassRefPtr<InspectorStyleSheet> InspectorStyleSheet::create(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin origin, const String& documentURL, Listener* listener)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new InspectorStyleSheet(pageAgent, id, pageStyleSheet, origin, documentURL, listener));
</span><span class="cx"> }
</span><span class="lines">@@ -768,7 +768,7 @@
</span><span class="cx"> return emptyString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorStyleSheet::InspectorStyleSheet(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::TypeBuilder::CSS::StyleSheetOrigin origin, const String& documentURL, Listener* listener)
</del><ins>+InspectorStyleSheet::InspectorStyleSheet(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin origin, const String& documentURL, Listener* listener)
</ins><span class="cx"> : m_pageAgent(pageAgent)
</span><span class="cx"> , m_id(id)
</span><span class="cx"> , m_pageStyleSheet(pageStyleSheet)
</span><span class="lines">@@ -959,7 +959,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyleSheetBody> InspectorStyleSheet::buildObjectForStyleSheet()
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody> InspectorStyleSheet::buildObjectForStyleSheet()
</ins><span class="cx"> {
</span><span class="cx"> CSSStyleSheet* styleSheet = pageStyleSheet();
</span><span class="cx"> if (!styleSheet)
</span><span class="lines">@@ -967,7 +967,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSRuleList> cssRuleList = asCSSRuleList(styleSheet);
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSStyleSheetBody> result = Inspector::TypeBuilder::CSS::CSSStyleSheetBody::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody> result = Inspector::Protocol::CSS::CSSStyleSheetBody::create()
</ins><span class="cx"> .setStyleSheetId(id())
</span><span class="cx"> .setRules(buildArrayForRuleList(cssRuleList.get()));
</span><span class="cx">
</span><span class="lines">@@ -979,7 +979,7 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader> InspectorStyleSheet::buildObjectForStyleSheetInfo()
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyleSheetHeader> InspectorStyleSheet::buildObjectForStyleSheetInfo()
</ins><span class="cx"> {
</span><span class="cx"> CSSStyleSheet* styleSheet = pageStyleSheet();
</span><span class="cx"> if (!styleSheet)
</span><span class="lines">@@ -987,7 +987,7 @@
</span><span class="cx">
</span><span class="cx"> Document* document = styleSheet->ownerDocument();
</span><span class="cx"> Frame* frame = document ? document->frame() : nullptr;
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader> result = Inspector::TypeBuilder::CSS::CSSStyleSheetHeader::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSStyleSheetHeader> result = Inspector::Protocol::CSS::CSSStyleSheetHeader::create()
</ins><span class="cx"> .setStyleSheetId(id())
</span><span class="cx"> .setOrigin(m_origin)
</span><span class="cx"> .setDisabled(styleSheet->disabled())
</span><span class="lines">@@ -998,10 +998,10 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<Inspector::TypeBuilder::Array<String>> selectorsFromSource(const CSSRuleSourceData* sourceData, const String& sheetText)
</del><ins>+static PassRefPtr<Inspector::Protocol::Array<String>> selectorsFromSource(const CSSRuleSourceData* sourceData, const String& sheetText)
</ins><span class="cx"> {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(JSC::Yarr::RegularExpression, comment, ("/\\*[^]*?\\*/", TextCaseSensitive, JSC::Yarr::MultilineEnabled));
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> result = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> result = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> const SelectorRangeList& ranges = sourceData->selectorRanges;
</span><span class="cx"> for (size_t i = 0, size = ranges.size(); i < size; ++i) {
</span><span class="cx"> const SourceRange& range = ranges.at(i);
</span><span class="lines">@@ -1014,12 +1014,12 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::CSS::SelectorList> InspectorStyleSheet::buildObjectForSelectorList(CSSStyleRule* rule)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::SelectorList> InspectorStyleSheet::buildObjectForSelectorList(CSSStyleRule* rule)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSRuleSourceData> sourceData;
</span><span class="cx"> if (ensureParsedDataReady())
</span><span class="cx"> sourceData = ruleSourceDataFor(rule->style());
</span><del>- RefPtr<Inspector::TypeBuilder::Array<String>> selectors;
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> selectors;
</ins><span class="cx">
</span><span class="cx"> // This intentionally does not rely on the source data to avoid catching the trailing comments (before the declaration starting '{').
</span><span class="cx"> String selectorText = rule->selectorText();
</span><span class="lines">@@ -1027,12 +1027,12 @@
</span><span class="cx"> if (sourceData)
</span><span class="cx"> selectors = selectorsFromSource(sourceData.get(), m_parsedStyleSheet->text());
</span><span class="cx"> else {
</span><del>- selectors = Inspector::TypeBuilder::Array<String>::create();
</del><ins>+ selectors = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> const CSSSelectorList& selectorList = rule->styleRule()->selectorList();
</span><span class="cx"> for (const CSSSelector* selector = selectorList.first(); selector; selector = CSSSelectorList::next(selector))
</span><span class="cx"> selectors->addItem(selector->selectorText());
</span><span class="cx"> }
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::SelectorList> result = Inspector::TypeBuilder::CSS::SelectorList::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::SelectorList> result = Inspector::Protocol::CSS::SelectorList::create()
</ins><span class="cx"> .setSelectors(selectors)
</span><span class="cx"> .setText(selectorText)
</span><span class="cx"> .release();
</span><span class="lines">@@ -1041,29 +1041,29 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::CSS::CSSRule> InspectorStyleSheet::buildObjectForRule(CSSStyleRule* rule)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSRule> InspectorStyleSheet::buildObjectForRule(CSSStyleRule* rule)
</ins><span class="cx"> {
</span><span class="cx"> CSSStyleSheet* styleSheet = pageStyleSheet();
</span><span class="cx"> if (!styleSheet)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSRule> result = Inspector::TypeBuilder::CSS::CSSRule::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSRule> result = Inspector::Protocol::CSS::CSSRule::create()
</ins><span class="cx"> .setSelectorList(buildObjectForSelectorList(rule))
</span><span class="cx"> .setSourceLine(rule->styleRule()->sourceLine())
</span><span class="cx"> .setOrigin(m_origin)
</span><span class="cx"> .setStyle(buildObjectForStyle(rule->style()));
</span><span class="cx">
</span><span class="cx"> // "sourceURL" is present only for regular rules, otherwise "origin" should be used in the frontend.
</span><del>- if (m_origin == Inspector::TypeBuilder::CSS::StyleSheetOrigin::Regular)
</del><ins>+ if (m_origin == Inspector::Protocol::CSS::StyleSheetOrigin::Regular)
</ins><span class="cx"> result->setSourceURL(finalURL());
</span><span class="cx">
</span><span class="cx"> if (canBind()) {
</span><span class="cx"> InspectorCSSId id(ruleId(rule));
</span><span class="cx"> if (!id.isEmpty())
</span><del>- result->setRuleId(id.asProtocolValue<Inspector::TypeBuilder::CSS::CSSRuleId>());
</del><ins>+ result->setRuleId(id.asProtocolValue<Inspector::Protocol::CSS::CSSRuleId>());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Array<Inspector::TypeBuilder::CSS::CSSMedia>> mediaArray = Array<Inspector::TypeBuilder::CSS::CSSMedia>::create();
</del><ins>+ RefPtr<Array<Inspector::Protocol::CSS::CSSMedia>> mediaArray = Array<Inspector::Protocol::CSS::CSSMedia>::create();
</ins><span class="cx">
</span><span class="cx"> fillMediaListChain(rule, mediaArray.get());
</span><span class="cx"> if (mediaArray->length())
</span><span class="lines">@@ -1072,7 +1072,7 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyle> InspectorStyleSheet::buildObjectForStyle(CSSStyleDeclaration* style)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorStyleSheet::buildObjectForStyle(CSSStyleDeclaration* style)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSRuleSourceData> sourceData;
</span><span class="cx"> if (ensureParsedDataReady())
</span><span class="lines">@@ -1080,13 +1080,13 @@
</span><span class="cx">
</span><span class="cx"> InspectorCSSId id = ruleOrStyleId(style);
</span><span class="cx"> if (id.isEmpty()) {
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSStyle> bogusStyle = Inspector::TypeBuilder::CSS::CSSStyle::create()
- .setCssProperties(Array<Inspector::TypeBuilder::CSS::CSSProperty>::create())
- .setShorthandEntries(Array<Inspector::TypeBuilder::CSS::ShorthandEntry>::create());
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSStyle> bogusStyle = Inspector::Protocol::CSS::CSSStyle::create()
+ .setCssProperties(Array<Inspector::Protocol::CSS::CSSProperty>::create())
+ .setShorthandEntries(Array<Inspector::Protocol::CSS::ShorthandEntry>::create());
</ins><span class="cx"> return bogusStyle.release();
</span><span class="cx"> }
</span><span class="cx"> RefPtr<InspectorStyle> inspectorStyle = inspectorStyleForId(id);
</span><del>- RefPtr<Inspector::TypeBuilder::CSS::CSSStyle> result = inspectorStyle->buildObjectForStyle();
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSStyle> result = inspectorStyle->buildObjectForStyle();
</ins><span class="cx">
</span><span class="cx"> // Style text cannot be retrieved without stylesheet, so set cssText here.
</span><span class="cx"> if (sourceData) {
</span><span class="lines">@@ -1370,7 +1370,7 @@
</span><span class="cx">
</span><span class="cx"> bool InspectorStyleSheet::resourceStyleSheetText(String* result) const
</span><span class="cx"> {
</span><del>- if (m_origin == Inspector::TypeBuilder::CSS::StyleSheetOrigin::User || m_origin == Inspector::TypeBuilder::CSS::StyleSheetOrigin::UserAgent)
</del><ins>+ if (m_origin == Inspector::Protocol::CSS::StyleSheetOrigin::User || m_origin == Inspector::Protocol::CSS::StyleSheetOrigin::UserAgent)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!m_pageStyleSheet || !ownerDocument() || !ownerDocument()->frame())
</span><span class="lines">@@ -1398,9 +1398,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>> InspectorStyleSheet::buildArrayForRuleList(CSSRuleList* ruleList)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> InspectorStyleSheet::buildArrayForRuleList(CSSRuleList* ruleList)
</ins><span class="cx"> {
</span><del>- RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>> result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> result = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>::create();
</ins><span class="cx"> if (!ruleList)
</span><span class="cx"> return result.release();
</span><span class="cx">
</span><span class="lines">@@ -1432,12 +1432,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<InspectorStyleSheetForInlineStyle> InspectorStyleSheetForInlineStyle::create(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<Element> element, Inspector::TypeBuilder::CSS::StyleSheetOrigin origin, Listener* listener)
</del><ins>+PassRefPtr<InspectorStyleSheetForInlineStyle> InspectorStyleSheetForInlineStyle::create(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<Element> element, Inspector::Protocol::CSS::StyleSheetOrigin origin, Listener* listener)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new InspectorStyleSheetForInlineStyle(pageAgent, id, element, origin, listener));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorStyleSheetForInlineStyle::InspectorStyleSheetForInlineStyle(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<Element> element, Inspector::TypeBuilder::CSS::StyleSheetOrigin origin, Listener* listener)
</del><ins>+InspectorStyleSheetForInlineStyle::InspectorStyleSheetForInlineStyle(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<Element> element, Inspector::Protocol::CSS::StyleSheetOrigin origin, Listener* listener)
</ins><span class="cx"> : InspectorStyleSheet(pageAgent, id, nullptr, origin, "", listener)
</span><span class="cx"> , m_element(element)
</span><span class="cx"> , m_ruleSourceData(nullptr)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.h (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.h 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.h 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "CSSStyleDeclaration.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "InspectorStyleTextEditor.h"
</span><del>-#include "InspectorWebTypeBuilders.h"
</del><ins>+#include "InspectorWebProtocolTypes.h"
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> const String& styleSheetId() const { return m_styleSheetId; }
</span><span class="cx"> unsigned ordinal() const { return m_ordinal; }
</span><span class="cx">
</span><del>- // ID type is either Inspector::TypeBuilder::CSS::CSSStyleId or Inspector::TypeBuilder::CSS::CSSRuleId.
</del><ins>+ // ID type is either Inspector::Protocol::CSS::CSSStyleId or Inspector::Protocol::CSS::CSSRuleId.
</ins><span class="cx"> template<typename ID>
</span><span class="cx"> PassRefPtr<ID> asProtocolValue() const
</span><span class="cx"> {
</span><span class="lines">@@ -139,8 +139,8 @@
</span><span class="cx"> virtual ~InspectorStyle();
</span><span class="cx">
</span><span class="cx"> CSSStyleDeclaration* cssStyle() const { return m_style.get(); }
</span><del>- PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyle> buildObjectForStyle() const;
- PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSComputedStyleProperty>> buildArrayForComputedStyle() const;
</del><ins>+ PassRefPtr<Inspector::Protocol::CSS::CSSStyle> buildObjectForStyle() const;
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>> buildArrayForComputedStyle() const;
</ins><span class="cx"> bool hasDisabledProperties() const { return !m_disabledProperties.isEmpty(); }
</span><span class="cx"> bool setPropertyText(unsigned index, const String& text, bool overwrite, String* oldText, ExceptionCode&);
</span><span class="cx"> bool toggleProperty(unsigned index, bool disable, ExceptionCode&);
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> bool applyStyleText(const String& text) { ExceptionCode ec = 0; return setText(text, ec); }
</span><span class="cx">
</span><span class="cx"> bool populateAllProperties(Vector<InspectorStyleProperty>* result) const;
</span><del>- PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyle> styleWithProperties() const;
</del><ins>+ PassRefPtr<Inspector::Protocol::CSS::CSSStyle> styleWithProperties() const;
</ins><span class="cx"> PassRefPtr<CSSRuleSourceData> extractSourceData() const;
</span><span class="cx"> String shorthandValue(const String& shorthandProperty) const;
</span><span class="cx"> String shorthandPriority(const String& shorthandProperty) const;
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef HashMap<CSSStyleDeclaration*, RefPtr<InspectorStyle>> InspectorStyleMap;
</span><del>- static PassRefPtr<InspectorStyleSheet> create(InspectorPageAgent*, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::TypeBuilder::CSS::StyleSheetOrigin, const String& documentURL, Listener*);
</del><ins>+ static PassRefPtr<InspectorStyleSheet> create(InspectorPageAgent*, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin, const String& documentURL, Listener*);
</ins><span class="cx"> static String styleSheetURL(CSSStyleSheet* pageStyleSheet);
</span><span class="cx">
</span><span class="cx"> virtual ~InspectorStyleSheet();
</span><span class="lines">@@ -196,10 +196,10 @@
</span><span class="cx"> CSSStyleRule* addRule(const String& selector, ExceptionCode&);
</span><span class="cx"> bool deleteRule(const InspectorCSSId&, ExceptionCode&);
</span><span class="cx"> CSSStyleRule* ruleForId(const InspectorCSSId&) const;
</span><del>- PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyleSheetBody> buildObjectForStyleSheet();
- PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader> buildObjectForStyleSheetInfo();
- PassRefPtr<Inspector::TypeBuilder::CSS::CSSRule> buildObjectForRule(CSSStyleRule*);
- PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyle> buildObjectForStyle(CSSStyleDeclaration*);
</del><ins>+ PassRefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody> buildObjectForStyleSheet();
+ PassRefPtr<Inspector::Protocol::CSS::CSSStyleSheetHeader> buildObjectForStyleSheetInfo();
+ PassRefPtr<Inspector::Protocol::CSS::CSSRule> buildObjectForRule(CSSStyleRule*);
+ PassRefPtr<Inspector::Protocol::CSS::CSSStyle> buildObjectForStyle(CSSStyleDeclaration*);
</ins><span class="cx"> bool setStyleText(const InspectorCSSId&, const String& text, String* oldText, ExceptionCode&);
</span><span class="cx"> bool setPropertyText(const InspectorCSSId&, unsigned propertyIndex, const String& text, bool overwrite, String* oldPropertyText, ExceptionCode&);
</span><span class="cx"> bool toggleProperty(const InspectorCSSId&, unsigned propertyIndex, bool disable, ExceptionCode&);
</span><span class="lines">@@ -212,9 +212,9 @@
</span><span class="cx"> InspectorCSSId styleId(CSSStyleDeclaration* style) const { return ruleOrStyleId(style); }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- InspectorStyleSheet(InspectorPageAgent*, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::TypeBuilder::CSS::StyleSheetOrigin, const String& documentURL, Listener*);
</del><ins>+ InspectorStyleSheet(InspectorPageAgent*, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin, const String& documentURL, Listener*);
</ins><span class="cx">
</span><del>- bool canBind() const { return m_origin != Inspector::TypeBuilder::CSS::StyleSheetOrigin::UserAgent && m_origin != Inspector::TypeBuilder::CSS::StyleSheetOrigin::User; }
</del><ins>+ bool canBind() const { return m_origin != Inspector::Protocol::CSS::StyleSheetOrigin::UserAgent && m_origin != Inspector::Protocol::CSS::StyleSheetOrigin::User; }
</ins><span class="cx"> InspectorCSSId ruleOrStyleId(CSSStyleDeclaration* style) const;
</span><span class="cx"> virtual Document* ownerDocument() const;
</span><span class="cx"> virtual RefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const;
</span><span class="lines">@@ -242,13 +242,13 @@
</span><span class="cx"> bool originalStyleSheetText(String* result) const;
</span><span class="cx"> bool resourceStyleSheetText(String* result) const;
</span><span class="cx"> bool inlineStyleSheetText(String* result) const;
</span><del>- PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>> buildArrayForRuleList(CSSRuleList*);
- PassRefPtr<Inspector::TypeBuilder::CSS::SelectorList> buildObjectForSelectorList(CSSStyleRule*);
</del><ins>+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> buildArrayForRuleList(CSSRuleList*);
+ PassRefPtr<Inspector::Protocol::CSS::SelectorList> buildObjectForSelectorList(CSSStyleRule*);
</ins><span class="cx">
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> String m_id;
</span><span class="cx"> RefPtr<CSSStyleSheet> m_pageStyleSheet;
</span><del>- Inspector::TypeBuilder::CSS::StyleSheetOrigin m_origin;
</del><ins>+ Inspector::Protocol::CSS::StyleSheetOrigin m_origin;
</ins><span class="cx"> String m_documentURL;
</span><span class="cx"> bool m_isRevalidating;
</span><span class="cx"> ParsedStyleSheet* m_parsedStyleSheet;
</span><span class="lines">@@ -259,14 +259,14 @@
</span><span class="cx">
</span><span class="cx"> class InspectorStyleSheetForInlineStyle : public InspectorStyleSheet {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<InspectorStyleSheetForInlineStyle> create(InspectorPageAgent*, const String& id, PassRefPtr<Element>, Inspector::TypeBuilder::CSS::StyleSheetOrigin, Listener*);
</del><ins>+ static PassRefPtr<InspectorStyleSheetForInlineStyle> create(InspectorPageAgent*, const String& id, PassRefPtr<Element>, Inspector::Protocol::CSS::StyleSheetOrigin, Listener*);
</ins><span class="cx">
</span><span class="cx"> void didModifyElementAttribute();
</span><span class="cx"> virtual bool getText(String* result) const override;
</span><span class="cx"> virtual CSSStyleDeclaration* styleForId(const InspectorCSSId& id) const override { ASSERT_UNUSED(id, !id.ordinal()); return inlineStyle(); }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- InspectorStyleSheetForInlineStyle(InspectorPageAgent*, const String& id, PassRefPtr<Element>, Inspector::TypeBuilder::CSS::StyleSheetOrigin, Listener*);
</del><ins>+ InspectorStyleSheetForInlineStyle(InspectorPageAgent*, const String& id, PassRefPtr<Element>, Inspector::Protocol::CSS::StyleSheetOrigin, Listener*);
</ins><span class="cx">
</span><span class="cx"> virtual Document* ownerDocument() const override;
</span><span class="cx"> virtual RefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const override { ASSERT_UNUSED(style, style == inlineStyle()); return m_ruleSourceData; }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -554,99 +554,99 @@
</span><span class="cx"> appendRecord(TimelineRecordFactory::createProbeSampleData(action, hitCount), TimelineRecordType::ProbeSample, false, frameFromExecState(exec));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Inspector::TypeBuilder::Timeline::EventType toProtocol(TimelineRecordType type)
</del><ins>+static Inspector::Protocol::Timeline::EventType toProtocol(TimelineRecordType type)
</ins><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case TimelineRecordType::EventDispatch:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::EventDispatch;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::EventDispatch;
</ins><span class="cx"> case TimelineRecordType::ScheduleStyleRecalculation:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::ScheduleStyleRecalculation;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::ScheduleStyleRecalculation;
</ins><span class="cx"> case TimelineRecordType::RecalculateStyles:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::RecalculateStyles;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::RecalculateStyles;
</ins><span class="cx"> case TimelineRecordType::InvalidateLayout:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::InvalidateLayout;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::InvalidateLayout;
</ins><span class="cx"> case TimelineRecordType::Layout:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::Layout;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::Layout;
</ins><span class="cx"> case TimelineRecordType::Paint:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::Paint;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::Paint;
</ins><span class="cx"> case TimelineRecordType::ScrollLayer:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::ScrollLayer;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::ScrollLayer;
</ins><span class="cx"> case TimelineRecordType::ResizeImage:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::ResizeImage;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::ResizeImage;
</ins><span class="cx">
</span><span class="cx"> case TimelineRecordType::ParseHTML:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::ParseHTML;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::ParseHTML;
</ins><span class="cx">
</span><span class="cx"> case TimelineRecordType::TimerInstall:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::TimerInstall;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::TimerInstall;
</ins><span class="cx"> case TimelineRecordType::TimerRemove:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::TimerRemove;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::TimerRemove;
</ins><span class="cx"> case TimelineRecordType::TimerFire:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::TimerFire;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::TimerFire;
</ins><span class="cx">
</span><span class="cx"> case TimelineRecordType::EvaluateScript:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::EvaluateScript;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::EvaluateScript;
</ins><span class="cx">
</span><span class="cx"> case TimelineRecordType::MarkLoad:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::MarkLoad;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::MarkLoad;
</ins><span class="cx"> case TimelineRecordType::MarkDOMContent:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::MarkDOMContent;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::MarkDOMContent;
</ins><span class="cx">
</span><span class="cx"> case TimelineRecordType::TimeStamp:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::TimeStamp;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::TimeStamp;
</ins><span class="cx"> case TimelineRecordType::Time:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::Time;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::Time;
</ins><span class="cx"> case TimelineRecordType::TimeEnd:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::TimeEnd;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::TimeEnd;
</ins><span class="cx">
</span><span class="cx"> case TimelineRecordType::ScheduleResourceRequest:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::ScheduleResourceRequest;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::ScheduleResourceRequest;
</ins><span class="cx"> case TimelineRecordType::ResourceSendRequest:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::ResourceSendRequest;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::ResourceSendRequest;
</ins><span class="cx"> case TimelineRecordType::ResourceReceiveResponse:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::ResourceReceiveResponse;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::ResourceReceiveResponse;
</ins><span class="cx"> case TimelineRecordType::ResourceReceivedData:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::ResourceReceivedData;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::ResourceReceivedData;
</ins><span class="cx"> case TimelineRecordType::ResourceFinish:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::ResourceFinish;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::ResourceFinish;
</ins><span class="cx">
</span><span class="cx"> case TimelineRecordType::XHRReadyStateChange:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::XHRReadyStateChange;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::XHRReadyStateChange;
</ins><span class="cx"> case TimelineRecordType::XHRLoad:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::XHRLoad;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::XHRLoad;
</ins><span class="cx">
</span><span class="cx"> case TimelineRecordType::FunctionCall:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::FunctionCall;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::FunctionCall;
</ins><span class="cx"> case TimelineRecordType::ProbeSample:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::ProbeSample;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::ProbeSample;
</ins><span class="cx"> case TimelineRecordType::ConsoleProfile:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::ConsoleProfile;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::ConsoleProfile;
</ins><span class="cx">
</span><span class="cx"> case TimelineRecordType::RequestAnimationFrame:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::RequestAnimationFrame;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::RequestAnimationFrame;
</ins><span class="cx"> case TimelineRecordType::CancelAnimationFrame:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::CancelAnimationFrame;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::CancelAnimationFrame;
</ins><span class="cx"> case TimelineRecordType::FireAnimationFrame:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::FireAnimationFrame;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::FireAnimationFrame;
</ins><span class="cx">
</span><span class="cx"> case TimelineRecordType::WebSocketCreate:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::WebSocketCreate;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::WebSocketCreate;
</ins><span class="cx"> case TimelineRecordType::WebSocketSendHandshakeRequest:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::WebSocketSendHandshakeRequest;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::WebSocketSendHandshakeRequest;
</ins><span class="cx"> case TimelineRecordType::WebSocketReceiveHandshakeResponse:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::WebSocketReceiveHandshakeResponse;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::WebSocketReceiveHandshakeResponse;
</ins><span class="cx"> case TimelineRecordType::WebSocketDestroy:
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::WebSocketDestroy;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::WebSocketDestroy;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return Inspector::TypeBuilder::Timeline::EventType::TimeStamp;
</del><ins>+ return Inspector::Protocol::Timeline::EventType::TimeStamp;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::addRecordToTimeline(PassRefPtr<InspectorObject> prpRecord, TimelineRecordType type)
</span><span class="cx"> {
</span><del>- prpRecord->setString("type", Inspector::TypeBuilder::getWebEnumConstantValue(toProtocol(type)));
</del><ins>+ prpRecord->setString("type", Inspector::Protocol::getWebEnumConstantValue(toProtocol(type)));
</ins><span class="cx">
</span><del>- RefPtr<Inspector::TypeBuilder::Timeline::TimelineEvent> record = BindingTraits<Inspector::TypeBuilder::Timeline::TimelineEvent>::runtimeCast(prpRecord);
</del><ins>+ RefPtr<Inspector::Protocol::Timeline::TimelineEvent> record = BindingTraits<Inspector::Protocol::Timeline::TimelineEvent>::runtimeCast(prpRecord);
</ins><span class="cx">
</span><span class="cx"> if (m_recordStack.isEmpty())
</span><span class="cx"> sendEvent(record.release());
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: runtimeCast is a hack. We do it because we can't build TimelineEvent directly now.
</span><del>- RefPtr<Inspector::TypeBuilder::Timeline::TimelineEvent> recordChecked = BindingTraits<Inspector::TypeBuilder::Timeline::TimelineEvent>::runtimeCast(event);
</del><ins>+ RefPtr<Inspector::Protocol::Timeline::TimelineEvent> recordChecked = BindingTraits<Inspector::Protocol::Timeline::TimelineEvent>::runtimeCast(event);
</ins><span class="cx"> m_frontendDispatcher->eventRecorded(recordChecked.release());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp (172929 => 172930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2014-08-25 18:36:03 UTC (rev 172929)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2014-08-25 18:39:25 UTC (rev 172930)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> #include <inspector/InjectedScript.h>
</span><span class="cx"> #include <inspector/InjectedScriptManager.h>
</span><span class="cx">
</span><del>-using Inspector::TypeBuilder::Runtime::ExecutionContextDescription;
</del><ins>+using Inspector::Protocol::Runtime::ExecutionContextDescription;
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>