Web Inspector: rename Inspector::TypeBuilder to Inspector::Protocol
authorburg@cs.washington.edu <burg@cs.washington.edu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Aug 2014 18:39:25 +0000 (18:39 +0000)
committerburg@cs.washington.edu <burg@cs.washington.edu@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Aug 2014 18:39:25 +0000 (18:39 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172930 268f45cc-cd09-0410-ab3c-d52691b4dbfc

89 files changed:
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/DerivedSources.make
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Source/JavaScriptCore/inspector/ConsoleMessage.cpp
Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp
Source/JavaScriptCore/inspector/ContentSearchUtilities.h
Source/JavaScriptCore/inspector/InjectedScript.cpp
Source/JavaScriptCore/inspector/InjectedScript.h
Source/JavaScriptCore/inspector/InjectedScriptBase.cpp
Source/JavaScriptCore/inspector/InjectedScriptBase.h
Source/JavaScriptCore/inspector/InspectorProtocolTypes.h [moved from Source/JavaScriptCore/inspector/InspectorTypeBuilder.h with 94% similarity]
Source/JavaScriptCore/inspector/ScriptCallFrame.cpp
Source/JavaScriptCore/inspector/ScriptCallFrame.h
Source/JavaScriptCore/inspector/ScriptCallStack.cpp
Source/JavaScriptCore/inspector/ScriptCallStack.h
Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp
Source/JavaScriptCore/inspector/agents/InspectorAgent.h
Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp
Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.cpp
Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.h
Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
Source/JavaScriptCore/inspector/scripts/codegen/__init__.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_header.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_header.py [moved from Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_header.py with 93% similarity]
Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py [moved from Source/JavaScriptCore/inspector/scripts/codegen/generate_type_builder_implementation.py with 90% similarity]
Source/JavaScriptCore/inspector/scripts/codegen/generator.py
Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py
Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result
Source/JavaScriptCore/runtime/TypeProfiler.cpp
Source/JavaScriptCore/runtime/TypeProfiler.h
Source/JavaScriptCore/runtime/TypeSet.cpp
Source/JavaScriptCore/runtime/TypeSet.h
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/ForwardingHeaders/inspector/InspectorJSProtocolTypes.h [new file with mode: 0644]
Source/WebCore/ForwardingHeaders/inspector/InspectorJSTypeBuilders.h [deleted file]
Source/WebCore/ForwardingHeaders/inspector/InspectorProtocolTypes.h [new file with mode: 0644]
Source/WebCore/ForwardingHeaders/inspector/InspectorTypeBuilder.h [deleted file]
Source/WebCore/WebCore.order
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/inspector/CommandLineAPIHost.cpp
Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp
Source/WebCore/inspector/InspectorApplicationCacheAgent.h
Source/WebCore/inspector/InspectorCSSAgent.cpp
Source/WebCore/inspector/InspectorCSSAgent.h
Source/WebCore/inspector/InspectorDOMAgent.cpp
Source/WebCore/inspector/InspectorDOMAgent.h
Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp
Source/WebCore/inspector/InspectorDOMStorageAgent.cpp
Source/WebCore/inspector/InspectorDOMStorageAgent.h
Source/WebCore/inspector/InspectorDatabaseAgent.cpp
Source/WebCore/inspector/InspectorDatabaseAgent.h
Source/WebCore/inspector/InspectorDatabaseResource.cpp
Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
Source/WebCore/inspector/InspectorLayerTreeAgent.cpp
Source/WebCore/inspector/InspectorLayerTreeAgent.h
Source/WebCore/inspector/InspectorPageAgent.cpp
Source/WebCore/inspector/InspectorPageAgent.h
Source/WebCore/inspector/InspectorReplayAgent.cpp
Source/WebCore/inspector/InspectorReplayAgent.h
Source/WebCore/inspector/InspectorResourceAgent.cpp
Source/WebCore/inspector/InspectorResourceAgent.h
Source/WebCore/inspector/InspectorStyleSheet.cpp
Source/WebCore/inspector/InspectorStyleSheet.h
Source/WebCore/inspector/InspectorTimelineAgent.cpp
Source/WebCore/inspector/PageRuntimeAgent.cpp

index 07ff7dc..50023fb 100644 (file)
@@ -935,8 +935,8 @@ set(JavaScriptCore_INSPECTOR_PROTOCOL_SCRIPTS
     ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_backend_dispatcher_implementation.py
     ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_header.py
     ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_implementation.py
-    ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_type_builder_header.py
-    ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_type_builder_implementation.py
+    ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_header.py
+    ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_implementation.py
     ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator.py
     ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator_templates.py
     ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/__init__.py
@@ -965,12 +965,12 @@ add_custom_command(
            ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.h
            ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
            ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
-           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.cpp
-           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.h
+           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.cpp
+           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.h
            ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorJSBackendCommands.js
     MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
     DEPENDS ${JavaScriptCore_INSPECTOR_PROTOCOL_SCRIPTS}
-    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
+    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
     VERBATIM)
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
 
@@ -986,14 +986,14 @@ add_custom_command(
 list(APPEND JavaScriptCore_SOURCES
     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.cpp
     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
-    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.cpp
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.cpp
     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp
 )
 
 list(APPEND JavaScriptCore_HEADERS
     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.h
     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
-    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.h
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.h
     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
 )
 
index 77d975d..bc5dec1 100644 (file)
@@ -1,5 +1,129 @@
 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:
+        * 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>
+
         Web Inspector: Rename DOM.RGBA and remove workarounds in the bindings generator
         https://bugs.webkit.org/show_bug.cgi?id=136025
 
index d33c951..5a5dac3 100644 (file)
@@ -128,8 +128,8 @@ INSPECTOR_GENERATOR_SCRIPTS = \
        $(JavaScriptCore)/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py \
        $(JavaScriptCore)/inspector/scripts/codegen/generate_frontend_dispatcher_header.py \
        $(JavaScriptCore)/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py \
-       $(JavaScriptCore)/inspector/scripts/codegen/generate_type_builder_header.py \
-       $(JavaScriptCore)/inspector/scripts/codegen/generate_type_builder_implementation.py \
+       $(JavaScriptCore)/inspector/scripts/codegen/generate_protocol_types_header.py \
+       $(JavaScriptCore)/inspector/scripts/codegen/generate_protocol_types_implementation.py \
        $(JavaScriptCore)/inspector/scripts/codegen/generator_templates.py \
        $(JavaScriptCore)/inspector/scripts/codegen/generator.py \
        $(JavaScriptCore)/inspector/scripts/codegen/models.py \
index 593e799..700083b 100644 (file)
     <ClCompile Include="..\yarr\YarrSyntaxChecker.cpp" />
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.cpp" />
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.cpp" />
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.cpp" />
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.cpp" />
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCBuiltins.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InjectedScriptSource.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.h" />
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataViewPrototype.lut.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSONObject.lut.h" />
     <ClInclude Include="..\inspector\InspectorBackendDispatcher.h" />
     <ClInclude Include="..\inspector\InspectorEnvironment.h" />
     <ClInclude Include="..\inspector\InspectorFrontendChannel.h" />
-    <ClInclude Include="..\inspector\InspectorTypeBuilder.h" />
+    <ClInclude Include="..\inspector\InspectorProtocolTypes.h" />
     <ClInclude Include="..\inspector\InspectorValues.h" />
     <ClInclude Include="..\inspector\JSInjectedScriptHost.h" />
     <ClInclude Include="..\inspector\JSInjectedScriptHostPrototype.h" />
     <None Include="..\inspector\scripts\codegen\generate_backend_dispatcher_implementation.py" />
     <None Include="..\inspector\scripts\codegen\generate_frontend_dispatcher_header.py" />
     <None Include="..\inspector\scripts\codegen\generate_frontend_dispatcher_implementation.py" />
-    <None Include="..\inspector\scripts\codegen\generate_type_builder_header.py" />
-    <None Include="..\inspector\scripts\codegen\generate_type_builder_implementation.py" />
+    <None Include="..\inspector\scripts\codegen\generate_protocol_types_header.py" />
+    <None Include="..\inspector\scripts\codegen\generate_protocol_types_implementation.py" />
     <None Include="..\inspector\scripts\codegen\generator.py" />
     <None Include="..\inspector\scripts\codegen\generator_templates.py" />
     <None Include="..\inspector\scripts\codegen\models.py" />
index 64e540f..294f51d 100644 (file)
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.cpp">
       <Filter>Derived Sources</Filter>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.cpp">
       <Filter>Derived Sources</Filter>
     </ClCompile>
     <ClCompile Include="..\jit\ArityCheckFailReturnThunks.cpp">
     <ClInclude Include="..\inspector\InspectorFrontendChannel.h">
       <Filter>inspector</Filter>
     </ClInclude>
-    <ClInclude Include="..\inspector\InspectorTypeBuilder.h">
+    <ClInclude Include="..\inspector\InspectorProtocolTypes.h">
       <Filter>inspector</Filter>
     </ClInclude>
     <ClInclude Include="..\inspector\InspectorValues.h">
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.h">
       <Filter>Derived Sources</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.h">
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.h">
       <Filter>Derived Sources</Filter>
     </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h">
     <None Include="..\inspector\scripts\codegen\generate_frontend_dispatcher_implementation.py">
       <Filter>inspector\scripts\codegen</Filter>
     </None>
-    <None Include="..\inspector\scripts\codegen\generate_type_builder_header.py">
+    <None Include="..\inspector\scripts\codegen\generate_protocol_types_header.py">
       <Filter>inspector\scripts\codegen</Filter>
     </None>
-    <None Include="..\inspector\scripts\codegen\generate_type_builder_implementation.py">
+    <None Include="..\inspector\scripts\codegen\generate_protocol_types_implementation.py">
       <Filter>inspector\scripts\codegen</Filter>
     </None>
     <None Include="..\inspector\scripts\codegen\generator.py">
index eb84bc1..9a4daf2 100755 (executable)
@@ -71,7 +71,7 @@ for %%d in (
 \r
 echo Copying Inspector generated files as if they were private headers...\r
 xcopy /y "%DerivedSourcesDirectory%\InspectorJS.json" "%PrivateHeadersDirectory%" >NUL\r
-xcopy /y "%DerivedSourcesDirectory%\InspectorJSTypeBuilders.h" "%PrivateHeadersDirectory%" >NUL\r
+xcopy /y "%DerivedSourcesDirectory%\InspectorJSProtocolTypes.h" "%PrivateHeadersDirectory%" >NUL\r
 xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendDispatchers.h" "%PrivateHeadersDirectory%" >NUL\r
 xcopy /y "%DerivedSourcesDirectory%\InspectorJSFrontendDispatchers.h" "%PrivateHeadersDirectory%" >NUL\r
 xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendCommands.js" "%PrivateHeadersDirectory%" >NUL\r
index aabf1ae..60e6922 100644 (file)
                A532438818568335002ED692 /* InspectorJSBackendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438218568317002ED692 /* InspectorJSBackendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A532438918568335002ED692 /* InspectorJSFrontendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */; };
                A532438A18568335002ED692 /* InspectorJSFrontendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               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, ); }; };
+               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, ); }; };
                A532439418569709002ED692 /* generate-combined-inspector-json.py in Headers */ = {isa = PBXBuildFile; fileRef = A5324391185696E6002ED692 /* generate-combined-inspector-json.py */; settings = {ATTRIBUTES = (Private, ); }; };
                A53243981856A489002ED692 /* InspectorJS.json in Headers */ = {isa = PBXBuildFile; fileRef = A53243951856A475002ED692 /* InspectorJS.json */; settings = {ATTRIBUTES = (Private, ); }; };
                A53CE08518BC1A5600BEDF76 /* ConsolePrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A53CE08118BC1A5600BEDF76 /* ConsolePrototype.cpp */; };
                A54E8EB118BFFBBE00556D28 /* GCSegmentedArrayInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A343F7718A1749D0039B085 /* GCSegmentedArrayInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A55D93A5185012A800400DED /* ScriptFunctionCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A55D93A3185012A800400DED /* ScriptFunctionCall.cpp */; };
                A55D93A6185012A800400DED /* ScriptFunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = A55D93A4185012A800400DED /* ScriptFunctionCall.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               A55D93AC18514F7900400DED /* InspectorTypeBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = A55D93AB18514F7900400DED /* InspectorTypeBuilder.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A55D93AC18514F7900400DED /* InspectorProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A55D93AB18514F7900400DED /* InspectorProtocolTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A57D23E51890CEBF0031C7FA /* InspectorDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A57D23E31890CEBF0031C7FA /* InspectorDebuggerAgent.cpp */; };
                A57D23E61890CEBF0031C7FA /* InspectorDebuggerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A57D23E41890CEBF0031C7FA /* InspectorDebuggerAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A57D23E91891B0770031C7FA /* JSGlobalObjectDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A57D23E71891B0770031C7FA /* JSGlobalObjectDebuggerAgent.cpp */; };
                C4703CD0192844CC0013FBEA /* generate_backend_dispatcher_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC5192844CC0013FBEA /* generate_backend_dispatcher_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
                C4703CD1192844CC0013FBEA /* generate_frontend_dispatcher_header.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC6192844CC0013FBEA /* generate_frontend_dispatcher_header.py */; settings = {ATTRIBUTES = (Private, ); }; };
                C4703CD2192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC7192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
-               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, ); }; };
                C4703CD5192844CC0013FBEA /* generator_templates.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CCA192844CC0013FBEA /* generator_templates.py */; settings = {ATTRIBUTES = (Private, ); }; };
                C4703CD6192844CC0013FBEA /* generator.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CCB192844CC0013FBEA /* generator.py */; settings = {ATTRIBUTES = (Private, ); }; };
                C4703CD7192844CC0013FBEA /* models.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CCC192844CC0013FBEA /* models.py */; settings = {ATTRIBUTES = (Private, ); }; };
+               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, ); }; };
                E124A8F70E555775003091F1 /* OpaqueJSString.h in Headers */ = {isa = PBXBuildFile; fileRef = E124A8F50E555775003091F1 /* OpaqueJSString.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E124A8F80E555775003091F1 /* OpaqueJSString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E124A8F60E555775003091F1 /* OpaqueJSString.cpp */; };
                E18E3A590DF9278C00D90B34 /* VM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18E3A570DF9278C00D90B34 /* VM.cpp */; };
                A532438218568317002ED692 /* InspectorJSBackendDispatchers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSBackendDispatchers.h; sourceTree = "<group>"; };
                A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSFrontendDispatchers.cpp; sourceTree = "<group>"; };
                A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSFrontendDispatchers.h; sourceTree = "<group>"; };
-               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>"; };
+               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>"; };
                A532438D185696CA002ED692 /* protocol */ = {isa = PBXFileReference; lastKnownFileType = folder; path = protocol; sourceTree = "<group>"; };
                A5324391185696E6002ED692 /* generate-combined-inspector-json.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "generate-combined-inspector-json.py"; sourceTree = "<group>"; };
                A53243951856A475002ED692 /* InspectorJS.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = InspectorJS.json; sourceTree = "<group>"; };
                A54CF2F8184EAEDA00237F19 /* ScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptObject.h; sourceTree = "<group>"; };
                A55D93A3185012A800400DED /* ScriptFunctionCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptFunctionCall.cpp; sourceTree = "<group>"; };
                A55D93A4185012A800400DED /* ScriptFunctionCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptFunctionCall.h; sourceTree = "<group>"; };
-               A55D93AB18514F7900400DED /* InspectorTypeBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTypeBuilder.h; sourceTree = "<group>"; };
+               A55D93AB18514F7900400DED /* InspectorProtocolTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorProtocolTypes.h; sourceTree = "<group>"; };
                A57D23E31890CEBF0031C7FA /* InspectorDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDebuggerAgent.cpp; sourceTree = "<group>"; };
                A57D23E41890CEBF0031C7FA /* InspectorDebuggerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDebuggerAgent.h; sourceTree = "<group>"; };
                A57D23E71891B0770031C7FA /* JSGlobalObjectDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObjectDebuggerAgent.cpp; sourceTree = "<group>"; };
                C4703CC5192844CC0013FBEA /* generate_backend_dispatcher_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_backend_dispatcher_implementation.py; sourceTree = "<group>"; };
                C4703CC6192844CC0013FBEA /* generate_frontend_dispatcher_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_frontend_dispatcher_header.py; sourceTree = "<group>"; };
                C4703CC7192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_frontend_dispatcher_implementation.py; sourceTree = "<group>"; };
-               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>"; };
                C4703CCA192844CC0013FBEA /* generator_templates.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generator_templates.py; sourceTree = "<group>"; };
                C4703CCB192844CC0013FBEA /* generator.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generator.py; sourceTree = "<group>"; };
                C4703CCC192844CC0013FBEA /* models.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = models.py; sourceTree = "<group>"; };
+               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>"; };
                D21202280AD4310C00ED79B6 /* DateConversion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DateConversion.cpp; sourceTree = "<group>"; };
                D21202290AD4310C00ED79B6 /* DateConversion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DateConversion.h; sourceTree = "<group>"; };
                E124A8F50E555775003091F1 /* OpaqueJSString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpaqueJSString.h; sourceTree = "<group>"; };
                                A532438218568317002ED692 /* InspectorJSBackendDispatchers.h */,
                                A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */,
                                A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */,
-                               A532438518568317002ED692 /* InspectorJSTypeBuilders.cpp */,
-                               A532438618568317002ED692 /* InspectorJSTypeBuilders.h */,
+                               A532438518568317002ED692 /* InspectorJSProtocolTypes.cpp */,
+                               A532438618568317002ED692 /* InspectorJSProtocolTypes.h */,
                                A7D801A61880D6A80026C39B /* JSCBuiltins.cpp */,
                                A7D801A71880D6A80026C39B /* JSCBuiltins.h */,
                                BC87CDB810712ACA000614CF /* JSONObject.lut.h */,
                                A593CF7B1840360300BFCE27 /* InspectorBackendDispatcher.h */,
                                A5D0A1BA1862301B00C7B496 /* InspectorEnvironment.h */,
                                A5945594182479EB00CC3843 /* InspectorFrontendChannel.h */,
-                               A55D93AB18514F7900400DED /* InspectorTypeBuilder.h */,
+                               A55D93AB18514F7900400DED /* InspectorProtocolTypes.h */,
                                A593CF801840377100BFCE27 /* InspectorValues.cpp */,
                                A593CF811840377100BFCE27 /* InspectorValues.h */,
                                A503FA13188E0FAF00110F14 /* JavaScriptCallFrame.cpp */,
                                C4703CC5192844CC0013FBEA /* generate_backend_dispatcher_implementation.py */,
                                C4703CC6192844CC0013FBEA /* generate_frontend_dispatcher_header.py */,
                                C4703CC7192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py */,
-                               C4703CC8192844CC0013FBEA /* generate_type_builder_header.py */,
-                               C4703CC9192844CC0013FBEA /* generate_type_builder_implementation.py */,
+                               C49FE4A719AAC83E00F40CE9 /* generate_protocol_types_header.py */,
+                               C49FE4A819AAC83E00F40CE9 /* generate_protocol_types_implementation.py */,
                                C4703CCA192844CC0013FBEA /* generator_templates.py */,
                                C4703CCB192844CC0013FBEA /* generator.py */,
                                C4703CCC192844CC0013FBEA /* models.py */,
                                0F6B1CB91861244C00845D97 /* ArityCheckMode.h in Headers */,
                                A1A009C11831A26E00CF8711 /* ARM64Assembler.h in Headers */,
                                86D3B2C410156BDE002865E7 /* ARMAssembler.h in Headers */,
+                               C49FE4AB19AAC86100F40CE9 /* generate_protocol_types_header.py in Headers */,
+                               C49FE4AC19AAC86100F40CE9 /* generate_protocol_types_implementation.py in Headers */,
                                658D3A5619638268003C45D6 /* VMEntryRecord.h in Headers */,
                                2AD2EDFB19799E38004D6478 /* EnumerationMode.h in Headers */,
                                147B83AC0E6DB8C9004775A4 /* BatchedTransitionOptimizer.h in Headers */,
                                C2DA778318E259990066FCB6 /* HeapInlines.h in Headers */,
                                A532439418569709002ED692 /* generate-combined-inspector-json.py in Headers */,
                                A5840E27187C981E00843B10 /* cssmin.py in Headers */,
-                               C4703CD3192844CC0013FBEA /* generate_type_builder_header.py in Headers */,
                                C4703CD2192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py in Headers */,
                                C4703CD1192844CC0013FBEA /* generate_frontend_dispatcher_header.py in Headers */,
                                C4703CD5192844CC0013FBEA /* generator_templates.py in Headers */,
                                C4703CC0192844960013FBEA /* generate-inspector-protocol-bindings.py in Headers */,
                                C4703CD0192844CC0013FBEA /* generate_backend_dispatcher_implementation.py in Headers */,
                                C4703CCE192844CC0013FBEA /* generate_backend_commands.py in Headers */,
-                               C4703CD4192844CC0013FBEA /* generate_type_builder_implementation.py in Headers */,
                                C4703CD7192844CC0013FBEA /* models.py in Headers */,
                                2AACE63D18CA5A0300ED0191 /* GCActivityCallback.h in Headers */,
                                2A83638618D7D0EE0000EBCC /* EdenGCActivityCallback.h in Headers */,
                                A532438818568335002ED692 /* InspectorJSBackendDispatchers.h in Headers */,
                                A532438A18568335002ED692 /* InspectorJSFrontendDispatchers.h in Headers */,
                                8606DDEA18DA44AB00A383D0 /* IdentifierInlines.h in Headers */,
-                               A532438C18568335002ED692 /* InspectorJSTypeBuilders.h in Headers */,
+                               A532438C18568335002ED692 /* InspectorJSProtocolTypes.h in Headers */,
                                A50E4B6218809DD50068A46D /* InspectorRuntimeAgent.h in Headers */,
                                0FBFDD05196C92BF007A5BFA /* DFGPhantomRemovalPhase.h in Headers */,
-                               A55D93AC18514F7900400DED /* InspectorTypeBuilder.h in Headers */,
+                               A55D93AC18514F7900400DED /* InspectorProtocolTypes.h in Headers */,
                                A593CF831840377100BFCE27 /* InspectorValues.h in Headers */,
                                969A07990ED1D3AE00F1F681 /* Instruction.h in Headers */,
                                A7A8AF3B17ADB5F3005AB174 /* Int16Array.h in Headers */,
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               C49FE4A919AAC83E00F40CE9 /* generate_protocol_types_header.py in Resources */,
                                A53F1AC018C90F8F0072EB6D /* framework.sb in Resources */,
+                               C49FE4AA19AAC83E00F40CE9 /* generate_protocol_types_implementation.py in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                A57D23E51890CEBF0031C7FA /* InspectorDebuggerAgent.cpp in Sources */,
                                A532438718568335002ED692 /* InspectorJSBackendDispatchers.cpp in Sources */,
                                A532438918568335002ED692 /* InspectorJSFrontendDispatchers.cpp in Sources */,
-                               A532438B18568335002ED692 /* InspectorJSTypeBuilders.cpp in Sources */,
+                               A532438B18568335002ED692 /* InspectorJSProtocolTypes.cpp in Sources */,
                                A50E4B6118809DD50068A46D /* InspectorRuntimeAgent.cpp in Sources */,
                                A593CF821840377100BFCE27 /* InspectorValues.cpp in Sources */,
                                A78853F917972629001440E4 /* IntendedStructureChain.cpp in Sources */,
index 0203bc1..4b8e3c5 100644 (file)
@@ -131,57 +131,57 @@ void ConsoleMessage::autogenerateMetadata(JSC::ExecState* state)
     }
 }
 
-static Inspector::TypeBuilder::Console::ConsoleMessage::Source messageSourceValue(MessageSource source)
+static Inspector::Protocol::Console::ConsoleMessage::Source messageSourceValue(MessageSource source)
 {
     switch (source) {
-    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;
+    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;
     }
-    return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Other;
+    return Inspector::Protocol::Console::ConsoleMessage::Source::Other;
 }
 
-static Inspector::TypeBuilder::Console::ConsoleMessage::Type messageTypeValue(MessageType type)
+static Inspector::Protocol::Console::ConsoleMessage::Type messageTypeValue(MessageType type)
 {
     switch (type) {
-    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;
+    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;
     }
-    return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Log;
+    return Inspector::Protocol::Console::ConsoleMessage::Type::Log;
 }
 
-static Inspector::TypeBuilder::Console::ConsoleMessage::Level messageLevelValue(MessageLevel level)
+static Inspector::Protocol::Console::ConsoleMessage::Level messageLevelValue(MessageLevel level)
 {
     switch (level) {
-    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;
+    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;
     }
-    return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Log;
+    return Inspector::Protocol::Console::ConsoleMessage::Level::Log;
 }
 
 void ConsoleMessage::addToFrontend(InspectorConsoleFrontendDispatcher* consoleFrontendDispatcher, Inspector::InjectedScriptManager* injectedScriptManager, bool generatePreview)
 {
-    RefPtr<Inspector::TypeBuilder::Console::ConsoleMessage> jsonObj = Inspector::TypeBuilder::Console::ConsoleMessage::create()
+    RefPtr<Inspector::Protocol::Console::ConsoleMessage> jsonObj = Inspector::Protocol::Console::ConsoleMessage::create()
         .setSource(messageSourceValue(m_source))
         .setLevel(messageLevelValue(m_level))
         .setText(m_message);
@@ -199,11 +199,11 @@ void ConsoleMessage::addToFrontend(InspectorConsoleFrontendDispatcher* consoleFr
     if (m_arguments && m_arguments->argumentCount()) {
         InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState());
         if (!injectedScript.hasNoValue()) {
-            RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::RemoteObject>> jsonArgs = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::RemoteObject>::create();
+            RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>> jsonArgs = Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>::create();
             if (m_type == MessageType::Table && generatePreview && m_arguments->argumentCount()) {
                 Deprecated::ScriptValue table = m_arguments->argumentAt(0);
                 Deprecated::ScriptValue columns = m_arguments->argumentCount() > 1 ? m_arguments->argumentAt(1) : Deprecated::ScriptValue();
-                RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapTable(table, columns);
+                RefPtr<Inspector::Protocol::Runtime::RemoteObject> inspectorValue = injectedScript.wrapTable(table, columns);
                 if (!inspectorValue) {
                     ASSERT_NOT_REACHED();
                     return;
@@ -211,7 +211,7 @@ void ConsoleMessage::addToFrontend(InspectorConsoleFrontendDispatcher* consoleFr
                 jsonArgs->addItem(inspectorValue);
             } else {
                 for (unsigned i = 0; i < m_arguments->argumentCount(); ++i) {
-                    RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapObject(m_arguments->argumentAt(i), "console", generatePreview);
+                    RefPtr<Inspector::Protocol::Runtime::RemoteObject> inspectorValue = injectedScript.wrapObject(m_arguments->argumentAt(i), "console", generatePreview);
                     if (!inspectorValue) {
                         ASSERT_NOT_REACHED();
                         return;
index bcd691b..ef54f06 100644 (file)
@@ -31,7 +31,7 @@
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorJSTypeBuilders.h"
+#include "InspectorJSProtocolTypes.h"
 #include "InspectorValues.h"
 #include "RegularExpression.h"
 #include "Yarr.h"
@@ -121,9 +121,9 @@ std::unique_ptr<Vector<size_t>> lineEndings(const String& text)
     return result;
 }
 
-static PassRefPtr<Inspector::TypeBuilder::GenericTypes::SearchMatch> buildObjectForSearchMatch(size_t lineNumber, const String& lineContent)
+static PassRefPtr<Inspector::Protocol::GenericTypes::SearchMatch> buildObjectForSearchMatch(size_t lineNumber, const String& lineContent)
 {
-    return Inspector::TypeBuilder::GenericTypes::SearchMatch::create()
+    return Inspector::Protocol::GenericTypes::SearchMatch::create()
         .setLineNumber(lineNumber)
         .setLineContent(lineContent)
         .release();
@@ -154,9 +154,9 @@ int countRegularExpressionMatches(const JSC::Yarr::RegularExpression& regex, con
     return result;
 }
 
-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex)
+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex)
 {
-    RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>> result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>::create();
+    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> result = Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>::create();
 
     JSC::Yarr::RegularExpression regex = ContentSearchUtilities::createSearchRegex(query, caseSensitive, isRegex);
     Vector<std::pair<size_t, String>> matches = getRegularExpressionMatchesByLines(regex, text);
index 2bc2d3c..d612dab 100644 (file)
@@ -31,7 +31,7 @@
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorJSTypeBuilders.h"
+#include "InspectorJSProtocolTypes.h"
 #include <wtf/Vector.h>
 #include <wtf/text/TextPosition.h>
 #include <wtf/text/WTFString.h>
@@ -46,7 +46,7 @@ namespace ContentSearchUtilities {
 
 JS_EXPORT_PRIVATE JSC::Yarr::RegularExpression createSearchRegex(const String& query, bool caseSensitive, bool isRegex);
 JS_EXPORT_PRIVATE int countRegularExpressionMatches(const JSC::Yarr::RegularExpression&, const String&);
-JS_EXPORT_PRIVATE PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex);
+JS_EXPORT_PRIVATE PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex);
 JS_EXPORT_PRIVATE TextPosition textPositionFromOffset(size_t offset, const Vector<size_t>& lineEndings);
 JS_EXPORT_PRIVATE std::unique_ptr<Vector<size_t>> lineEndings(const String&);
 
index e5a2622..25187fb 100644 (file)
@@ -40,7 +40,7 @@
 #include "ScriptObject.h"
 #include <wtf/text/WTFString.h>
 
-using Inspector::TypeBuilder::Array;
+using Inspector::Protocol::Array;
 
 namespace Inspector {
 
@@ -58,7 +58,7 @@ InjectedScript::~InjectedScript()
 {
 }
 
-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)
+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)
 {
     Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("evaluate"), inspectorEnvironment()->functionCallHandler());
     function.appendArgument(expression);
@@ -69,7 +69,7 @@ void InjectedScript::evaluate(ErrorString* errorString, const String& expression
     makeEvalCall(errorString, function, result, wasThrown);
 }
 
-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)
+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)
 {
     Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("callFunctionOn"), inspectorEnvironment()->functionCallHandler());
     function.appendArgument(objectId);
@@ -80,7 +80,7 @@ void InjectedScript::callFunctionOn(ErrorString* errorString, const String& obje
     makeEvalCall(errorString, function, result, wasThrown);
 }
 
-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)
+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)
 {
     Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("evaluateOnCallFrame"), inspectorEnvironment()->functionCallHandler());
     function.appendArgument(callFrames);
@@ -93,7 +93,7 @@ void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const Depreca
     makeEvalCall(errorString, function, result, wasThrown);
 }
 
-void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>* result)
+void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>* result)
 {
     Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getFunctionDetails"), inspectorEnvironment()->functionCallHandler());
     function.appendArgument(functionId);
@@ -106,10 +106,10 @@ void InjectedScript::getFunctionDetails(ErrorString* errorString, const String&
         return;
     }
 
-    *result = BindingTraits<Inspector::TypeBuilder::Debugger::FunctionDetails>::runtimeCast(resultValue);
+    *result = BindingTraits<Inspector::Protocol::Debugger::FunctionDetails>::runtimeCast(resultValue);
 }
 
-void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>>* properties)
+void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>* properties)
 {
     Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getProperties"), inspectorEnvironment()->functionCallHandler());
     function.appendArgument(objectId);
@@ -122,10 +122,10 @@ void InjectedScript::getProperties(ErrorString* errorString, const String& objec
         return;
     }
 
-    *properties = BindingTraits<Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>>::runtimeCast(result);
+    *properties = BindingTraits<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>::runtimeCast(result);
 }
 
-void InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, RefPtr<Array<Inspector::TypeBuilder::Runtime::InternalPropertyDescriptor>>* properties)
+void InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, RefPtr<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>* properties)
 {
     Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getInternalProperties"), inspectorEnvironment()->functionCallHandler());
     function.appendArgument(objectId);
@@ -137,12 +137,12 @@ void InjectedScript::getInternalProperties(ErrorString* errorString, const Strin
         return;
     }
 
-    auto array = BindingTraits<Array<Inspector::TypeBuilder::Runtime::InternalPropertyDescriptor>>::runtimeCast(result);
+    auto array = BindingTraits<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>::runtimeCast(result);
     if (array->length() > 0)
         *properties = array;
 }
 
-PassRefPtr<Array<Inspector::TypeBuilder::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
+PassRefPtr<Array<Inspector::Protocol::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
 {
     ASSERT(!hasNoValue());
     Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("wrapCallFrames"), inspectorEnvironment()->functionCallHandler());
@@ -153,12 +153,12 @@ PassRefPtr<Array<Inspector::TypeBuilder::Debugger::CallFrame>> InjectedScript::w
     ASSERT(!hadException);
     RefPtr<InspectorValue> result = callFramesValue.toInspectorValue(scriptState());
     if (result->type() == InspectorValue::Type::Array)
-        return BindingTraits<Array<Inspector::TypeBuilder::Debugger::CallFrame>>::runtimeCast(result);
+        return BindingTraits<Array<Inspector::Protocol::Debugger::CallFrame>>::runtimeCast(result);
 
-    return Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
+    return Array<Inspector::Protocol::Debugger::CallFrame>::create();
 }
 
-PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(const Deprecated::ScriptValue& value, const String& groupName, bool generatePreview) const
+PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> InjectedScript::wrapObject(const Deprecated::ScriptValue& value, const String& groupName, bool generatePreview) const
 {
     ASSERT(!hasNoValue());
     Deprecated::ScriptFunctionCall wrapFunction(injectedScriptObject(), ASCIILiteral("wrapObject"), inspectorEnvironment()->functionCallHandler());
@@ -173,10 +173,10 @@ PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapOb
         return nullptr;
 
     RefPtr<InspectorObject> rawResult = r.toInspectorValue(scriptState())->asObject();
-    return BindingTraits<Inspector::TypeBuilder::Runtime::RemoteObject>::runtimeCast(rawResult);
+    return BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(rawResult);
 }
 
-PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const
+PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> InjectedScript::wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const
 {
     ASSERT(!hasNoValue());
     Deprecated::ScriptFunctionCall wrapFunction(injectedScriptObject(), ASCIILiteral("wrapTable"), inspectorEnvironment()->functionCallHandler());
@@ -193,7 +193,7 @@ PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapTa
         return nullptr;
 
     RefPtr<InspectorObject> rawResult = r.toInspectorValue(scriptState())->asObject();
-    return BindingTraits<Inspector::TypeBuilder::Runtime::RemoteObject>::runtimeCast(rawResult);
+    return BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(rawResult);
 }
 
 Deprecated::ScriptValue InjectedScript::findObjectById(const String& objectId) const
index 4c58b19..6e8f769 100644 (file)
@@ -35,7 +35,7 @@
 #if ENABLE(INSPECTOR)
 
 #include "InjectedScriptBase.h"
-#include "InspectorJSTypeBuilders.h"
+#include "InspectorJSProtocolTypes.h"
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/PassRefPtr.h>
@@ -56,16 +56,16 @@ public:
     InjectedScript(Deprecated::ScriptObject, InspectorEnvironment*);
     virtual ~InjectedScript();
 
-    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);
+    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);
 
-    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;
+    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;
 
     Deprecated::ScriptValue findObjectById(const String& objectId) const;
     void inspectObject(Deprecated::ScriptValue);
index fe10d6c..8569a4b 100644 (file)
@@ -119,7 +119,7 @@ void InjectedScriptBase::makeCall(Deprecated::ScriptFunctionCall& function, RefP
         *result = InspectorString::create("Exception while making a call.");
 }
 
-void InjectedScriptBase::makeEvalCall(ErrorString* errorString, Deprecated::ScriptFunctionCall& function, RefPtr<TypeBuilder::Runtime::RemoteObject>* objectResult, TypeBuilder::OptOutput<bool>* wasThrown)
+void InjectedScriptBase::makeEvalCall(ErrorString* errorString, Deprecated::ScriptFunctionCall& function, RefPtr<Protocol::Runtime::RemoteObject>* objectResult, Protocol::OptOutput<bool>* wasThrown)
 {
     RefPtr<InspectorValue> result;
     makeCall(function, &result);
@@ -147,7 +147,7 @@ void InjectedScriptBase::makeEvalCall(ErrorString* errorString, Deprecated::Scri
         return;
     }
 
-    *objectResult = BindingTraits<TypeBuilder::Runtime::RemoteObject>::runtimeCast(resultObj);
+    *objectResult = BindingTraits<Protocol::Runtime::RemoteObject>::runtimeCast(resultObj);
     *wasThrown = wasThrownVal;
 }
 
index 034e0c2..50fa58d 100644 (file)
@@ -35,7 +35,7 @@
 #if ENABLE(INSPECTOR)
 
 #include "InspectorEnvironment.h"
-#include "InspectorJSTypeBuilders.h"
+#include "InspectorJSProtocolTypes.h"
 #include "bindings/ScriptObject.h"
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
@@ -68,7 +68,7 @@ protected:
     const Deprecated::ScriptObject& injectedScriptObject() const;
     Deprecated::ScriptValue callFunctionWithEvalEnabled(Deprecated::ScriptFunctionCall&, bool& hadException) const;
     void makeCall(Deprecated::ScriptFunctionCall&, RefPtr<InspectorValue>* result);
-    void makeEvalCall(ErrorString*, Deprecated::ScriptFunctionCall&, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown);
+    void makeEvalCall(ErrorString*, Deprecated::ScriptFunctionCall&, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
 
 private:
     String m_name;
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef InspectorTypeBuilder_h
-#define InspectorTypeBuilder_h
+#ifndef InspectorProtocolTypes_h
+#define InspectorProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
@@ -35,7 +35,7 @@
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 template<typename T>
 class OptOutput {
@@ -176,16 +176,16 @@ struct ArrayItemHelper<InspectorArray> {
 };
 
 template<typename T>
-struct ArrayItemHelper<TypeBuilder::Array<T>> {
+struct ArrayItemHelper<Protocol::Array<T>> {
     struct Traits {
-        static void pushRefPtr(InspectorArray* array, PassRefPtr<TypeBuilder::Array<T>> value)
+        static void pushRefPtr(InspectorArray* array, PassRefPtr<Protocol::Array<T>> value)
         {
             array->pushValue(value);
         }
     };
 };
 
-// Helper methods for TypeBuilder and other Inspector types are provided by
+// Helper methods for Protocol and other Inspector types are provided by
 // specializations of BindingTraits<T>. Some are generated for protocol types.
 
 template<typename T>
@@ -210,7 +210,7 @@ struct PrimitiveBindingTraits {
 };
 
 template<typename T>
-struct BindingTraits<TypeBuilder::Array<T>> {
+struct BindingTraits<Protocol::Array<T>> {
     static PassRefPtr<Array<T>> runtimeCast(PassRefPtr<InspectorValue> value)
     {
         RefPtr<InspectorArray> array;
@@ -264,12 +264,12 @@ struct BindingTraits<int> {
 #endif // !ASSERT_DISABLED
 };
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
-using TypeBuilder::BindingTraits;
+using Protocol::BindingTraits;
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTypeBuilder_h)
+#endif // !defined(InspectorProtocolTypes_h)
index c7a822e..7c950e8 100644 (file)
@@ -58,9 +58,9 @@ bool ScriptCallFrame::isEqual(const ScriptCallFrame& o) const
 }
 
 #if ENABLE(INSPECTOR)
-PassRefPtr<Inspector::TypeBuilder::Console::CallFrame> ScriptCallFrame::buildInspectorObject() const
+PassRefPtr<Inspector::Protocol::Console::CallFrame> ScriptCallFrame::buildInspectorObject() const
 {
-    return Inspector::TypeBuilder::Console::CallFrame::create()
+    return Inspector::Protocol::Console::CallFrame::create()
         .setFunctionName(m_functionName)
         .setUrl(m_scriptName)
         .setLineNumber(m_lineNumber)
index 00524dc..e9c10ff 100644 (file)
@@ -36,7 +36,7 @@
 #include <wtf/text/WTFString.h>
 
 #if ENABLE(INSPECTOR)
-#include "InspectorJSTypeBuilders.h"
+#include "InspectorJSProtocolTypes.h"
 #endif
 
 namespace Inspector {
@@ -54,7 +54,7 @@ public:
     bool isEqual(const ScriptCallFrame&) const;
 
 #if ENABLE(INSPECTOR)
-    PassRefPtr<Inspector::TypeBuilder::Console::CallFrame> buildInspectorObject() const;
+    PassRefPtr<Inspector::Protocol::Console::CallFrame> buildInspectorObject() const;
 #endif
 
 private:
index 9b3cca1..6f81a58 100644 (file)
@@ -107,9 +107,9 @@ bool ScriptCallStack::isEqual(ScriptCallStack* o) const
 }
 
 #if ENABLE(INSPECTOR)
-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> ScriptCallStack::buildInspectorArray() const
+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> ScriptCallStack::buildInspectorArray() const
 {
-    RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> frames = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>::create();
+    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> frames = Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>::create();
     for (size_t i = 0; i < m_frames.size(); i++)
         frames->addItem(m_frames.at(i).buildInspectorObject());
     return frames;
index 9c2a534..61da9e4 100644 (file)
@@ -38,7 +38,7 @@
 #include <wtf/Vector.h>
 
 #if ENABLE(INSPECTOR)
-#include "InspectorJSTypeBuilders.h"
+#include "InspectorJSProtocolTypes.h"
 #endif
 
 namespace Inspector {
@@ -62,7 +62,7 @@ public:
     bool isEqual(ScriptCallStack*) const;
 
 #if ENABLE(INSPECTOR)
-    PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> buildInspectorArray() const;
+    PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> buildInspectorArray() const;
 #endif
 
 private:
index be09611..6ef63f0 100644 (file)
@@ -87,7 +87,7 @@ void InspectorAgent::disable(ErrorString*)
     m_enabled = false;
 }
 
-void InspectorAgent::inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints)
+void InspectorAgent::inspect(PassRefPtr<Protocol::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints)
 {
     if (m_enabled && m_frontendDispatcher) {
         m_frontendDispatcher->inspect(objectToInspect, hints);
index 1d30e2e..708d6be 100644 (file)
@@ -60,14 +60,14 @@ public:
     virtual void enable(ErrorString*) override;
     virtual void disable(ErrorString*) override;
 
-    void inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
+    void inspect(PassRefPtr<Protocol::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
     void evaluateForTestInFrontend(const String& script);
 
 private:
     std::unique_ptr<InspectorInspectorFrontendDispatcher> m_frontendDispatcher;
     RefPtr<InspectorInspectorBackendDispatcher> m_backendDispatcher;
     Vector<String> m_pendingEvaluateTestCommands;
-    std::pair<RefPtr<TypeBuilder::Runtime::RemoteObject>, RefPtr<InspectorObject>> m_pendingInspectData;
+    std::pair<RefPtr<Protocol::Runtime::RemoteObject>, RefPtr<InspectorObject>> m_pendingInspectData;
     bool m_enabled;
 };
 
index 5e1b646..3a528af 100644 (file)
@@ -175,19 +175,19 @@ static bool matches(const String& url, const String& pattern, bool isRegex)
 
 static bool breakpointActionTypeForString(const String& typeString, ScriptBreakpointActionType* output)
 {
-    if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Log)) {
+    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Log)) {
         *output = ScriptBreakpointActionTypeLog;
         return true;
     }
-    if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Evaluate)) {
+    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Evaluate)) {
         *output = ScriptBreakpointActionTypeEvaluate;
         return true;
     }
-    if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Sound)) {
+    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Sound)) {
         *output = ScriptBreakpointActionTypeSound;
         return true;
     }
-    if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Probe)) {
+    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Probe)) {
         *output = ScriptBreakpointActionTypeProbe;
         return true;
     }
@@ -239,9 +239,9 @@ bool InspectorDebuggerAgent::breakpointActionsFromProtocol(ErrorString* errorStr
     return true;
 }
 
-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)
+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)
 {
-    locations = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>::create();
+    locations = Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>::create();
     if (!optionalURL == !optionalURLRegex) {
         *errorString = ASCIILiteral("Either url or urlRegex must be specified.");
         return;
@@ -278,7 +278,7 @@ void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, int li
         if (!matches(scriptURL, url, isRegex))
             continue;
 
-        RefPtr<Inspector::TypeBuilder::Debugger::Location> location = resolveBreakpoint(breakpointIdentifier, it->key, breakpoint);
+        RefPtr<Inspector::Protocol::Debugger::Location> location = resolveBreakpoint(breakpointIdentifier, it->key, breakpoint);
         if (location)
             locations->addItem(location);
     }
@@ -300,7 +300,7 @@ static bool parseLocation(ErrorString* errorString, InspectorObject* location, J
     return true;
 }
 
-void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, const RefPtr<InspectorObject>& location, const RefPtr<InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::TypeBuilder::Debugger::Location>& actualLocation)
+void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, const RefPtr<InspectorObject>& location, const RefPtr<InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation)
 {
     JSC::SourceID sourceID;
     unsigned lineNumber;
@@ -368,7 +368,7 @@ void InspectorDebuggerAgent::continueToLocation(ErrorString* errorString, const
     resume(errorString);
 }
 
-PassRefPtr<Inspector::TypeBuilder::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID sourceID, const ScriptBreakpoint& breakpoint)
+PassRefPtr<Inspector::Protocol::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID sourceID, const ScriptBreakpoint& breakpoint)
 {
     ScriptsMap::iterator scriptIterator = m_scripts.find(sourceID);
     if (scriptIterator == m_scripts.end())
@@ -388,14 +388,14 @@ PassRefPtr<Inspector::TypeBuilder::Debugger::Location> InspectorDebuggerAgent::r
         debugServerBreakpointIDsIterator = m_breakpointIdentifierToDebugServerBreakpointIDs.set(breakpointIdentifier, Vector<JSC::BreakpointID>()).iterator;
     debugServerBreakpointIDsIterator->value.append(debugServerBreakpointID);
 
-    RefPtr<Inspector::TypeBuilder::Debugger::Location> location = Inspector::TypeBuilder::Debugger::Location::create()
+    RefPtr<Inspector::Protocol::Debugger::Location> location = Inspector::Protocol::Debugger::Location::create()
         .setScriptId(String::number(sourceID))
         .setLineNumber(actualLineNumber);
     location->setColumnNumber(actualColumnNumber);
     return location;
 }
 
-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)
+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)
 {
     bool isRegex = optionalIsRegex ? *optionalIsRegex : false;
     bool caseSensitive = optionalCaseSensitive ? *optionalCaseSensitive : false;
@@ -418,7 +418,7 @@ void InspectorDebuggerAgent::getScriptSource(ErrorString* error, const String& s
         *error = "No script for id: " + scriptIDStr;
 }
 
-void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>& details)
+void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>& details)
 {
     InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(functionId);
     if (injectedScript.hasNoValue()) {
@@ -516,7 +516,7 @@ void InspectorDebuggerAgent::setPauseOnExceptions(ErrorString* errorString, cons
         *errorString = ASCIILiteral("Internal error. Could not change pause on exceptions state");
 }
 
-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)
+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)
 {
     InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(callFrameId);
     if (injectedScript.hasNoValue()) {
@@ -553,15 +553,15 @@ void InspectorDebuggerAgent::scriptExecutionBlockedByCSP(const String& directive
     }
 }
 
-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>> InspectorDebuggerAgent::currentCallFrames()
+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> InspectorDebuggerAgent::currentCallFrames()
 {
     if (!m_pausedScriptState)
-        return Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
+        return Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>::create();
 
     InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(m_pausedScriptState);
     if (injectedScript.hasNoValue()) {
         ASSERT_NOT_REACHED();
-        return Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
+        return Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>::create();
     }
 
     return injectedScript.wrapCallFrames(m_currentCallStack);
@@ -612,7 +612,7 @@ void InspectorDebuggerAgent::didParseSource(JSC::SourceID sourceID, const Script
             continue;
         }
 
-        RefPtr<Inspector::TypeBuilder::Debugger::Location> location = resolveBreakpoint(it->key, sourceID, breakpoint);
+        RefPtr<Inspector::Protocol::Debugger::Location> location = resolveBreakpoint(it->key, sourceID, breakpoint);
         if (location)
             m_frontendDispatcher->breakpointResolved(it->key, location);
     }
@@ -660,8 +660,8 @@ void InspectorDebuggerAgent::breakpointActionProbe(JSC::ExecState* scriptState,
     int sampleId = m_nextProbeSampleId++;
 
     InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
-    RefPtr<TypeBuilder::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(action));
-    RefPtr<TypeBuilder::Debugger::ProbeSample> result = TypeBuilder::Debugger::ProbeSample::create()
+    RefPtr<Protocol::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(action));
+    RefPtr<Protocol::Debugger::ProbeSample> result = Protocol::Debugger::ProbeSample::create()
         .setProbeId(action.identifier)
         .setSampleId(sampleId)
         .setBatchId(hitCount)
index 847e78b..7cfd570 100644 (file)
@@ -71,20 +71,20 @@ public:
     virtual void enable(ErrorString*) override;
     virtual void disable(ErrorString*) override;
     virtual void setBreakpointsActive(ErrorString*, bool active) override;
-    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;
+    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;
     virtual void removeBreakpoint(ErrorString*, const String& breakpointIdentifier) override;
     virtual void continueToLocation(ErrorString*, const RefPtr<InspectorObject>& location) override;
-    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;
+    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;
     virtual void getScriptSource(ErrorString*, const String& scriptID, String* scriptSource) override;
-    virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>&) override;
+    virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>&) override;
     virtual void pause(ErrorString*) override;
     virtual void resume(ErrorString*) override;
     virtual void stepOver(ErrorString*) override;
     virtual void stepInto(ErrorString*) override;
     virtual void stepOut(ErrorString*) override;
     virtual void setPauseOnExceptions(ErrorString*, const String& pauseState) override;
-    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;
+    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;
     virtual void setOverlayMessage(ErrorString*, const String*) override;
 
     bool isPaused();
@@ -129,7 +129,7 @@ protected:
     void didClearGlobalObject();
 
 private:
-    PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>> currentCallFrames();
+    PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> currentCallFrames();
 
     virtual void didParseSource(JSC::SourceID, const Script&) override final;
     virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) override final;
@@ -137,7 +137,7 @@ private:
     virtual void breakpointActionSound(int breakpointActionIdentifier) override;
     virtual void breakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, int hitCount, const Deprecated::ScriptValue& sample) override final;
 
-    PassRefPtr<Inspector::TypeBuilder::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
+    PassRefPtr<Inspector::Protocol::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
     bool assertPaused(ErrorString*);
     void clearDebuggerBreakpointState();
     void clearInspectorBreakpointState();
index 82d59a0..aa93c34 100644 (file)
@@ -84,10 +84,10 @@ void InspectorProfilerAgent::addProfile(PassRefPtr<JSC::Profile> prpProfile)
         m_frontendDispatcher->addProfileHeader(createProfileHeader(*profile));
 }
 
-PassRefPtr<TypeBuilder::Profiler::ProfileHeader> InspectorProfilerAgent::createProfileHeader(const JSC::Profile& profile)
+PassRefPtr<Protocol::Profiler::ProfileHeader> InspectorProfilerAgent::createProfileHeader(const JSC::Profile& profile)
 {
-    return TypeBuilder::Profiler::ProfileHeader::create()
-        .setTypeId(TypeBuilder::Profiler::ProfileHeader::TypeId::CPU)
+    return Protocol::Profiler::ProfileHeader::create()
+        .setTypeId(Protocol::Profiler::ProfileHeader::TypeId::CPU)
         .setUid(profile.uid())
         .setTitle(profile.title())
         .release();
@@ -131,30 +131,30 @@ String InspectorProfilerAgent::getUserInitiatedProfileName()
     return makeString(UserInitiatedProfileName, '.', String::number(m_nextUserInitiatedProfileNumber++));
 }
 
-void InspectorProfilerAgent::getProfileHeaders(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::ProfileHeader>>& headers)
+void InspectorProfilerAgent::getProfileHeaders(ErrorString*, RefPtr<Protocol::Array<Protocol::Profiler::ProfileHeader>>& headers)
 {
     m_profileHeadersRequested = true;
-    headers = TypeBuilder::Array<TypeBuilder::Profiler::ProfileHeader>::create();
+    headers = Protocol::Array<Protocol::Profiler::ProfileHeader>::create();
 
     for (auto& profile : m_profiles.values())
         headers->addItem(createProfileHeader(*profile.get()));
 }
 
-static PassRefPtr<TypeBuilder::Profiler::CPUProfileNodeCall> buildInspectorObject(const JSC::ProfileNode::Call& call)
+static PassRefPtr<Protocol::Profiler::CPUProfileNodeCall> buildInspectorObject(const JSC::ProfileNode::Call& call)
 {
-    RefPtr<TypeBuilder::Profiler::CPUProfileNodeCall> result = TypeBuilder::Profiler::CPUProfileNodeCall::create()
+    RefPtr<Protocol::Profiler::CPUProfileNodeCall> result = Protocol::Profiler::CPUProfileNodeCall::create()
         .setStartTime(call.startTime())
         .setTotalTime(call.totalTime());
     return result.release();
 }
 
-static PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
+static PassRefPtr<Protocol::Profiler::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
 {
-    RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNodeCall>> calls = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNodeCall>::create();
+    RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNodeCall>> calls = Protocol::Array<Protocol::Profiler::CPUProfileNodeCall>::create();
     for (const JSC::ProfileNode::Call& call : node->calls())
         calls->addItem(buildInspectorObject(call));
 
-    RefPtr<TypeBuilder::Profiler::CPUProfileNode> result = TypeBuilder::Profiler::CPUProfileNode::create()
+    RefPtr<Protocol::Profiler::CPUProfileNode> result = Protocol::Profiler::CPUProfileNode::create()
         .setId(node->id())
         .setCalls(calls.release());
 
@@ -168,7 +168,7 @@ static PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObject(co
     }
 
     if (!node->children().isEmpty()) {
-        RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>> children = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>::create();
+        RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNode>> children = Protocol::Array<Protocol::Profiler::CPUProfileNode>::create();
         for (RefPtr<JSC::ProfileNode> profileNode : node->children())
             children->addItem(buildInspectorObject(profileNode.get()));
         result->setChildren(children);
@@ -177,13 +177,13 @@ static PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObject(co
     return result.release();
 }
 
-PassRefPtr<TypeBuilder::Profiler::CPUProfile> InspectorProfilerAgent::buildProfileInspectorObject(const JSC::Profile* profile)
+PassRefPtr<Protocol::Profiler::CPUProfile> InspectorProfilerAgent::buildProfileInspectorObject(const JSC::Profile* profile)
 {
-    RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>> rootNodes = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>::create();
+    RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNode>> rootNodes = Protocol::Array<Protocol::Profiler::CPUProfileNode>::create();
     for (RefPtr<JSC::ProfileNode> profileNode : profile->head()->children())
         rootNodes->addItem(buildInspectorObject(profileNode.get()));
 
-    RefPtr<TypeBuilder::Profiler::CPUProfile> result = TypeBuilder::Profiler::CPUProfile::create()
+    RefPtr<Protocol::Profiler::CPUProfile> result = Protocol::Profiler::CPUProfile::create()
         .setRootNodes(rootNodes);
 
     if (profile->idleTime())
@@ -192,7 +192,7 @@ PassRefPtr<TypeBuilder::Profiler::CPUProfile> InspectorProfilerAgent::buildProfi
     return result.release();
 }
 
-void InspectorProfilerAgent::getCPUProfile(ErrorString* errorString, int rawUid, RefPtr<TypeBuilder::Profiler::CPUProfile>& profileObject)
+void InspectorProfilerAgent::getCPUProfile(ErrorString* errorString, int rawUid, RefPtr<Protocol::Profiler::CPUProfile>& profileObject)
 {
     unsigned uid = static_cast<unsigned>(rawUid);
     auto it = m_profiles.find(uid);
index 5e00fc1..61a3614 100644 (file)
@@ -68,11 +68,11 @@ public:
 
     virtual void clearProfiles(ErrorString*) override final { reset(); }
 
-    virtual void getProfileHeaders(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::ProfileHeader>>&) override final;
-    virtual void getCPUProfile(ErrorString*, int uid, RefPtr<TypeBuilder::Profiler::CPUProfile>&) override final;
+    virtual void getProfileHeaders(ErrorString*, RefPtr<Protocol::Array<Protocol::Profiler::ProfileHeader>>&) override final;
+    virtual void getCPUProfile(ErrorString*, int uid, RefPtr<Protocol::Profiler::CPUProfile>&) override final;
     virtual void removeProfile(ErrorString*, const String& type, int uid) override final;
 
-    static PassRefPtr<TypeBuilder::Profiler::CPUProfile> buildProfileInspectorObject(const JSC::Profile*);
+    static PassRefPtr<Protocol::Profiler::CPUProfile> buildProfileInspectorObject(const JSC::Profile*);
 
     enum ShouldRecompile { SkipRecompile, Recompile };
 
@@ -100,7 +100,7 @@ private:
 
     String getUserInitiatedProfileName();
 
-    PassRefPtr<TypeBuilder::Profiler::ProfileHeader> createProfileHeader(const JSC::Profile&);
+    PassRefPtr<Protocol::Profiler::ProfileHeader> createProfileHeader(const JSC::Profile&);
 
     std::unique_ptr<InspectorProfilerFrontendDispatcher> m_frontendDispatcher;
     RefPtr<InspectorProfilerBackendDispatcher> m_backendDispatcher;
index 97d449b..dd68d8d 100644 (file)
@@ -80,15 +80,15 @@ static ScriptDebugServer::PauseOnExceptionsState setPauseOnExceptionsState(Scrip
     return presentState;
 }
 
-static PassRefPtr<Inspector::TypeBuilder::Runtime::ErrorRange> buildErrorRangeObject(const JSTokenLocation& tokenLocation)
+static PassRefPtr<Inspector::Protocol::Runtime::ErrorRange> buildErrorRangeObject(const JSTokenLocation& tokenLocation)
 {
-    RefPtr<Inspector::TypeBuilder::Runtime::ErrorRange> result = Inspector::TypeBuilder::Runtime::ErrorRange::create()
+    RefPtr<Inspector::Protocol::Runtime::ErrorRange> result = Inspector::Protocol::Runtime::ErrorRange::create()
         .setStartOffset(tokenLocation.startOffset)
         .setEndOffset(tokenLocation.endOffset);
     return result.release();
 }
 
-void InspectorRuntimeAgent::parse(ErrorString*, const String& expression, Inspector::TypeBuilder::Runtime::SyntaxErrorType* result, Inspector::TypeBuilder::OptOutput<String>* message, RefPtr<Inspector::TypeBuilder::Runtime::ErrorRange>& range)
+void InspectorRuntimeAgent::parse(ErrorString*, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>& range)
 {
     VM& vm = globalVM();
     JSLockHolder lock(vm);
@@ -98,16 +98,16 @@ void InspectorRuntimeAgent::parse(ErrorString*, const String& expression, Inspec
 
     switch (error.m_syntaxErrorType) {
     case ParserError::SyntaxErrorNone:
-        *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::None;
+        *result = Inspector::Protocol::Runtime::SyntaxErrorType::None;
         break;
     case ParserError::SyntaxErrorIrrecoverable:
-        *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::Irrecoverable;
+        *result = Inspector::Protocol::Runtime::SyntaxErrorType::Irrecoverable;
         break;
     case ParserError::SyntaxErrorUnterminatedLiteral:
-        *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::UnterminatedLiteral;
+        *result = Inspector::Protocol::Runtime::SyntaxErrorType::UnterminatedLiteral;
         break;
     case ParserError::SyntaxErrorRecoverable:
-        *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::Recoverable;
+        *result = Inspector::Protocol::Runtime::SyntaxErrorType::Recoverable;
         break;
     }
 
@@ -117,7 +117,7 @@ void InspectorRuntimeAgent::parse(ErrorString*, const String& expression, Inspec
     }
 }
 
-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)
+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)
 {
     InjectedScript injectedScript = injectedScriptForEval(errorString, executionContextId);
     if (injectedScript.hasNoValue())
@@ -137,7 +137,7 @@ void InspectorRuntimeAgent::evaluate(ErrorString* errorString, const String& exp
     }
 }
 
-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)
+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)
 {
     InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
     if (injectedScript.hasNoValue()) {
@@ -163,7 +163,7 @@ void InspectorRuntimeAgent::callFunctionOn(ErrorString* errorString, const Strin
     }
 }
 
-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)
+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)
 {
     InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
     if (injectedScript.hasNoValue()) {
@@ -197,11 +197,11 @@ void InspectorRuntimeAgent::run(ErrorString*)
 {
 }
 
-void InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets(ErrorString* errorString, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::TypeDescription>>& typeDescriptions)
+void InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets(ErrorString* errorString, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>& typeDescriptions)
 {
     static const bool verbose = false;
     VM& vm = globalVM();
-    typeDescriptions = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::TypeDescription>::create();
+    typeDescriptions = Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>::create();
     if (!vm.typeProfiler()) {
         *errorString = ASCIILiteral("The VM does not currently have Type Information.");
         return;
@@ -225,7 +225,7 @@ void InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets(ErrorString* er
         location->getString(ASCIILiteral("sourceID"), &sourceIDAsString);
         location->getNumber(ASCIILiteral("divot"), &divot);
 
-        RefPtr<Inspector::TypeBuilder::Runtime::TypeDescription> typeDescription = Inspector::TypeBuilder::Runtime::TypeDescription::create();
+        RefPtr<Inspector::Protocol::Runtime::TypeDescription> typeDescription = Inspector::Protocol::Runtime::TypeDescription::create();
         bool okay;
         vm.typeProfiler()->getTypesForVariableAtOffsetForInspector(static_cast<TypeProfilerSearchDescriptor>(descriptor), divot, sourceIDAsString.toIntPtrStrict(&okay), typeDescription);
         typeDescriptions->addItem(typeDescription);
index 4f49748..b9b0b13 100644 (file)
@@ -61,14 +61,14 @@ public:
 
     virtual void enable(ErrorString*) override { m_enabled = true; }
     virtual void disable(ErrorString*) override { m_enabled = false; }
-    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;
+    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;
     virtual void releaseObject(ErrorString*, const ErrorString& objectId) override final;
-    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;
+    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;
     virtual void releaseObjectGroup(ErrorString*, const String& objectGroup) override final;
     virtual void run(ErrorString*) override;
-    virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString*, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::TypeDescription>>&) override;
+    virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString*, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
     virtual void enableTypeProfiler(ErrorString*) override;
     virtual void disableTypeProfiler(ErrorString*) override;
     
index 0b76118..bb5f97e 100644 (file)
@@ -8,5 +8,5 @@ from generate_backend_dispatcher_header import *
 from generate_backend_dispatcher_implementation import *
 from generate_frontend_dispatcher_header import *
 from generate_frontend_dispatcher_implementation import *
-from generate_type_builder_header import *
-from generate_type_builder_implementation import *
+from generate_protocol_types_header import *
+from generate_protocol_types_implementation import *
index 26f4b39..c0fef66 100644 (file)
@@ -49,7 +49,7 @@ class BackendDispatcherHeaderGenerator(Generator):
 
     def generate_output(self):
         headers = [
-            '"Inspector%sTypeBuilders.h"' % self.model().framework.setting('prefix'),
+            '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
             '<inspector/InspectorBackendDispatcher.h>',
             '<wtf/PassRefPtr.h>',
             '<wtf/text/WTFString.h>']
index 87a2b8f..68f2140 100644 (file)
@@ -148,7 +148,7 @@ class BackendDispatcherImplementationGenerator(Generator):
                     out_parameter_assignments.append('    if (%(parameterName)s)' % param_args)
                     out_parameter_assignments.append('        jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), %(parameterName)s);' % param_args)
             elif parameter.type.is_enum():
-                out_parameter_assignments.append('    jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::TypeBuilder::get%(frameworkPrefix)sEnumConstantValue(%(parameterName)s));' % param_args)
+                out_parameter_assignments.append('    jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(%(parameterName)s));' % param_args)
             else:
                 out_parameter_assignments.append('    jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), %(parameterName)s);' % param_args)
 
@@ -215,7 +215,7 @@ class BackendDispatcherImplementationGenerator(Generator):
                         out_parameter_assignments.append('        if (out_%(parameterName)s)' % param_args)
                         out_parameter_assignments.append('            result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), out_%(parameterName)s);' % param_args)
                 elif parameter.type.is_enum():
-                    out_parameter_assignments.append('        result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::TypeBuilder::get%(frameworkPrefix)sEnumConstantValue(out_%(parameterName)s));' % param_args)
+                    out_parameter_assignments.append('        result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(out_%(parameterName)s));' % param_args)
                 else:
                     out_parameter_assignments.append('        result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), out_%(parameterName)s);' % param_args)
 
index 3c669e6..a56820a 100644 (file)
@@ -49,7 +49,7 @@ class FrontendDispatcherHeaderGenerator(Generator):
 
     def generate_output(self):
         headers = [
-            '"Inspector%sTypeBuilders.h"' % self.model().framework.setting('prefix'),
+            '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
             '<inspector/InspectorFrontendChannel.h>',
             '<inspector/InspectorValues.h>',
             '<wtf/PassRefPtr.h>',
index 64e5a68..f5a352e 100644 (file)
@@ -83,7 +83,7 @@ class FrontendDispatcherImplementationGenerator(Generator):
                 parameter_value = '*' + parameter_value
             if parameter.type.is_enum():
                 framework_prefix = self.model().framework.setting('prefix')
-                parameter_value = 'Inspector::TypeBuilder::get%sEnumConstantValue(%s)' % (framework_prefix, parameter_value)
+                parameter_value = 'Inspector::Protocol::get%sEnumConstantValue(%s)' % (framework_prefix, parameter_value)
 
             parameter_args = {
                 'parameterType': Generator.type_string_for_stack_out_parameter(parameter),
@@ -37,25 +37,25 @@ from models import EnumType, ObjectType, PrimitiveType, AliasedType, ArrayType,
 log = logging.getLogger('global')
 
 
-class TypeBuilderHeaderGenerator(Generator):
+class ProtocolTypesHeaderGenerator(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')
+        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/InspectorTypeBuilder.h>',
+            '<inspector/InspectorProtocolTypes.h>',
             '<wtf/Assertions.h>',
             '<wtf/PassRefPtr.h>'
         ])
 
         if self.model().framework is not Frameworks.JavaScriptCore:
-            headers.add('<inspector/InspectorJSTypeBuilders.h>')
+            headers.add('<inspector/InspectorJSProtocolTypes.h>')
 
         export_macro = self.model().framework.setting('export_macro', None)
         framework_prefix = self.model().framework.setting('prefix')
@@ -75,7 +75,7 @@ class TypeBuilderHeaderGenerator(Generator):
         sections = []
         sections.append(self.generate_license())
         sections.append(Template(Templates.CppHeaderPrelude).substitute(None, **header_args))
-        sections.append('namespace TypeBuilder {')
+        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))
@@ -88,7 +88,7 @@ class TypeBuilderHeaderGenerator(Generator):
         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('} // namespace Protocol')
         sections.append(Template(Templates.CppHeaderPostlude).substitute(None, **header_args))
         return "\n\n".join(sections)
 
@@ -208,10 +208,10 @@ class TypeBuilderHeaderGenerator(Generator):
             'constructorExample': '\n'.join(constructor_example) + ';',
         }
 
-        lines.append(Template(Templates.TypeBuilderDeclarationPrelude).substitute(None, **builder_args))
+        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.TypeBuilderDeclarationPostlude).substitute(None, **builder_args))
+        lines.append(Template(Templates.ProtocolObjectBuilderDeclarationPostlude).substitute(None, **builder_args))
         for member in optional_members:
             lines.append(self._generate_unchecked_setter_for_member(member, domain))
 
@@ -285,7 +285,7 @@ class TypeBuilderHeaderGenerator(Generator):
         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)
+            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)
@@ -306,7 +306,7 @@ class TypeBuilderHeaderGenerator(Generator):
         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)
+            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('    }')
@@ -322,10 +322,10 @@ class TypeBuilderHeaderGenerator(Generator):
             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))
+                        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.type_builder_string_for_type(type_declaration.type), Generator.type_needs_runtime_casts(type_declaration.type)))
+                    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']
@@ -36,12 +36,12 @@ from models import AliasedType, ArrayType, EnumType, ObjectType
 log = logging.getLogger('global')
 
 
-class TypeBuilderImplementationGenerator(Generator):
+class ProtocolTypesImplementationGenerator(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')
+        return "Inspector%sProtocolTypes.cpp" % self.model().framework.setting('prefix')
 
     def generate_output(self):
         domains = self.domains_to_generate()
@@ -50,7 +50,7 @@ class TypeBuilderImplementationGenerator(Generator):
         secondary_headers = ['<wtf/text/CString.h>']
 
         header_args = {
-            'primaryInclude': '"Inspector%sTypeBuilders.h"' % self.model().framework.setting('prefix'),
+            'primaryInclude': '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
             'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),
             'inputFilename': self._input_filepath
         }
@@ -58,12 +58,12 @@ class TypeBuilderImplementationGenerator(Generator):
         sections = []
         sections.append(self.generate_license())
         sections.append(Template(Templates.CppImplementationPrelude).substitute(None, **header_args))
-        sections.append('namespace TypeBuilder {')
+        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 TypeBuilder')
+        sections.append('} // namespace Protocol')
         sections.append(Template(Templates.CppImplementationPostlude).substitute(None, **header_args))
 
         return "\n\n".join(sections)
@@ -89,7 +89,7 @@ class TypeBuilderImplementationGenerator(Generator):
         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)])
+                    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)
@@ -112,9 +112,9 @@ class TypeBuilderImplementationGenerator(Generator):
 
     def _generate_runtime_cast_for_object_declaration(self, object_declaration):
         args = {
-            'objectType': Generator.type_builder_string_for_type(object_declaration.type)
+            'objectType': Generator.protocol_type_string_for_type(object_declaration.type)
         }
-        return Template(Templates.TypeBuilderObjectRuntimeCast).substitute(None, **args)
+        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)
@@ -123,7 +123,7 @@ class TypeBuilderImplementationGenerator(Generator):
         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('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);
index c63efab..eaaa337 100644 (file)
@@ -267,22 +267,22 @@ class Generator:
 
     # Generate type representations for various situations.
     @staticmethod
-    def type_builder_string_for_type(_type):
+    def protocol_type_string_for_type(_type):
         if isinstance(_type, ObjectType) and len(_type.members) == 0:
             return 'Inspector::InspectorObject'
         if isinstance(_type, (ObjectType, AliasedType, EnumType)):
-            return 'Inspector::TypeBuilder::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
+            return 'Inspector::Protocol::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
         if isinstance(_type, ArrayType):
-            return 'Inspector::TypeBuilder::Array<%s>' % Generator.type_builder_string_for_type(_type.element_type)
+            return 'Inspector::Protocol::Array<%s>' % Generator.protocol_type_string_for_type(_type.element_type)
         if isinstance(_type, PrimitiveType):
             return Generator.cpp_name_for_primitive_type(_type)
 
     @staticmethod
-    def type_builder_string_for_type_member(type_member, object_declaration):
+    def protocol_type_string_for_type_member(type_member, object_declaration):
         if isinstance(type_member.type, EnumType) and type_member.type.is_anonymous:
-            return '::'.join([Generator.type_builder_string_for_type(object_declaration.type), ucfirst(type_member.member_name)])
+            return '::'.join([Generator.protocol_type_string_for_type(object_declaration.type), ucfirst(type_member.member_name)])
         else:
-            return Generator.type_builder_string_for_type(type_member.type)
+            return Generator.protocol_type_string_for_type(type_member.type)
 
     @staticmethod
     def type_string_for_unchecked_formal_in_parameter(parameter):
@@ -321,9 +321,9 @@ class Generator:
     @staticmethod
     def type_string_for_type_with_name(_type, type_name, is_optional):
         if isinstance(_type, (ArrayType, ObjectType)):
-            return 'PassRefPtr<%s>' % Generator.type_builder_string_for_type(_type)
+            return 'PassRefPtr<%s>' % Generator.protocol_type_string_for_type(_type)
         if isinstance(_type, AliasedType):
-            builder_type = Generator.type_builder_string_for_type(_type)
+            builder_type = Generator.protocol_type_string_for_type(_type)
             if is_optional:
                 return 'const %s* const' % builder_type
             elif _type.aliased_type.qualified_name() in ['integer', 'number']:
@@ -348,7 +348,7 @@ class Generator:
             if _type.is_anonymous:
                 enum_type_name = ucfirst(type_name)
             else:
-                enum_type_name = 'Inspector::TypeBuilder::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
+                enum_type_name = 'Inspector::Protocol::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
 
             if is_optional:
                 return '%s*' % enum_type_name
@@ -363,18 +363,18 @@ class Generator:
             _type = _type.aliased_type  # Fall through.
 
         if isinstance(_type, (ObjectType, ArrayType)):
-            return 'RefPtr<%s>&' % Generator.type_builder_string_for_type(_type)
+            return 'RefPtr<%s>&' % Generator.protocol_type_string_for_type(_type)
         if isinstance(_type, PrimitiveType):
             cpp_name = Generator.cpp_name_for_primitive_type(_type)
             if parameter.is_optional:
-                return "Inspector::TypeBuilder::OptOutput<%s>*" % cpp_name
+                return "Inspector::Protocol::OptOutput<%s>*" % cpp_name
             else:
                 return '%s*' % cpp_name
         if isinstance(_type, EnumType):
             if _type.is_anonymous:
                 return 'Inspector%sBackendDispatcherHandler::%s*' % (_type.type_domain().domain_name, ucfirst(parameter.parameter_name))
             else:
-                return 'Inspector::TypeBuilder::%s::%s*' % (_type.type_domain().domain_name, _type.raw_name())
+                return 'Inspector::Protocol::%s::%s*' % (_type.type_domain().domain_name, _type.raw_name())
 
         raise ValueError("unknown formal out parameter type.")
 
@@ -389,11 +389,11 @@ class Generator:
             _type = _type.primitive_type  # Fall through.
 
         if isinstance(_type, (ObjectType, ArrayType)):
-            return 'PassRefPtr<%s>' % Generator.type_builder_string_for_type(_type)
+            return 'PassRefPtr<%s>' % Generator.protocol_type_string_for_type(_type)
         if isinstance(_type, PrimitiveType):
             cpp_name = Generator.cpp_name_for_primitive_type(_type)
             if parameter.is_optional:
-                return "Inspector::TypeBuilder::OptOutput<%s>*" % cpp_name
+                return "Inspector::Protocol::OptOutput<%s>*" % cpp_name
             elif _type.qualified_name() in ['integer', 'number']:
                 return Generator.cpp_name_for_primitive_type(_type)
             elif _type.qualified_name() in ['string']:
@@ -425,7 +425,7 @@ class Generator:
             if _type.qualified_name() in ['any', 'object']:
                 return "RefPtr<%s>" % Generator.cpp_name_for_primitive_type(_type)
             elif parameter.is_optional and _type.qualified_name() not in ['boolean', 'string', 'integer']:
-                return "Inspector::TypeBuilder::OptOutput<%s>" % cpp_name
+                return "Inspector::Protocol::OptOutput<%s>" % cpp_name
             else:
                 return cpp_name
 
@@ -433,34 +433,34 @@ class Generator:
     def type_string_for_stack_out_parameter(parameter):
         _type = parameter.type
         if isinstance(_type, (ArrayType, ObjectType)):
-            return 'RefPtr<%s>' % Generator.type_builder_string_for_type(_type)
+            return 'RefPtr<%s>' % Generator.protocol_type_string_for_type(_type)
         if isinstance(_type, AliasedType):
-            builder_type = Generator.type_builder_string_for_type(_type)
+            builder_type = Generator.protocol_type_string_for_type(_type)
             if parameter.is_optional:
-                return "Inspector::TypeBuilder::OptOutput<%s>" % builder_type
+                return "Inspector::Protocol::OptOutput<%s>" % builder_type
             return '%s' % builder_type
         if isinstance(_type, PrimitiveType):
             cpp_name = Generator.cpp_name_for_primitive_type(_type)
             if parameter.is_optional:
-                return "Inspector::TypeBuilder::OptOutput<%s>" % cpp_name
+                return "Inspector::Protocol::OptOutput<%s>" % cpp_name
             else:
                 return cpp_name
         if isinstance(_type, EnumType):
             if _type.is_anonymous:
                 return 'Inspector%sBackendDispatcherHandler::%s' % (_type.type_domain().domain_name, ucfirst(parameter.parameter_name))
             else:
-                return 'Inspector::TypeBuilder::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
+                return 'Inspector::Protocol::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
 
     @staticmethod
     def assertion_method_for_type_member(type_member, object_declaration):
 
         def assertion_method_for_type(_type):
-            return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.type_builder_string_for_type(_type)
+            return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.protocol_type_string_for_type(_type)
 
         if isinstance(type_member.type, AliasedType):
             return assertion_method_for_type(type_member.type.aliased_type)
         if isinstance(type_member.type, EnumType) and type_member.type.is_anonymous:
-            return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.type_builder_string_for_type_member(type_member, object_declaration)
+            return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.protocol_type_string_for_type_member(type_member, object_declaration)
 
         return assertion_method_for_type(type_member.type)
 
index f9f0f37..6148525 100644 (file)
@@ -206,7 +206,7 @@ private:
     InspectorFrontendChannel* m_inspectorFrontendChannel;
 };""")
 
-    TypeBuilderDeclarationPrelude = (
+    ProtocolObjectBuilderDeclarationPrelude = (
 """    template<int STATE>
     class Builder {
     private:
@@ -225,7 +225,7 @@ private:
         friend class ${objectType};
     public:""")
 
-    TypeBuilderDeclarationPostlude = (
+    ProtocolObjectBuilderDeclarationPostlude = (
 """
         operator RefPtr<${objectType}>& ()
         {
@@ -248,9 +248,9 @@ ${constructorExample}
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;""")
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;""")
 
-    TypeBuilderObjectRuntimeCast = (
+    ProtocolObjectRuntimeCast = (
 """PassRefPtr<${objectType}> BindingTraits<${objectType}>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
 {
     RefPtr<Inspector::InspectorObject> object;
index 2fd6dfb..80890be 100755 (executable)
@@ -55,8 +55,8 @@ except ImportError:
     from generate_backend_dispatcher_implementation import *
     from generate_frontend_dispatcher_header import *
     from generate_frontend_dispatcher_implementation import *
-    from generate_type_builder_header import *
-    from generate_type_builder_implementation import *
+    from generate_protocol_types_header import *
+    from generate_protocol_types_implementation import *
 
 
 logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.ERROR)
@@ -123,8 +123,8 @@ def generate_from_specification(primary_specification_filepath=None,
     generators.append(BackendDispatcherImplementationGenerator(protocol, primary_specification_filepath))
     generators.append(FrontendDispatcherHeaderGenerator(protocol, primary_specification_filepath))
     generators.append(FrontendDispatcherImplementationGenerator(protocol, primary_specification_filepath))
-    generators.append(TypeBuilderHeaderGenerator(protocol, primary_specification_filepath))
-    generators.append(TypeBuilderImplementationGenerator(protocol, primary_specification_filepath))
+    generators.append(ProtocolTypesHeaderGenerator(protocol, primary_specification_filepath))
+    generators.append(ProtocolTypesImplementationGenerator(protocol, primary_specification_filepath))
 
     single_output_file_contents = []
 
index a0942c3..31af143 100644 (file)
@@ -74,7 +74,7 @@ InspectorBackend.registerCommand("Database.executeSQLAsync", [{"name": "database
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -99,18 +99,18 @@ public:
         Yellow = 5,
         Black = 6,
     }; // enum class PrintColor
-    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;
+    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;
     class ExecuteSQLAsyncOptionalReturnValuesCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
     public:
         ExecuteSQLAsyncOptionalReturnValuesCallback(PassRefPtr<Inspector::InspectorBackendDispatcher>, int id);
-        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);
+        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);
     };
     virtual void executeSQLAsyncOptionalReturnValues(ErrorString*, int in_databaseId, const String& in_query, PassRefPtr<ExecuteSQLAsyncOptionalReturnValuesCallback> callback) = 0;
-    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;
+    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;
     class ExecuteSQLAsyncCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
     public:
         ExecuteSQLAsyncCallback(PassRefPtr<Inspector::InspectorBackendDispatcher>, int id);
-        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);
+        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);
     };
     virtual void executeSQLAsync(ErrorString*, int in_databaseId, const String& in_query, PassRefPtr<ExecuteSQLAsyncCallback> callback) = 0;
 protected:
@@ -232,14 +232,14 @@ void InspectorDatabaseBackendDispatcher::executeSQLSyncOptionalReturnValues(long
 
     ErrorString error;
     RefPtr<InspectorObject> result = InspectorObject::create();
-    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;
+    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;
     InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
     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);
 
@@ -268,7 +268,7 @@ void InspectorDatabaseBackendDispatcher::executeSQLSyncOptionalReturnValues(long
 
 InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::ExecuteSQLAsyncOptionalReturnValuesCallback(PassRefPtr<InspectorBackendDispatcher> backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(backendDispatcher, id) { }
 
-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)
+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)
 {
     RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
     if (columnNames)
@@ -334,14 +334,14 @@ void InspectorDatabaseBackendDispatcher::executeSQLSync(long callId, const Inspe
 
     ErrorString error;
     RefPtr<InspectorObject> result = InspectorObject::create();
-    RefPtr<Inspector::TypeBuilder::Array<String>> out_columnNames;
+    RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
     String out_notes;
     double out_timestamp;
     Inspector::InspectorObject out_values;
     Inspector::InspectorValue out_payload;
-    Inspector::TypeBuilder::Database::DatabaseId out_databaseId;
-    RefPtr<Inspector::TypeBuilder::Database::Error> out_sqlError;
-    Inspector::TypeBuilder::Database::PrimaryColors out_screenColor;
+    Inspector::Protocol::Database::DatabaseId out_databaseId;
+    RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
+    Inspector::Protocol::Database::PrimaryColors out_screenColor;
     InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
     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);
 
@@ -353,15 +353,15 @@ void InspectorDatabaseBackendDispatcher::executeSQLSync(long callId, const Inspe
         result->setValue(ASCIILiteral("payload"), out_payload);
         result->setNumber(ASCIILiteral("databaseId"), out_databaseId);
         result->setObject(ASCIILiteral("sqlError"), out_sqlError);
-        result->setString(ASCIILiteral("screenColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_screenColor));
-        result->setString(ASCIILiteral("printColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_printColor));
+        result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(out_screenColor));
+        result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(out_printColor));
     }
     m_backendDispatcher->sendResponse(callId, result.release(), error);
 }
 
 InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::ExecuteSQLAsyncCallback(PassRefPtr<InspectorBackendDispatcher> backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(backendDispatcher, id) { }
 
-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)
+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)
 {
     RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
     jsonMessage->setArray(ASCIILiteral("columnNames"), columnNames);
@@ -371,8 +371,8 @@ void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::sendSuc
     jsonMessage->setValue(ASCIILiteral("payload"), payload);
     jsonMessage->setNumber(ASCIILiteral("databaseId"), databaseId);
     jsonMessage->setObject(ASCIILiteral("sqlError"), sqlError);
-    jsonMessage->setString(ASCIILiteral("screenColor"), Inspector::TypeBuilder::getTestEnumConstantValue(screenColor));
-    jsonMessage->setString(ASCIILiteral("printColor"), Inspector::TypeBuilder::getTestEnumConstantValue(printColor));
+    jsonMessage->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(screenColor));
+    jsonMessage->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(printColor));
     sendIfActive(jsonMessage, ErrorString());
 }
 
@@ -445,7 +445,7 @@ void InspectorDatabaseBackendDispatcher::executeSQLAsync(long callId, const Insp
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorValues.h>
 #include <wtf/PassRefPtr.h>
@@ -508,7 +508,7 @@ namespace Inspector {
 
 ### End File: InspectorTestFrontendDispatchers.cpp
 
-### Begin File: InspectorTestTypeBuilders.h
+### Begin File: InspectorTestProtocolTypes.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -539,13 +539,13 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-async-attribute.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h>
 
@@ -553,7 +553,7 @@ namespace Inspector {
 
 
 
-namespace TypeBuilder {
+namespace Protocol {
 
 // Forward declarations.
 #if ENABLE(SQL_DATABASE)
@@ -654,7 +654,7 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 };
 
 } // Database
@@ -662,16 +662,16 @@ public:
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
 
-### Begin File: InspectorTestTypeBuilders.cpp
+### Begin File: InspectorTestProtocolTypes.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -703,7 +703,7 @@ public:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -711,7 +711,7 @@ public:
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 static const char* const enum_constant_values[] = {
     "red",
@@ -729,10 +729,10 @@ String getTestEnumConstantValue(int code) {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-### End File: InspectorTestTypeBuilders.cpp
+### End File: InspectorTestProtocolTypes.cpp
index cdfb35f..8882f38 100644 (file)
@@ -71,7 +71,7 @@ InspectorBackend.registerCommand("Database.executeNoOptionalParameters", [{"name
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -96,8 +96,8 @@ public:
         Yellow = 5,
         Black = 6,
     }; // enum class PrintColor
-    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;
+    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;
 protected:
     virtual ~InspectorDatabaseBackendDispatcherHandler();
 };
@@ -206,7 +206,7 @@ void InspectorDatabaseBackendDispatcher::executeAllOptionalParameters(long callI
     bool notes_valueFound = false;
     String in_notes = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("notes"), &notes_valueFound, protocolErrorsPtr);
     bool timestamp_valueFound = false;
-    Inspector::TypeBuilder::OptOutput<double> in_timestamp = InspectorBackendDispatcher::getNumber(paramsContainerPtr, ASCIILiteral("timestamp"), &timestamp_valueFound, protocolErrorsPtr);
+    Inspector::Protocol::OptOutput<double> in_timestamp = InspectorBackendDispatcher::getNumber(paramsContainerPtr, ASCIILiteral("timestamp"), &timestamp_valueFound, protocolErrorsPtr);
     bool values_valueFound = false;
     RefPtr<Inspector::InspectorObject> in_values = InspectorBackendDispatcher::getObject(paramsContainerPtr, ASCIILiteral("values"), &values_valueFound, protocolErrorsPtr);
     bool payload_valueFound = false;
@@ -227,14 +227,14 @@ void InspectorDatabaseBackendDispatcher::executeAllOptionalParameters(long callI
 
     ErrorString error;
     RefPtr<InspectorObject> result = InspectorObject::create();
-    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;
+    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;
     InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
     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);
 
@@ -284,14 +284,14 @@ void InspectorDatabaseBackendDispatcher::executeNoOptionalParameters(long callId
 
     ErrorString error;
     RefPtr<InspectorObject> result = InspectorObject::create();
-    RefPtr<Inspector::TypeBuilder::Array<String>> out_columnNames;
+    RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
     String out_notes;
     double out_timestamp;
     Inspector::InspectorObject out_values;
     Inspector::InspectorValue out_payload;
-    Inspector::TypeBuilder::Database::DatabaseId out_databaseId;
-    RefPtr<Inspector::TypeBuilder::Database::Error> out_sqlError;
-    Inspector::TypeBuilder::Database::PrimaryColors out_screenColor;
+    Inspector::Protocol::Database::DatabaseId out_databaseId;
+    RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
+    Inspector::Protocol::Database::PrimaryColors out_screenColor;
     InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
     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);
 
@@ -303,8 +303,8 @@ void InspectorDatabaseBackendDispatcher::executeNoOptionalParameters(long callId
         result->setValue(ASCIILiteral("payload"), out_payload);
         result->setNumber(ASCIILiteral("databaseId"), out_databaseId);
         result->setObject(ASCIILiteral("sqlError"), out_sqlError);
-        result->setString(ASCIILiteral("screenColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_screenColor));
-        result->setString(ASCIILiteral("printColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_printColor));
+        result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(out_screenColor));
+        result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(out_printColor));
     }
     m_backendDispatcher->sendResponse(callId, result.release(), error);
 }
@@ -352,7 +352,7 @@ void InspectorDatabaseBackendDispatcher::executeNoOptionalParameters(long callId
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorValues.h>
 #include <wtf/PassRefPtr.h>
@@ -415,7 +415,7 @@ namespace Inspector {
 
 ### End File: InspectorTestFrontendDispatchers.cpp
 
-### Begin File: InspectorTestTypeBuilders.h
+### Begin File: InspectorTestProtocolTypes.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -446,13 +446,13 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-optional-call-return-parameters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h>
 
@@ -460,7 +460,7 @@ namespace Inspector {
 
 
 
-namespace TypeBuilder {
+namespace Protocol {
 
 // Forward declarations.
 #if ENABLE(SQL_DATABASE)
@@ -561,7 +561,7 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 };
 
 } // Database
@@ -569,16 +569,16 @@ public:
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
 
-### Begin File: InspectorTestTypeBuilders.cpp
+### Begin File: InspectorTestProtocolTypes.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -610,7 +610,7 @@ public:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -618,7 +618,7 @@ public:
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 static const char* const enum_constant_values[] = {
     "red",
@@ -636,10 +636,10 @@ String getTestEnumConstantValue(int code) {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-### End File: InspectorTestTypeBuilders.cpp
+### End File: InspectorTestProtocolTypes.cpp
index 4628a7f..a7ea78b 100644 (file)
@@ -78,7 +78,7 @@ InspectorBackend.registerCommand("Network3.loadResource7", [], []);
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -369,7 +369,7 @@ void InspectorNetwork3BackendDispatcher::loadResource7(long callId, const Inspec
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorValues.h>
 #include <wtf/PassRefPtr.h>
@@ -432,7 +432,7 @@ namespace Inspector {
 
 ### End File: InspectorTestFrontendDispatchers.cpp
 
-### Begin File: InspectorTestTypeBuilders.h
+### Begin File: InspectorTestProtocolTypes.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -463,13 +463,13 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h>
 
@@ -477,7 +477,7 @@ namespace Inspector {
 
 
 
-namespace TypeBuilder {
+namespace Protocol {
 
 
 
@@ -497,16 +497,16 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
 
-### Begin File: InspectorTestTypeBuilders.cpp
+### Begin File: InspectorTestProtocolTypes.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -538,7 +538,7 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -546,7 +546,7 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 static const char* const enum_constant_values[] = {
 };
@@ -557,10 +557,10 @@ String getTestEnumConstantValue(int code) {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-### End File: InspectorTestTypeBuilders.cpp
+### End File: InspectorTestProtocolTypes.cpp
index 98eac6b..eb16e4d 100644 (file)
@@ -71,7 +71,7 @@ InspectorBackend.registerEvent("Database.didExecuteNoOptionalParameters", ["colu
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -173,7 +173,7 @@ namespace Inspector {
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorValues.h>
 #include <wtf/PassRefPtr.h>
@@ -187,8 +187,8 @@ namespace Inspector {
 class InspectorDatabaseFrontendDispatcher {
 public:
     InspectorDatabaseFrontendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
-    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);
+    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);
 private:
     InspectorFrontendChannel* m_inspectorFrontendChannel;
 };
@@ -242,7 +242,7 @@ private:
 namespace Inspector {
 
 #if ENABLE(SQL_DATABASE)
-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)
+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)
 {
     RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
     jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Database.didExecuteOptionalParameters"));
@@ -268,7 +268,7 @@ void InspectorDatabaseFrontendDispatcher::didExecuteOptionalParameters(PassRefPt
     m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
 }
 
-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)
+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)
 {
     RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
     jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Database.didExecuteNoOptionalParameters"));
@@ -293,7 +293,7 @@ void InspectorDatabaseFrontendDispatcher::didExecuteNoOptionalParameters(PassRef
 
 ### End File: InspectorTestFrontendDispatchers.cpp
 
-### Begin File: InspectorTestTypeBuilders.h
+### Begin File: InspectorTestProtocolTypes.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -324,13 +324,13 @@ void InspectorDatabaseFrontendDispatcher::didExecuteNoOptionalParameters(PassRef
 // DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h>
 
@@ -338,7 +338,7 @@ namespace Inspector {
 
 
 
-namespace TypeBuilder {
+namespace Protocol {
 
 // Forward declarations.
 #if ENABLE(SQL_DATABASE)
@@ -434,7 +434,7 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 };
 
 } // Database
@@ -442,16 +442,16 @@ public:
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
 
-### Begin File: InspectorTestTypeBuilders.cpp
+### Begin File: InspectorTestProtocolTypes.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -483,7 +483,7 @@ public:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -491,7 +491,7 @@ public:
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 static const char* const enum_constant_values[] = {
 };
@@ -502,10 +502,10 @@ String getTestEnumConstantValue(int code) {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-### End File: InspectorTestTypeBuilders.cpp
+### End File: InspectorTestProtocolTypes.cpp
index c8a0d5e..5421554 100644 (file)
@@ -66,7 +66,7 @@
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -168,7 +168,7 @@ namespace Inspector {
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorValues.h>
 #include <wtf/PassRefPtr.h>
@@ -231,7 +231,7 @@ namespace Inspector {
 
 ### End File: InspectorTestFrontendDispatchers.cpp
 
-### Begin File: InspectorTestTypeBuilders.h
+### Begin File: InspectorTestProtocolTypes.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -262,13 +262,13 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h>
 
@@ -276,7 +276,7 @@ namespace Inspector {
 
 
 
-namespace TypeBuilder {
+namespace Protocol {
 
 
 
@@ -301,16 +301,16 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
 
-### Begin File: InspectorTestTypeBuilders.cpp
+### Begin File: InspectorTestProtocolTypes.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -342,7 +342,7 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -350,7 +350,7 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 static const char* const enum_constant_values[] = {
 };
@@ -361,10 +361,10 @@ String getTestEnumConstantValue(int code) {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-### End File: InspectorTestTypeBuilders.cpp
+### End File: InspectorTestProtocolTypes.cpp
index d1ae4e8..d9db13f 100644 (file)
@@ -66,7 +66,7 @@
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -168,7 +168,7 @@ namespace Inspector {
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorValues.h>
 #include <wtf/PassRefPtr.h>
@@ -231,7 +231,7 @@ namespace Inspector {
 
 ### End File: InspectorTestFrontendDispatchers.cpp
 
-### Begin File: InspectorTestTypeBuilders.h
+### Begin File: InspectorTestProtocolTypes.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -262,13 +262,13 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h>
 
@@ -276,7 +276,7 @@ namespace Inspector {
 
 
 
-namespace TypeBuilder {
+namespace Protocol {
 
 // Forward declarations.
 namespace Runtime {
@@ -331,7 +331,7 @@ public:
         Builder<STATE | TypeSet>& setType(Type value)
         {
             COMPILE_ASSERT(!(STATE & TypeSet), property_type_already_set);
-            m_result->setString(ASCIILiteral("type"), Inspector::TypeBuilder::getTestEnumConstantValue(static_cast<int>(value)));
+            m_result->setString(ASCIILiteral("type"), Inspector::Protocol::getTestEnumConstantValue(static_cast<int>(value)));
             return castState<TypeSet>();
         }
 
@@ -357,14 +357,14 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 
     void setString(const String& value)
     {
         InspectorObjectBase::setString(ASCIILiteral("string"), value);
     }
 
-    void setArray(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
+    void setArray(PassRefPtr<Inspector::Protocol::Array<String>> value)
     {
         InspectorObjectBase::setArray(ASCIILiteral("array"), value);
     }
@@ -374,16 +374,16 @@ public:
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
 
-### Begin File: InspectorTestTypeBuilders.cpp
+### Begin File: InspectorTestProtocolTypes.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -415,7 +415,7 @@ public:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -423,7 +423,7 @@ public:
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 static const char* const enum_constant_values[] = {
     "null",
@@ -437,10 +437,10 @@ String getTestEnumConstantValue(int code) {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-### End File: InspectorTestTypeBuilders.cpp
+### End File: InspectorTestProtocolTypes.cpp
index d456ce4..5f156dc 100644 (file)
@@ -66,7 +66,7 @@
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -168,7 +168,7 @@ namespace Inspector {
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorValues.h>
 #include <wtf/PassRefPtr.h>
@@ -231,7 +231,7 @@ namespace Inspector {
 
 ### End File: InspectorTestFrontendDispatchers.cpp
 
-### Begin File: InspectorTestTypeBuilders.h
+### Begin File: InspectorTestProtocolTypes.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -262,13 +262,13 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h>
 
@@ -276,7 +276,7 @@ namespace Inspector {
 
 
 
-namespace TypeBuilder {
+namespace Protocol {
 
 
 
@@ -296,16 +296,16 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
 
-### Begin File: InspectorTestTypeBuilders.cpp
+### Begin File: InspectorTestProtocolTypes.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -337,7 +337,7 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -345,7 +345,7 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 static const char* const enum_constant_values[] = {
 };
@@ -356,10 +356,10 @@ String getTestEnumConstantValue(int code) {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-### End File: InspectorTestTypeBuilders.cpp
+### End File: InspectorTestProtocolTypes.cpp
index 787ff4d..288c8d9 100644 (file)
@@ -69,7 +69,7 @@ InspectorBackend.registerEnum("Debugger.Reason", {Died: "Died", Fainted: "Fainte
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -171,7 +171,7 @@ namespace Inspector {
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorValues.h>
 #include <wtf/PassRefPtr.h>
@@ -234,7 +234,7 @@ namespace Inspector {
 
 ### End File: InspectorTestFrontendDispatchers.cpp
 
-### Begin File: InspectorTestTypeBuilders.h
+### Begin File: InspectorTestProtocolTypes.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -265,13 +265,13 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h>
 
@@ -279,7 +279,7 @@ namespace Inspector {
 
 
 
-namespace TypeBuilder {
+namespace Protocol {
 
 // Forward declarations.
 namespace Debugger {
@@ -316,16 +316,16 @@ enum class Reason {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
 
-### Begin File: InspectorTestTypeBuilders.cpp
+### Begin File: InspectorTestProtocolTypes.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -357,7 +357,7 @@ enum class Reason {
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -365,7 +365,7 @@ enum class Reason {
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 static const char* const enum_constant_values[] = {
     "Died",
@@ -379,10 +379,10 @@ String getTestEnumConstantValue(int code) {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-### End File: InspectorTestTypeBuilders.cpp
+### End File: InspectorTestProtocolTypes.cpp
index deae55c..6a82bde 100644 (file)
@@ -70,7 +70,7 @@ InspectorBackend.registerEnum("Runtime.TwoLeggedAnimals", {Ducks: "Ducks", Hens:
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -172,7 +172,7 @@ namespace Inspector {
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorValues.h>
 #include <wtf/PassRefPtr.h>
@@ -235,7 +235,7 @@ namespace Inspector {
 
 ### End File: InspectorTestFrontendDispatchers.cpp
 
-### Begin File: InspectorTestTypeBuilders.h
+### Begin File: InspectorTestProtocolTypes.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -266,13 +266,13 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h>
 
@@ -280,7 +280,7 @@ namespace Inspector {
 
 
 
-namespace TypeBuilder {
+namespace Protocol {
 
 // Forward declarations.
 namespace Runtime {
@@ -318,16 +318,16 @@ enum class TwoLeggedAnimals {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
 
-### Begin File: InspectorTestTypeBuilders.cpp
+### Begin File: InspectorTestProtocolTypes.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -359,7 +359,7 @@ enum class TwoLeggedAnimals {
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -367,7 +367,7 @@ enum class TwoLeggedAnimals {
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 static const char* const enum_constant_values[] = {
     "Pigs",
@@ -385,10 +385,10 @@ String getTestEnumConstantValue(int code) {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-### End File: InspectorTestTypeBuilders.cpp
+### End File: InspectorTestProtocolTypes.cpp
index 86be8ef..ea3db97 100644 (file)
@@ -66,7 +66,7 @@
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -168,7 +168,7 @@ namespace Inspector {
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorValues.h>
 #include <wtf/PassRefPtr.h>
@@ -231,7 +231,7 @@ namespace Inspector {
 
 ### End File: InspectorTestFrontendDispatchers.cpp
 
-### Begin File: InspectorTestTypeBuilders.h
+### Begin File: InspectorTestProtocolTypes.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -262,13 +262,13 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-object-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h>
 
@@ -276,7 +276,7 @@ namespace Inspector {
 
 
 
-namespace TypeBuilder {
+namespace Protocol {
 
 // Forward declarations.
 #if ENABLE(SQL_DATABASE)
@@ -371,7 +371,7 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 };
 
 class OptionalParameterBundle : public Inspector::InspectorObjectBase {
@@ -420,9 +420,9 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 
-    void setColumnNames(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
+    void setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
     {
         InspectorObjectBase::setArray(ASCIILiteral("columnNames"), value);
     }
@@ -447,7 +447,7 @@ public:
         InspectorObjectBase::setValue(ASCIILiteral("payload"), value);
     }
 
-    void setError(PassRefPtr<Inspector::TypeBuilder::Database::Error> value)
+    void setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
     {
         InspectorObjectBase::setObject(ASCIILiteral("error"), value);
     }
@@ -484,7 +484,7 @@ public:
         friend class ParameterBundle;
     public:
 
-        Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
+        Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
         {
             COMPILE_ASSERT(!(STATE & ColumnNamesSet), property_columnNames_already_set);
             m_result->setArray(ASCIILiteral("columnNames"), value);
@@ -519,7 +519,7 @@ public:
             return castState<PayloadSet>();
         }
 
-        Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::TypeBuilder::Database::Error> value)
+        Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
         {
             COMPILE_ASSERT(!(STATE & ErrorSet), property_error_already_set);
             m_result->setObject(ASCIILiteral("error"), value);
@@ -553,7 +553,7 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 };
 
 /* Conflicted names may cause generated getters/setters to clash with built-in InspectorObject methods. */
@@ -648,7 +648,7 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 };
 
 } // Database
@@ -686,7 +686,7 @@ public:
         friend class ParameterBundle;
     public:
 
-        Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
+        Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
         {
             COMPILE_ASSERT(!(STATE & ColumnNamesSet), property_columnNames_already_set);
             m_result->setArray(ASCIILiteral("columnNames"), value);
@@ -721,7 +721,7 @@ public:
             return castState<PayloadSet>();
         }
 
-        Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::TypeBuilder::Database::Error> value)
+        Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
         {
             COMPILE_ASSERT(!(STATE & ErrorSet), property_error_already_set);
             m_result->setObject(ASCIILiteral("error"), value);
@@ -755,23 +755,23 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 };
 
 } // Test
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
 
-### Begin File: InspectorTestTypeBuilders.cpp
+### Begin File: InspectorTestProtocolTypes.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -803,7 +803,7 @@ public:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -811,7 +811,7 @@ public:
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 static const char* const enum_constant_values[] = {
 };
@@ -822,10 +822,10 @@ String getTestEnumConstantValue(int code) {
 
 
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-### End File: InspectorTestTypeBuilders.cpp
+### End File: InspectorTestProtocolTypes.cpp
index 9d4feab..1ef13c7 100644 (file)
@@ -70,7 +70,7 @@ InspectorBackend.registerEnum("Test.CastedAnimals", {Ducks: "Ducks", Hens: "Hens
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
@@ -172,7 +172,7 @@ namespace Inspector {
 
 #if ENABLE(INSPECTOR)
 
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 #include <inspector/InspectorFrontendChannel.h>
 #include <inspector/InspectorValues.h>
 #include <wtf/PassRefPtr.h>
@@ -235,7 +235,7 @@ namespace Inspector {
 
 ### End File: InspectorTestFrontendDispatchers.cpp
 
-### Begin File: InspectorTestTypeBuilders.h
+### Begin File: InspectorTestProtocolTypes.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -266,13 +266,13 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-requiring-runtime-casts.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorTestTypeBuilders_h
-#define InspectorTestTypeBuilders_h
+#ifndef InspectorTestProtocolTypes_h
+#define InspectorTestProtocolTypes_h
 
 #if ENABLE(INSPECTOR)
 
-#include <inspector/InspectorJSTypeBuilders.h>
-#include <inspector/InspectorTypeBuilder.h>
+#include <inspector/InspectorJSProtocolTypes.h>
+#include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
 #include <wtf/PassRefPtr.h>
 
@@ -280,7 +280,7 @@ namespace Inspector {
 
 
 
-namespace TypeBuilder {
+namespace Protocol {
 
 // Forward declarations.
 namespace Test {
@@ -354,10 +354,10 @@ public:
             return castState<NumberSet>();
         }
 
-        Builder<STATE | AnimalsSet>& setAnimals(Inspector::TypeBuilder::Test::CastedAnimals value)
+        Builder<STATE | AnimalsSet>& setAnimals(Inspector::Protocol::Test::CastedAnimals value)
         {
             COMPILE_ASSERT(!(STATE & AnimalsSet), property_animals_already_set);
-            m_result->setString(ASCIILiteral("animals"), Inspector::TypeBuilder::getTestEnumConstantValue(static_cast<int>(value)));
+            m_result->setString(ASCIILiteral("animals"), Inspector::Protocol::getTestEnumConstantValue(static_cast<int>(value)));
             return castState<AnimalsSet>();
         }
 
@@ -368,7 +368,7 @@ public:
             return castState<IdSet>();
         }
 
-        Builder<STATE | TreeSet>& setTree(PassRefPtr<Inspector::TypeBuilder::Test::RecursiveObject1> value)
+        Builder<STATE | TreeSet>& setTree(PassRefPtr<Inspector::Protocol::Test::RecursiveObject1> value)
         {
             COMPILE_ASSERT(!(STATE & TreeSet), property_tree_already_set);
             m_result->setObject(ASCIILiteral("tree"), value);
@@ -401,7 +401,7 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 };
 
 /*  */
@@ -464,9 +464,9 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 
-    void setObj(PassRefPtr<Inspector::TypeBuilder::Test::RecursiveObject2> value)
+    void setObj(PassRefPtr<Inspector::Protocol::Test::RecursiveObject2> value)
     {
         InspectorObjectBase::setObject(ASCIILiteral("obj"), value);
     }
@@ -518,9 +518,9 @@ public:
     {
         return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
     }
-    typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
+    typedef Inspector::Protocol::StructItemTraits ItemTraits;
 
-    void setObj(PassRefPtr<Inspector::TypeBuilder::Test::RecursiveObject1> value)
+    void setObj(PassRefPtr<Inspector::Protocol::Test::RecursiveObject1> value)
     {
         InspectorObjectBase::setObject(ASCIILiteral("obj"), value);
     }
@@ -528,38 +528,38 @@ public:
 
 } // Test
 
-template<> struct BindingTraits<Inspector::TypeBuilder::Test::CastedAnimals> {
+template<> struct BindingTraits<Inspector::Protocol::Test::CastedAnimals> {
 #if !ASSERT_DISABLED
 static void assertValueHasExpectedType(Inspector::InspectorValue*);
 #endif // !ASSERT_DISABLED
 };
-template<> struct BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast> {
-static PassRefPtr<Inspector::TypeBuilder::Test::TypeNeedingCast> runtimeCast(PassRefPtr<Inspector::InspectorValue> value);
+template<> struct BindingTraits<Inspector::Protocol::Test::TypeNeedingCast> {
+static PassRefPtr<Inspector::Protocol::Test::TypeNeedingCast> runtimeCast(PassRefPtr<Inspector::InspectorValue> value);
 #if !ASSERT_DISABLED
 static void assertValueHasExpectedType(Inspector::InspectorValue*);
 #endif // !ASSERT_DISABLED
 };
-template<> struct BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1> {
+template<> struct BindingTraits<Inspector::Protocol::Test::RecursiveObject1> {
 #if !ASSERT_DISABLED
 static void assertValueHasExpectedType(Inspector::InspectorValue*);
 #endif // !ASSERT_DISABLED
 };
-template<> struct BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject2> {
+template<> struct BindingTraits<Inspector::Protocol::Test::RecursiveObject2> {
 #if !ASSERT_DISABLED
 static void assertValueHasExpectedType(Inspector::InspectorValue*);
 #endif // !ASSERT_DISABLED
 };
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-#endif // !defined(InspectorTestTypeBuilders_h)
-### End File: InspectorTestTypeBuilders.h
+#endif // !defined(InspectorTestProtocolTypes_h)
+### End File: InspectorTestProtocolTypes.h
 
-### Begin File: InspectorTestTypeBuilders.cpp
+### Begin File: InspectorTestProtocolTypes.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -591,7 +591,7 @@ static void assertValueHasExpectedType(Inspector::InspectorValue*);
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorTestTypeBuilders.h"
+#include "InspectorTestProtocolTypes.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -599,7 +599,7 @@ static void assertValueHasExpectedType(Inspector::InspectorValue*);
 
 namespace Inspector {
 
-namespace TypeBuilder {
+namespace Protocol {
 
 static const char* const enum_constant_values[] = {
     "Ducks",
@@ -618,7 +618,7 @@ String getTestEnumConstantValue(int code) {
 
 
 #if !ASSERT_DISABLED
-void BindingTraits<Inspector::TypeBuilder::Test::CastedAnimals>::assertValueHasExpectedType(Inspector::InspectorValue* value)
+void BindingTraits<Inspector::Protocol::Test::CastedAnimals>::assertValueHasExpectedType(Inspector::InspectorValue* value)
 {
     String s;
     bool cast_res = value->asString(&s);
@@ -628,7 +628,7 @@ void BindingTraits<Inspector::TypeBuilder::Test::CastedAnimals>::assertValueHasE
 #endif // !ASSERT_DISABLED
 
 #if !ASSERT_DISABLED
-void BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::assertValueHasExpectedType(Inspector::InspectorValue* value)
+void BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::assertValueHasExpectedType(Inspector::InspectorValue* value)
 {
     RefPtr<InspectorObject> object;
     bool castRes = value->asObject(&object);
@@ -646,7 +646,7 @@ void BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::assertValueHa
     {
         InspectorObject::iterator animalsPos = object->find(ASCIILiteral("animals"));
         ASSERT(animalsPos != object->end());
-        BindingTraits<Inspector::TypeBuilder::Test::CastedAnimals>::assertValueHasExpectedType(animalsPos->value.get());
+        BindingTraits<Inspector::Protocol::Test::CastedAnimals>::assertValueHasExpectedType(animalsPos->value.get());
     }
     {
         InspectorObject::iterator idPos = object->find(ASCIILiteral("id"));
@@ -656,7 +656,7 @@ void BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::assertValueHa
     {
         InspectorObject::iterator treePos = object->find(ASCIILiteral("tree"));
         ASSERT(treePos != object->end());
-        BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1>::assertValueHasExpectedType(treePos->value.get());
+        BindingTraits<Inspector::Protocol::Test::RecursiveObject1>::assertValueHasExpectedType(treePos->value.get());
     }
 
     int foundPropertiesCount = 5;
@@ -665,21 +665,21 @@ void BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::assertValueHa
 }
 #endif // !ASSERT_DISABLED
 
-PassRefPtr<Inspector::TypeBuilder::Test::TypeNeedingCast> BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
+PassRefPtr<Inspector::Protocol::Test::TypeNeedingCast> BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
 {
     RefPtr<Inspector::InspectorObject> object;
     bool castRes = value->asObject(&object);
     ASSERT_UNUSED(castRes, castRes);
 #if !ASSERT_DISABLED
-    BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::assertValueHasExpectedType(object.get());
+    BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::assertValueHasExpectedType(object.get());
 #endif  // !ASSERT_DISABLED
-    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()));
+    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()));
 }
 
 
 #if !ASSERT_DISABLED
-void BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1>::assertValueHasExpectedType(Inspector::InspectorValue* value)
+void BindingTraits<Inspector::Protocol::Test::RecursiveObject1>::assertValueHasExpectedType(Inspector::InspectorValue* value)
 {
     RefPtr<InspectorObject> object;
     bool castRes = value->asObject(&object);
@@ -689,7 +689,7 @@ void BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1>::assertValueH
     {
         InspectorObject::iterator objPos = object->find(ASCIILiteral("obj"));
         if (objPos != object->end()) {
-            BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject2>::assertValueHasExpectedType(objPos->value.get());
+            BindingTraits<Inspector::Protocol::Test::RecursiveObject2>::assertValueHasExpectedType(objPos->value.get());
             ++foundPropertiesCount;
         }
     }
@@ -699,7 +699,7 @@ void BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1>::assertValueH
 #endif // !ASSERT_DISABLED
 
 #if !ASSERT_DISABLED
-void BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject2>::assertValueHasExpectedType(Inspector::InspectorValue* value)
+void BindingTraits<Inspector::Protocol::Test::RecursiveObject2>::assertValueHasExpectedType(Inspector::InspectorValue* value)
 {
     RefPtr<InspectorObject> object;
     bool castRes = value->asObject(&object);
@@ -709,7 +709,7 @@ void BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject2>::assertValueH
     {
         InspectorObject::iterator objPos = object->find(ASCIILiteral("obj"));
         if (objPos != object->end()) {
-            BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1>::assertValueHasExpectedType(objPos->value.get());
+            BindingTraits<Inspector::Protocol::Test::RecursiveObject1>::assertValueHasExpectedType(objPos->value.get());
             ++foundPropertiesCount;
         }
     }
@@ -718,10 +718,10 @@ void BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject2>::assertValueH
 }
 #endif // !ASSERT_DISABLED
 
-} // namespace TypeBuilder
+} // namespace Protocol
 
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)
 
-### End File: InspectorTestTypeBuilders.cpp
+### End File: InspectorTestProtocolTypes.cpp
index 624d7ca..436dc1f 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "TypeProfiler.h"
 
-#include "InspectorJSTypeBuilders.h"
+#include "InspectorJSProtocolTypes.h"
 #include "TypeLocation.h"
 
 namespace JSC {
@@ -65,7 +65,7 @@ void TypeProfiler::insertNewLocation(TypeLocation* location)
     bucket.append(location);
 }
 
-void TypeProfiler::getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor descriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::TypeBuilder::Runtime::TypeDescription>& description)
+void TypeProfiler::getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor descriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::Protocol::Runtime::TypeDescription>& description)
 {
     TypeLocation* location = findLocation(divot, sourceID, descriptor);
     if (!location)
index ab7fd7a..e6c3871 100644 (file)
@@ -33,7 +33,7 @@
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
-namespace Inspector { namespace TypeBuilder  { namespace Runtime {
+namespace Inspector { namespace Protocol  { namespace Runtime {
 class TypeDescription;
 }}}
 
@@ -95,7 +95,7 @@ enum TypeProfilerSearchDescriptor {
 class TypeProfiler {
 public:
     void logTypesForTypeLocation(TypeLocation*);
-    void getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::TypeBuilder::Runtime::TypeDescription>&);
+    void getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::Protocol::Runtime::TypeDescription>&);
     void insertNewLocation(TypeLocation*);
     FunctionHasExecutedCache* functionHasExecutedCache() { return &m_functionHasExecutedCache; }
     TypeLocationCache* typeLocationCache() { return &m_typeLocationCache; }
index 62b5a1d..3abf4ed 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "TypeSet.h"
 
-#include "InspectorJSTypeBuilders.h"
+#include "InspectorJSProtocolTypes.h"
 #include "JSCJSValue.h"
 #include "JSCJSValueInlines.h"
 #include <wtf/text/CString.h>
@@ -213,9 +213,9 @@ String TypeSet::displayName() const
     return "(many)";
 }
 
-PassRefPtr<Inspector::TypeBuilder::Array<String>> TypeSet::allPrimitiveTypeNames() const
+PassRefPtr<Inspector::Protocol::Array<String>> TypeSet::allPrimitiveTypeNames() const
 {
-    RefPtr<Inspector::TypeBuilder::Array<String>> seen = Inspector::TypeBuilder::Array<String>::create();
+    RefPtr<Inspector::Protocol::Array<String>> seen = Inspector::Protocol::Array<String>::create();
     if (m_seenTypes & TypeUndefined)
          seen->addItem("Undefined");
     if (m_seenTypes & TypeNull)
@@ -232,9 +232,9 @@ PassRefPtr<Inspector::TypeBuilder::Array<String>> TypeSet::allPrimitiveTypeNames
     return seen.release();
 }
 
-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>> TypeSet::allStructureRepresentations() const
+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> TypeSet::allStructureRepresentations() const
 {
-    RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>> description = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>::create();
+    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> description = Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>::create();
 
     for (size_t i = 0; i < m_structureHistory.size(); i++)
         description->addItem(m_structureHistory.at(i)->inspectorRepresentation());
@@ -360,14 +360,14 @@ String StructureShape::stringRepresentation()
     return representation.toString();
 }
 
-PassRefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> StructureShape::inspectorRepresentation()
+PassRefPtr<Inspector::Protocol::Runtime::StructureDescription> StructureShape::inspectorRepresentation()
 {
-    RefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> base = Inspector::TypeBuilder::Runtime::StructureDescription::create();
-    RefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> currentObject = base;
+    RefPtr<Inspector::Protocol::Runtime::StructureDescription> base = Inspector::Protocol::Runtime::StructureDescription::create();
+    RefPtr<Inspector::Protocol::Runtime::StructureDescription> currentObject = base;
     RefPtr<StructureShape> currentShape = this;
 
     while (currentShape) {
-        auto fields = Inspector::TypeBuilder::Array<String>::create();
+        auto fields = Inspector::Protocol::Array<String>::create();
         for (auto it = currentShape->m_fields.begin(), end = currentShape->m_fields.end(); it != end; ++it)
             fields->addItem((*it).get());
 
@@ -375,7 +375,7 @@ PassRefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> StructureShape
         currentObject->setConstructorName(currentShape->m_constructorName);
 
         if (currentShape->m_proto) {
-            RefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> nextObject = Inspector::TypeBuilder::Runtime::StructureDescription::create();
+            RefPtr<Inspector::Protocol::Runtime::StructureDescription> nextObject = Inspector::Protocol::Runtime::StructureDescription::create();
             currentObject->setPrototypeStructure(nextObject);
             currentObject = nextObject;
         }
index a9bb56a..ec21210 100644 (file)
@@ -33,7 +33,7 @@
 #include <wtf/Vector.h>
 
 namespace Inspector {
-namespace TypeBuilder  {
+namespace Protocol  {
 template<typename T> class Array;
 
 namespace Runtime {
@@ -70,7 +70,7 @@ public:
     void markAsFinal();
     void addProperty(RefPtr<StringImpl>);
     String stringRepresentation();
-    PassRefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> inspectorRepresentation();
+    PassRefPtr<Inspector::Protocol::Runtime::StructureDescription> inspectorRepresentation();
     void setConstructorName(String name) { m_constructorName = (name.isEmpty() ? "Object" : name); }
     String constructorName() { return m_constructorName; }
     void setProto(PassRefPtr<StructureShape> shape) { m_proto = shape; }
@@ -94,8 +94,8 @@ public:
     static RuntimeType getRuntimeTypeForValue(JSValue);
     JS_EXPORT_PRIVATE String seenTypes() const;
     String displayName() const;
-    PassRefPtr<Inspector::TypeBuilder::Array<String>> allPrimitiveTypeNames() const;
-    PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>> allStructureRepresentations() const;
+    PassRefPtr<Inspector::Protocol::Array<String>> allPrimitiveTypeNames() const;
+    PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> allStructureRepresentations() const;
 
 private:
     String leastCommonAncestor() const;
index 90ca6ce..d25f86f 100644 (file)
@@ -792,8 +792,8 @@ set(WebCore_INSPECTOR_PROTOCOL_SCRIPTS
     ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_backend_dispatcher_implementation.py
     ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_header.py
     ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_implementation.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_type_builder_header.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_type_builder_implementation.py
+    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_header.py
+    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_implementation.py
     ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator.py
     ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator_templates.py
     ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/__init__.py
@@ -3219,8 +3219,8 @@ add_custom_command(
            ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.h
            ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.cpp
            ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.h
-           ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.cpp
-           ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.h
+           ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebProtocolTypes.cpp
+           ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebProtocolTypes.h
            ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorWebBackendCommands.js
     MAIN_DEPENDENCY ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json
     DEPENDS ${WebCore_INSPECTOR_PROTOCOL_SCRIPTS}
@@ -3231,7 +3231,7 @@ add_custom_command(
 list(APPEND WebCore_SOURCES
     ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.cpp
     ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.cpp
-    ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.cpp
+    ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebProtocolTypes.cpp
 )
 
 
index d272276..f995500 100644 (file)
@@ -1,3 +1,167 @@
+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:
+
 2014-08-25  Brendan Long  <b.long@cablelabs.com>
 
         [GStreamer] ASSERT failure in WebKitWebSource in StreamingClient
index e491797..699bc46 100644 (file)
@@ -1172,8 +1172,8 @@ INSPECTOR_GENERATOR_SCRIPTS = \
     $(InspectorScripts)/generate_backend_dispatcher_implementation.py \
     $(InspectorScripts)/generate_frontend_dispatcher_header.py \
     $(InspectorScripts)/generate_frontend_dispatcher_implementation.py \
-    $(InspectorScripts)/generate_type_builder_header.py \
-    $(InspectorScripts)/generate_type_builder_implementation.py \
+    $(InspectorScripts)/generate_protocol_types_header.py \
+    $(InspectorScripts)/generate_protocol_types_implementation.py \
     $(InspectorScripts)/generator_templates.py \
     $(InspectorScripts)/generator.py \
     $(InspectorScripts)/generate-combined-inspector-json.py \
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorJSProtocolTypes.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorJSProtocolTypes.h
new file mode 100644 (file)
index 0000000..8b88bb8
--- /dev/null
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_InspectorJSProtocolTypes_h
+#define WebCore_FWD_InspectorJSProtocolTypes_h
+#include <JavaScriptCore/InspectorJSProtocolTypes.h>
+#endif
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorJSTypeBuilders.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorJSTypeBuilders.h
deleted file mode 100644 (file)
index fb9494e..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_InspectorJSTypeBuilders_h
-#define WebCore_FWD_InspectorJSTypeBuilders_h
-#include <JavaScriptCore/InspectorJSTypeBuilders.h>
-#endif
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorProtocolTypes.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorProtocolTypes.h
new file mode 100644 (file)
index 0000000..cddbbac
--- /dev/null
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_InspectorProtocolTypes_h
+#define WebCore_FWD_InspectorProtocolTypes_h
+#include <JavaScriptCore/InspectorProtocolTypes.h>
+#endif
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorTypeBuilder.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorTypeBuilder.h
deleted file mode 100644 (file)
index ff9e113..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_InspectorTypeBuilder_h
-#define WebCore_FWD_InspectorTypeBuilder_h
-#include <JavaScriptCore/InspectorTypeBuilder.h>
-#endif
index 72619c1..f445bc4 100644 (file)
@@ -21004,7 +21004,7 @@ __ZTVN7WebCore14InspectorStyleE
 __ZTVN7WebCore19InspectorStyleSheetE
 __ZTVN7WebCore33InspectorStyleSheetForInlineStyleE
 __ZTVN7WebCore22InspectorTimelineAgentE
-__ZN7WebCore11TypeBuilderL20enum_constant_valuesE
+__ZN7WebCore8ProtocolL20enum_constant_valuesE
 __ZTVN7WebCore19InspectorObjectBaseE
 __ZTVN7WebCore18InspectorArrayBaseE
 __ZTVN7WebCore14InspectorValueE
@@ -23996,7 +23996,7 @@ ___block_literal_global
 ___block_descriptor_tmp
 ___block_descriptor_tmp
 ___block_descriptor_tmp
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_9LayerTree5LayerEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_9LayerTree5LayerEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_23InspectorLayerTreeAgentEEE
 __ZTVN7WebCore15InspectorObjectE
 __ZZN7WebCoreL20guidForOriginAndNameERKN3WTF6StringES3_E14currentNewGUID
@@ -24061,10 +24061,10 @@ __ZTVN7WebCore5TimerINS_20CachedResourceLoaderEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN3JSC19SourceProviderCacheEEE
 __ZTVN7WebCore22CanvasRenderingContextE
 __ZTVN7WebCore9ClipboardE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_7Runtime12RemoteObjectEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_7Runtime12RemoteObjectEEE
 __ZTVN7WebCore18InjectedScriptBaseE
 __ZTVN7WebCore11ScriptValueE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_4Page11SearchMatchEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_4Page11SearchMatchEEE
 __ZTVN7WebCore15ContextFeaturesE
 __ZTVN7WebCore21ContextFeaturesClientE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore17CSSPrimitiveValueEEE
@@ -24360,7 +24360,7 @@ __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore12SharedBufferEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore15GraphicsContextEEE
 __ZTVN7WebCore5TimerINS_11EventSenderINS_11ImageLoaderEEEEE
 __ZTVN7WebCore14InjectedScriptE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_8Debugger9CallFrameEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_8Debugger9CallFrameEEE
 __ZTVN7WebCore12ScriptObjectE
 __ZTVN7WebCore20InjectedScriptModuleE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore12RenderObjectEEE
@@ -24369,8 +24369,8 @@ __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore9InlineBoxEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore14RenderOverflowEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore13InlineTextBoxEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_14InspectorAgentEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_16ApplicationCache24ApplicationCacheResourceEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_16ApplicationCache17FrameWithManifestEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_16ApplicationCache24ApplicationCacheResourceEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_16ApplicationCache17FrameWithManifestEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_30InspectorApplicationCacheAgentEEE
 __ZN7WebCore26InspectorBackendDispatcher12commandNamesE
 __ZZN7WebCore30InspectorBackendDispatcherImpl8dispatchERKN3WTF6StringEE8handlers
@@ -24393,19 +24393,19 @@ __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore14InspectorStateEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore21InjectedScriptManagerEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore19InstrumentingAgentsEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore14InspectorAgentEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS6RegionEEE
-__ZTVN7WebCore11TypeBuilder5ArrayIiEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS9RuleMatchEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS7CSSRuleEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS9NamedFlowEEE
-__ZTVN7WebCore11TypeBuilder5ArrayIN3WTF6StringEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS15CSSPropertyInfoEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS19CSSStyleSheetHeaderEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS19InheritedStyleEntryEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS15PseudoIdMatchesEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS6RegionEEE
+__ZTVN7WebCore8Protocol5ArrayIiEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS9RuleMatchEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS7CSSRuleEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS9NamedFlowEEE
+__ZTVN7WebCore8Protocol5ArrayIN3WTF6StringEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS15CSSPropertyInfoEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS19CSSStyleSheetHeaderEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS19InheritedStyleEntryEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS15PseudoIdMatchesEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_17InspectorCSSAgentEEE
 __ZTVN7WebCore5TimerINS_22UpdateRegionLayoutTaskEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS20SelectorProfileEntryEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS20SelectorProfileEntryEEE
 __ZTVN7WebCore15SelectorProfileE
 __ZTVN7WebCore17InspectorCSSAgent13AddRuleActionE
 __ZTVN7WebCore17InspectorCSSAgent16StyleSheetActionE
@@ -24414,19 +24414,19 @@ __ZTVN7WebCore17InspectorCSSAgent20TogglePropertyActionE
 __ZTVN7WebCore17InspectorCSSAgent21SetPropertyTextActionE
 __ZTVN7WebCore17InspectorCSSAgent23SetStyleSheetTextActionE
 __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorDatabaseAgentEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS_14InspectorValueEEE
+__ZTVN7WebCore8Protocol5ArrayINS_14InspectorValueEEE
 __ZN7WebCoreL12nextUnusedIdE
 __ZN7WebCore22InspectorDebuggerAgent20backtraceObjectGroupE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore15InspectorObjectEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN3JSC9ExecStateEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_8Debugger8LocationEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_8Debugger8LocationEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorDebuggerAgentEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3DOM13EventListenerEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3DOM4NodeEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3DOM13EventListenerEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3DOM4NodeEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_17InspectorDOMAgentEEE
 __ZTVN7WebCore5TimerINS_28RevalidateStyleAttributeTaskEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_25InspectorDOMDebuggerAgentEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS1_IN3WTF6StringEEEEE
+__ZTVN7WebCore8Protocol5ArrayINS1_IN3WTF6StringEEEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_24InspectorDOMStorageAgentEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore11StorageAreaEEE
 __ZTVN7WebCore5TimerINS_28InspectorBackendDispatchTaskEEE
@@ -24437,42 +24437,42 @@ __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore19HeapGraphSerializerEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore31MemoryInstrumentationClientImplEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore25MemoryInstrumentationImplEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore20InspectorMemoryAgentEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_6Memory11MemoryBlockEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_6Memory11MemoryBlockEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore11MemoryCacheEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperINS_15ArrayBufferViewEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperINS_11ArrayBufferEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_6Memory13ListenerCountEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_6Memory9NodeCountEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_6Memory8DOMGroupEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_6Memory13ListenerCountEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_6Memory9NodeCountEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_6Memory8DOMGroupEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore7IntRectEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_4Page17FrameResourceTreeEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_4Page17FrameResourceTree9ResourcesEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_4Page12SearchResultEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_4Page6CookieEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_4Page17FrameResourceTreeEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_4Page17FrameResourceTree9ResourcesEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_4Page12SearchResultEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_4Page6CookieEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_18InspectorPageAgentEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore18ScriptHeapSnapshotEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore13ScriptProfileEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore21InspectorConsoleAgentEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_8Profiler13ProfileHeaderEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_8Profiler13ProfileHeaderEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorProfilerAgentEEE
 __ZTVN7WebCore19WorkerProfilerAgentE
 __ZTVN7WebCore17PageProfilerAgentE
 __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorResourceAgentEEE
-__ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore11TypeBuilder7Network9InitiatorEEE
+__ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore8Protocol7Network9InitiatorEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore13XHRReplayDataEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore22ThreadableLoaderClientEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore20NetworkResourcesDataEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_21InspectorRuntimeAgentEEE
 __ZTVN7WebCore14InspectorStateE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS8CSSMediaEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS14ShorthandEntryEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS11CSSPropertyEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_3CSS24CSSComputedStylePropertyEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS8CSSMediaEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS14ShorthandEntryEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS11CSSPropertyEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_3CSS24CSSComputedStylePropertyEEE
 __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorTimelineAgentEEE
-__ZN7WebCore11TypeBuilder7Network8Response8MimeTypeE
-__ZN7WebCore11TypeBuilder3CSS11CSSProperty8PriorityE
-__ZN7WebCore11TypeBuilder3CSS11CSSProperty8ParsedOkE
-__ZN7WebCore11TypeBuilder3CSS11CSSProperty6StatusE
+__ZN7WebCore8Protocol7Network8Response8MimeTypeE
+__ZN7WebCore8Protocol3CSS11CSSProperty8PriorityE
+__ZN7WebCore8Protocol3CSS11CSSProperty8ParsedOkE
+__ZN7WebCore8Protocol3CSS11CSSProperty6StatusE
 __ZN7WebCore20InspectorWorkerAgent21WorkerFrontendChannel8s_nextIdE
 __ZTVN7WebCore18InspectorBaseAgentINS_20InspectorWorkerAgentEEE
 __ZTVN7WebCore20InspectorWorkerAgent21WorkerFrontendChannelE
@@ -26237,7 +26237,7 @@ __ZN7WebCore22RuntimeEnabledFeatures19isVideoTrackEnabledE
 __ZTVN7WebCore6ScreenE
 __ZTVN7WebCore24ScriptableDocumentParserE
 __ZTVN3JSC9WeakGCMapIPvNS_8JSObjectENS_33DefaultWeakGCMapFinalizerCallbackIS1_S2_EEN3WTF7PtrHashIS1_EENS5_10HashTraitsIS1_EEEE
-__ZTVN7WebCore11TypeBuilder5ArrayINS0_7Console9CallFrameEEE
+__ZTVN7WebCore8Protocol5ArrayINS0_7Console9CallFrameEEE
 __ZTVN7WebCore5TimerINS_17ScriptDebugServerEEE
 __ZTVN7WebCore5TimerINS_27ScriptedAnimationControllerEEE
 __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore10FileThreadEEE
index e6ce83c..594f9ba 100644 (file)
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLNames.cpp" />
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebBackendDispatchers.cpp" />
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.cpp" />
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebTypeBuilders.cpp" />
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.cpp" />
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorOverlayPage.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebBackendDispatchers.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebTypeBuilders.h" />
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSAttr.h" />
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSBarProp.h" />
     <ClInclude Include="..\ForwardingHeaders\inspector\InspectorFrontendChannel.h" />
     <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSBackendDispatchers.h" />
     <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSFrontendDispatchers.h" />
-    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSTypeBuilders.h" />
-    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorTypeBuilder.h" />
+    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSProtocolTypes.h" />
+    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorProtocolTypes.h" />
     <ClInclude Include="..\ForwardingHeaders\inspector\InspectorValues.h" />
     <ClInclude Include="..\ForwardingHeaders\inspector\ScriptArguments.h" />
     <ClInclude Include="..\ForwardingHeaders\inspector\ScriptBreakpoint.h" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index c0f1b77..1f22dfe 100644 (file)
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebTypeBuilders.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.cpp">
       <Filter>DerivedSources</Filter>
     </ClCompile>
     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.cpp">
     <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSFrontendDispatchers.h">
       <Filter>ForwardingHeaders\inspector</Filter>
     </ClInclude>
-    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSTypeBuilders.h">
+    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSProtocolTypes.h">
       <Filter>ForwardingHeaders\inspector</Filter>
     </ClInclude>
-    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorTypeBuilder.h">
+    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorProtocolTypes.h">
       <Filter>ForwardingHeaders\inspector</Filter>
     </ClInclude>
     <ClInclude Include="..\ForwardingHeaders\inspector\InspectorValues.h">
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebTypeBuilders.h">
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.h">
       <Filter>DerivedSources</Filter>
     </ClInclude>
     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.h">
index b45ffde..0d0d64e 100644 (file)
                53EF766C16531994004CBE49 /* SettingsMacros.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 53EF766A16530A61004CBE49 /* SettingsMacros.h */; };
                550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BC7085F6039007353D6 /* QualifiedName.cpp */; };
                550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               573D134714CE39FF0057ABCA /* InspectorWebTypeBuilders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573D134514CE39FF0057ABCA /* InspectorWebTypeBuilders.cpp */; };
+               573D134714CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573D134514CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp */; };
                578DA20E1520EB8C006141C1 /* InspectorWebFrontendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F4F5FFC11CBD30100A186BF /* InspectorWebFrontendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               578DA20F1520EBA3006141C1 /* InspectorWebTypeBuilders.h in Headers */ = {isa = PBXBuildFile; fileRef = 573D134614CE39FF0057ABCA /* InspectorWebTypeBuilders.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               578DA20F1520EBA3006141C1 /* InspectorWebProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 573D134614CE39FF0057ABCA /* InspectorWebProtocolTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                57B791A314C6A62900F202D1 /* ContentDistributor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B7919F14C6A62900F202D1 /* ContentDistributor.cpp */; };
                57B791A414C6A62900F202D1 /* ContentDistributor.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B791A014C6A62900F202D1 /* ContentDistributor.h */; settings = {ATTRIBUTES = (Private, ); }; };
                57CF497414EE36D700ECFF14 /* InsertionPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */; };
                53EF766A16530A61004CBE49 /* SettingsMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsMacros.h; sourceTree = "<group>"; };
                550A0BC7085F6039007353D6 /* QualifiedName.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifiedName.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               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>"; };
+               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>"; };
                57B7919F14C6A62900F202D1 /* ContentDistributor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentDistributor.cpp; sourceTree = "<group>"; };
                57B791A014C6A62900F202D1 /* ContentDistributor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentDistributor.h; sourceTree = "<group>"; };
                57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InsertionPoint.cpp; sourceTree = "<group>"; };
                                4F707A9811EF679400ACDA69 /* InspectorWebBackendDispatchers.h */,
                                4F4F5FFA11CBD2D200A186BF /* InspectorWebFrontendDispatchers.cpp */,
                                4F4F5FFC11CBD30100A186BF /* InspectorWebFrontendDispatchers.h */,
-                               573D134514CE39FF0057ABCA /* InspectorWebTypeBuilders.cpp */,
-                               573D134614CE39FF0057ABCA /* InspectorWebTypeBuilders.h */,
+                               573D134514CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp */,
+                               573D134614CE39FF0057ABCA /* InspectorWebProtocolTypes.h */,
                                A584FE391864E2D800843B10 /* JSCommandLineAPIHost.cpp */,
                                A584FE3A1864E2D800843B10 /* JSCommandLineAPIHost.h */,
                                7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */,
                                A593CF8B1840535200BFCE27 /* InspectorWebAgentBase.h in Headers */,
                                4F707A9A11EF679400ACDA69 /* InspectorWebBackendDispatchers.h in Headers */,
                                578DA20E1520EB8C006141C1 /* InspectorWebFrontendDispatchers.h in Headers */,
-                               578DA20F1520EBA3006141C1 /* InspectorWebTypeBuilders.h in Headers */,
+                               578DA20F1520EBA3006141C1 /* InspectorWebProtocolTypes.h in Headers */,
                                F3810C1C1365A49600ED6E33 /* InspectorWorkerAgent.h in Headers */,
                                F375CC071150D300008DDB81 /* InspectorWorkerResource.h in Headers */,
                                F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */,
                                754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */,
                                4F707A9911EF679400ACDA69 /* InspectorWebBackendDispatchers.cpp in Sources */,
                                4F4F5FFB11CBD2E100A186BF /* InspectorWebFrontendDispatchers.cpp in Sources */,
-                               573D134714CE39FF0057ABCA /* InspectorWebTypeBuilders.cpp in Sources */,
+                               573D134714CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp in Sources */,
                                F3810C1B1365A49600ED6E33 /* InspectorWorkerAgent.cpp in Sources */,
                                F350B73513F1377D00880C43 /* InstrumentingAgents.cpp in Sources */,
                                2D46F04E17B96FBD005647F0 /* IntPoint.cpp in Sources */,
index b68b4ce..4500896 100644 (file)
@@ -95,7 +95,7 @@ void CommandLineAPIHost::disconnect()
 void CommandLineAPIHost::inspectImpl(PassRefPtr<InspectorValue> object, PassRefPtr<InspectorValue> hints)
 {
     if (m_inspectorAgent) {
-        RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> remoteObject = BindingTraits<Inspector::TypeBuilder::Runtime::RemoteObject>::runtimeCast(object);
+        RefPtr<Inspector::Protocol::Runtime::RemoteObject> remoteObject = BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(object);
         m_inspectorAgent->inspect(remoteObject, hints->asObject());
     }
 }
index aa91eb1..6134d7c 100644 (file)
@@ -94,9 +94,9 @@ void InspectorApplicationCacheAgent::networkStateChanged()
     m_frontendDispatcher->networkStateUpdated(isNowOnline);
 }
 
-void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::FrameWithManifest>>& result)
+void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>>& result)
 {
-    result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::FrameWithManifest>::create();
+    result = Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>::create();
 
     Frame* mainFrame = m_pageAgent->mainFrame();
     for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext(mainFrame)) {
@@ -108,7 +108,7 @@ void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, RefPtr
         ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
         String manifestURL = info.m_manifest.string();
         if (!manifestURL.isEmpty()) {
-            RefPtr<Inspector::TypeBuilder::ApplicationCache::FrameWithManifest> value = Inspector::TypeBuilder::ApplicationCache::FrameWithManifest::create()
+            RefPtr<Inspector::Protocol::ApplicationCache::FrameWithManifest> value = Inspector::Protocol::ApplicationCache::FrameWithManifest::create()
                 .setFrameId(m_pageAgent->frameId(frame))
                 .setManifestURL(manifestURL)
                 .setStatus(static_cast<int>(host->status()));
@@ -136,7 +136,7 @@ void InspectorApplicationCacheAgent::getManifestForFrame(ErrorString* errorStrin
     *manifestURL = info.m_manifest.string();
 }
 
-void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* errorString, const String& frameId, RefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache>& applicationCache)
+void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* errorString, const String& frameId, RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache>& applicationCache)
 {
     DocumentLoader* documentLoader = assertFrameWithDocumentLoader(errorString, frameId);
     if (!documentLoader)
@@ -151,9 +151,9 @@ void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* er
     applicationCache = buildObjectForApplicationCache(resources, info);
 }
 
-PassRefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
+PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
 {
-    return Inspector::TypeBuilder::ApplicationCache::ApplicationCache::create()
+    return Inspector::Protocol::ApplicationCache::ApplicationCache::create()
         .setManifestURL(applicationCacheInfo.m_manifest.string())
         .setSize(applicationCacheInfo.m_size)
         .setCreationTime(applicationCacheInfo.m_creationTime)
@@ -162,9 +162,9 @@ PassRefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache> Inspector
         .release();
 }
 
-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
 {
-    RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource>> resources = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource>::create();
+    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> resources = Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>::create();
 
     for (const auto& resourceInfo : applicationCacheResources)
         resources->addItem(buildObjectForApplicationCacheResource(resourceInfo));
@@ -172,7 +172,7 @@ PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCach
     return resources;
 }
 
-PassRefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
+PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
 {
     StringBuilder types;
 
@@ -191,7 +191,7 @@ PassRefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource> I
     if (resourceInfo.m_isExplicit)
         types.appendLiteral("Explicit ");
 
-    RefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource> value = Inspector::TypeBuilder::ApplicationCache::ApplicationCacheResource::create()
+    RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> value = Inspector::Protocol::ApplicationCache::ApplicationCacheResource::create()
         .setUrl(resourceInfo.m_resource.string())
         .setSize(static_cast<int>(resourceInfo.m_size))
         .setType(types.toString());
index a9c7642..ae94d02 100644 (file)
@@ -62,14 +62,14 @@ public:
     void networkStateChanged();
 
     virtual void enable(ErrorString*) override;
-    virtual void getFramesWithManifests(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::ApplicationCache::FrameWithManifest>>& result) override;
+    virtual void getFramesWithManifests(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>>& result) override;
     virtual void getManifestForFrame(ErrorString*, const String& frameId, String* manifestURL) override;
-    virtual void getApplicationCacheForFrame(ErrorString*, const String& frameId, RefPtr<Inspector::TypeBuilder::ApplicationCache::ApplicationCache>&) override;
+    virtual void getApplicationCacheForFrame(ErrorString*, const String& frameId, RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache>&) override;
 
 private:
-    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&);
+    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&);
 
     DocumentLoader* assertFrameWithDocumentLoader(ErrorString*, String frameId);
 
index 169d37c..21e9955 100644 (file)
@@ -43,7 +43,7 @@
 #include "HTMLStyleElement.h"
 #include "InspectorDOMAgent.h"
 #include "InspectorHistory.h"
-#include "InspectorWebTypeBuilders.h"
+#include "InspectorWebProtocolTypes.h"
 #include "InstrumentingAgents.h"
 #include "NamedFlowCollection.h"
 #include "Node.h"
@@ -600,7 +600,7 @@ bool InspectorCSSAgent::forcePseudoState(Element* element, CSSSelector::PseudoCl
     }
 }
 
-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)
+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)
 {
     Element* element = elementForId(errorString, nodeId);
     if (!element)
@@ -613,11 +613,11 @@ void InspectorCSSAgent::getMatchedStylesForNode(ErrorString* errorString, int no
 
     // Pseudo elements.
     if (!includePseudo || *includePseudo) {
-        RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::PseudoIdMatches>> pseudoElements = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::PseudoIdMatches>::create();
+        RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>> pseudoElements = Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>::create();
         for (PseudoId pseudoId = FIRST_PUBLIC_PSEUDOID; pseudoId < AFTER_LAST_INTERNAL_PSEUDOID; pseudoId = static_cast<PseudoId>(pseudoId + 1)) {
             auto matchedRules = styleResolver.pseudoStyleRulesForElement(element, pseudoId, StyleResolver::AllCSSRules);
             if (!matchedRules.isEmpty()) {
-                RefPtr<Inspector::TypeBuilder::CSS::PseudoIdMatches> matches = Inspector::TypeBuilder::CSS::PseudoIdMatches::create()
+                RefPtr<Inspector::Protocol::CSS::PseudoIdMatches> matches = Inspector::Protocol::CSS::PseudoIdMatches::create()
                     .setPseudoId(static_cast<int>(pseudoId))
                     .setMatches(buildArrayForMatchedRuleList(matchedRules, styleResolver, element));
                 pseudoElements->addItem(matches.release());
@@ -629,12 +629,12 @@ void InspectorCSSAgent::getMatchedStylesForNode(ErrorString* errorString, int no
 
     // Inherited styles.
     if (!includeInherited || *includeInherited) {
-        RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::InheritedStyleEntry>> entries = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::InheritedStyleEntry>::create();
+        RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>> entries = Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>::create();
         Element* parentElement = element->parentElement();
         while (parentElement) {
             StyleResolver& parentStyleResolver = parentElement->document().ensureStyleResolver();
             auto parentMatchedRules = parentStyleResolver.styleRulesForElement(parentElement, StyleResolver::AllCSSRules);
-            RefPtr<Inspector::TypeBuilder::CSS::InheritedStyleEntry> entry = Inspector::TypeBuilder::CSS::InheritedStyleEntry::create()
+            RefPtr<Inspector::Protocol::CSS::InheritedStyleEntry> entry = Inspector::Protocol::CSS::InheritedStyleEntry::create()
                 .setMatchedCSSRules(buildArrayForMatchedRuleList(parentMatchedRules, styleResolver, parentElement));
             if (parentElement->style() && parentElement->style()->length()) {
                 InspectorStyleSheetForInlineStyle* styleSheet = asInspectorStyleSheet(parentElement);
@@ -650,7 +650,7 @@ void InspectorCSSAgent::getMatchedStylesForNode(ErrorString* errorString, int no
     }
 }
 
-void InspectorCSSAgent::getInlineStylesForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& attributesStyle)
+void InspectorCSSAgent::getInlineStylesForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::Protocol::CSS::CSSStyle>& attributesStyle)
 {
     Element* element = elementForId(errorString, nodeId);
     if (!element)
@@ -661,11 +661,11 @@ void InspectorCSSAgent::getInlineStylesForNode(ErrorString* errorString, int nod
         return;
 
     inlineStyle = styleSheet->buildObjectForStyle(element->style());
-    RefPtr<Inspector::TypeBuilder::CSS::CSSStyle> attributes = buildObjectForAttributesStyle(element);
+    RefPtr<Inspector::Protocol::CSS::CSSStyle> attributes = buildObjectForAttributesStyle(element);
     attributesStyle = attributes ? attributes.release() : nullptr;
 }
 
-void InspectorCSSAgent::getComputedStyleForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSComputedStyleProperty>>& style)
+void InspectorCSSAgent::getComputedStyleForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>>& style)
 {
     Element* element = elementForId(errorString, nodeId);
     if (!element)
@@ -676,9 +676,9 @@ void InspectorCSSAgent::getComputedStyleForNode(ErrorString* errorString, int no
     style = inspectorStyle->buildArrayForComputedStyle();
 }
 
-void InspectorCSSAgent::getAllStyleSheets(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader>>& styleInfos)
+void InspectorCSSAgent::getAllStyleSheets(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>>& styleInfos)
 {
-    styleInfos = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader>::create();
+    styleInfos = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>::create();
     Vector<Document*> documents = m_domAgent->documents();
     for (Vector<Document*>::iterator it = documents.begin(); it != documents.end(); ++it) {
         StyleSheetList* list = (*it)->styleSheets();
@@ -690,7 +690,7 @@ void InspectorCSSAgent::getAllStyleSheets(ErrorString*, RefPtr<Inspector::TypeBu
     }
 }
 
-void InspectorCSSAgent::getStyleSheet(ErrorString* errorString, const String& styleSheetId, RefPtr<Inspector::TypeBuilder::CSS::CSSStyleSheetBody>& styleSheetObject)
+void InspectorCSSAgent::getStyleSheet(ErrorString* errorString, const String& styleSheetId, RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody>& styleSheetObject)
 {
     InspectorStyleSheet* inspectorStyleSheet = assertStyleSheetForId(errorString, styleSheetId);
     if (!inspectorStyleSheet)
@@ -719,7 +719,7 @@ void InspectorCSSAgent::setStyleSheetText(ErrorString* errorString, const String
     *errorString = InspectorDOMAgent::toErrorString(ec);
 }
 
-void InspectorCSSAgent::setStyleText(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, const String& text, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result)
+void InspectorCSSAgent::setStyleText(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, const String& text, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
 {
     InspectorCSSId compoundId(fullStyleId);
     ASSERT(!compoundId.isEmpty());
@@ -735,7 +735,7 @@ void InspectorCSSAgent::setStyleText(ErrorString* errorString, const RefPtr<Insp
     *errorString = InspectorDOMAgent::toErrorString(ec);
 }
 
-void InspectorCSSAgent::setPropertyText(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result)
+void InspectorCSSAgent::setPropertyText(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
 {
     InspectorCSSId compoundId(fullStyleId);
     ASSERT(!compoundId.isEmpty());
@@ -751,7 +751,7 @@ void InspectorCSSAgent::setPropertyText(ErrorString* errorString, const RefPtr<I
     *errorString = InspectorDOMAgent::toErrorString(ec);
 }
 
-void InspectorCSSAgent::toggleProperty(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, bool disable, RefPtr<Inspector::TypeBuilder::CSS::CSSStyle>& result)
+void InspectorCSSAgent::toggleProperty(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, bool disable, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
 {
     InspectorCSSId compoundId(fullStyleId);
     ASSERT(!compoundId.isEmpty());
@@ -767,7 +767,7 @@ void InspectorCSSAgent::toggleProperty(ErrorString* errorString, const RefPtr<In
     *errorString = InspectorDOMAgent::toErrorString(ec);
 }
 
-void InspectorCSSAgent::setRuleSelector(ErrorString* errorString, const RefPtr<InspectorObject>& fullRuleId, const String& selector, RefPtr<Inspector::TypeBuilder::CSS::CSSRule>& result)
+void InspectorCSSAgent::setRuleSelector(ErrorString* errorString, const RefPtr<InspectorObject>& fullRuleId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result)
 {
     InspectorCSSId compoundId(fullRuleId);
     ASSERT(!compoundId.isEmpty());
@@ -784,7 +784,7 @@ void InspectorCSSAgent::setRuleSelector(ErrorString* errorString, const RefPtr<I
     *errorString = InspectorDOMAgent::toErrorString(ec);
 }
 
-void InspectorCSSAgent::addRule(ErrorString* errorString, const int contextNodeId, const String& selector, RefPtr<Inspector::TypeBuilder::CSS::CSSRule>& result)
+void InspectorCSSAgent::addRule(ErrorString* errorString, const int contextNodeId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result)
 {
     Node* node = m_domAgent->assertNode(errorString, contextNodeId);
     if (!node)
@@ -810,12 +810,12 @@ void InspectorCSSAgent::addRule(ErrorString* errorString, const int contextNodeI
     result = inspectorStyleSheet->buildObjectForRule(rule);
 }
 
-void InspectorCSSAgent::getSupportedCSSProperties(ErrorString*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSPropertyInfo>>& cssProperties)
+void InspectorCSSAgent::getSupportedCSSProperties(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>>& cssProperties)
 {
-    RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSPropertyInfo>> properties = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSPropertyInfo>::create();
+    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>> properties = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>::create();
     for (int i = firstCSSProperty; i <= lastCSSProperty; ++i) {
         CSSPropertyID id = convertToCSSPropertyID(i);
-        RefPtr<Inspector::TypeBuilder::CSS::CSSPropertyInfo> property = Inspector::TypeBuilder::CSS::CSSPropertyInfo::create()
+        RefPtr<Inspector::Protocol::CSS::CSSPropertyInfo> property = Inspector::Protocol::CSS::CSSPropertyInfo::create()
             .setName(getPropertyNameString(id));
 
         const StylePropertyShorthand& shorthand = shorthandForProperty(id);
@@ -823,7 +823,7 @@ void InspectorCSSAgent::getSupportedCSSProperties(ErrorString*, RefPtr<Inspector
             properties->addItem(property.release());
             continue;
         }
-        RefPtr<Inspector::TypeBuilder::Array<String>> longhands = Inspector::TypeBuilder::Array<String>::create();
+        RefPtr<Inspector::Protocol::Array<String>> longhands = Inspector::Protocol::Array<String>::create();
         for (unsigned j = 0; j < shorthand.length(); ++j) {
             CSSPropertyID longhandID = shorthand.properties()[j];
             longhands->addItem(getPropertyNameString(longhandID));
@@ -854,7 +854,7 @@ void InspectorCSSAgent::forcePseudoState(ErrorString* errorString, int nodeId, c
     element->document().styleResolverChanged(RecalcStyleImmediately);
 }
 
-void InspectorCSSAgent::getNamedFlowCollection(ErrorString* errorString, int documentNodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::NamedFlow>>& result)
+void InspectorCSSAgent::getNamedFlowCollection(ErrorString* errorString, int documentNodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>>& result)
 {
     Document* document = m_domAgent->assertDocument(errorString, documentNodeId);
     if (!document)
@@ -863,7 +863,7 @@ void InspectorCSSAgent::getNamedFlowCollection(ErrorString* errorString, int doc
     m_namedFlowCollectionsRequested.add(documentNodeId);
 
     Vector<RefPtr<WebKitNamedFlow>> namedFlowsVector = document->namedFlows()->namedFlows();
-    RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::NamedFlow>> namedFlows = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::NamedFlow>::create();
+    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>> namedFlows = Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>::create();
 
     for (Vector<RefPtr<WebKitNamedFlow>>::iterator it = namedFlowsVector.begin(); it != namedFlowsVector.end(); ++it)
         namedFlows->addItem(buildObjectForNamedFlow(errorString, it->get(), documentNodeId));
@@ -880,7 +880,7 @@ InspectorStyleSheetForInlineStyle* InspectorCSSAgent::asInspectorStyleSheet(Elem
             return nullptr;
 
         String newStyleSheetId = String::number(m_lastStyleSheetId++);
-        RefPtr<InspectorStyleSheetForInlineStyle> inspectorStyleSheet = InspectorStyleSheetForInlineStyle::create(m_domAgent->pageAgent(), newStyleSheetId, element, Inspector::TypeBuilder::CSS::StyleSheetOrigin::Regular, this);
+        RefPtr<InspectorStyleSheetForInlineStyle> inspectorStyleSheet = InspectorStyleSheetForInlineStyle::create(m_domAgent->pageAgent(), newStyleSheetId, element, Inspector::Protocol::CSS::StyleSheetOrigin::Regular, this);
         m_idToInspectorStyleSheet.set(newStyleSheetId, inspectorStyleSheet);
         m_nodeToInspectorStyleSheet.set(element, inspectorStyleSheet);
         return inspectorStyleSheet.get();
@@ -912,7 +912,7 @@ int InspectorCSSAgent::documentNodeWithRequestedFlowsId(Document* document)
     return documentNodeId;
 }
 
-void InspectorCSSAgent::collectStyleSheets(CSSStyleSheet* styleSheet, Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader>* result)
+void InspectorCSSAgent::collectStyleSheets(CSSStyleSheet* styleSheet, Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>* result)
 {
     InspectorStyleSheet* inspectorStyleSheet = bindStyleSheet(static_cast<CSSStyleSheet*>(styleSheet));
     result->addItem(inspectorStyleSheet->buildObjectForStyleSheetInfo());
@@ -983,7 +983,7 @@ InspectorStyleSheet* InspectorCSSAgent::viaInspectorStyleSheet(Document* documen
         return nullptr;
 
     String id = String::number(m_lastStyleSheetId++);
-    inspectorStyleSheet = InspectorStyleSheet::create(m_domAgent->pageAgent(), id, cssStyleSheet, Inspector::TypeBuilder::CSS::StyleSheetOrigin::Inspector, InspectorDOMAgent::documentURLString(document), this);
+    inspectorStyleSheet = InspectorStyleSheet::create(m_domAgent->pageAgent(), id, cssStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin::Inspector, InspectorDOMAgent::documentURLString(document), this);
     m_idToInspectorStyleSheet.set(id, inspectorStyleSheet);
     m_cssStyleSheetToInspectorStyleSheet.set(cssStyleSheet, inspectorStyleSheet);
     m_documentToInspectorStyleSheet.set(document, inspectorStyleSheet);
@@ -1000,22 +1000,22 @@ InspectorStyleSheet* InspectorCSSAgent::assertStyleSheetForId(ErrorString* error
     return it->value.get();
 }
 
-Inspector::TypeBuilder::CSS::StyleSheetOrigin InspectorCSSAgent::detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument)
+Inspector::Protocol::CSS::StyleSheetOrigin InspectorCSSAgent::detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument)
 {
-    Inspector::TypeBuilder::CSS::StyleSheetOrigin origin = Inspector::TypeBuilder::CSS::StyleSheetOrigin::Regular;
+    Inspector::Protocol::CSS::StyleSheetOrigin origin = Inspector::Protocol::CSS::StyleSheetOrigin::Regular;
     if (pageStyleSheet && !pageStyleSheet->ownerNode() && pageStyleSheet->href().isEmpty())
-        origin = Inspector::TypeBuilder::CSS::StyleSheetOrigin::UserAgent;
+        origin = Inspector::Protocol::CSS::StyleSheetOrigin::UserAgent;
     else if (pageStyleSheet && pageStyleSheet->ownerNode() && pageStyleSheet->ownerNode()->nodeName() == "#document")
-        origin = Inspector::TypeBuilder::CSS::StyleSheetOrigin::User;
+        origin = Inspector::Protocol::CSS::StyleSheetOrigin::User;
     else {
         InspectorStyleSheet* viaInspectorStyleSheetForOwner = viaInspectorStyleSheet(ownerDocument, false);
         if (viaInspectorStyleSheetForOwner && pageStyleSheet == viaInspectorStyleSheetForOwner->pageStyleSheet())
-            origin = Inspector::TypeBuilder::CSS::StyleSheetOrigin::Inspector;
+            origin = Inspector::Protocol::CSS::StyleSheetOrigin::Inspector;
     }
     return origin;
 }
 
-PassRefPtr<Inspector::TypeBuilder::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(StyleRule* styleRule, StyleResolver& styleResolver)
+PassRefPtr<Inspector::Protocol::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(StyleRule* styleRule, StyleResolver& styleResolver)
 {
     if (!styleRule)
         return nullptr;
@@ -1029,7 +1029,7 @@ PassRefPtr<Inspector::TypeBuilder::CSS::CSSRule> InspectorCSSAgent::buildObjectF
     return inspectorStyleSheet ? inspectorStyleSheet->buildObjectForRule(cssomWrapper) : nullptr;
 }
 
-PassRefPtr<Inspector::TypeBuilder::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(CSSStyleRule* rule)
+PassRefPtr<Inspector::Protocol::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(CSSStyleRule* rule)
 {
     if (!rule)
         return nullptr;
@@ -1039,15 +1039,15 @@ PassRefPtr<Inspector::TypeBuilder::CSS::CSSRule> InspectorCSSAgent::buildObjectF
     return inspectorStyleSheet ? inspectorStyleSheet->buildObjectForRule(rule) : nullptr;
 }
 
-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>> InspectorCSSAgent::buildArrayForRuleList(CSSRuleList* ruleList)
+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> InspectorCSSAgent::buildArrayForRuleList(CSSRuleList* ruleList)
 {
-    RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>> result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>::create();
+    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> result = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>::create();
     if (!ruleList)
         return result.release();
 
     for (unsigned i = 0, size = ruleList->length(); i < size; ++i) {
         CSSStyleRule* rule = asCSSStyleRule(ruleList->item(i));
-        RefPtr<Inspector::TypeBuilder::CSS::CSSRule> ruleObject = buildObjectForRule(rule);
+        RefPtr<Inspector::Protocol::CSS::CSSRule> ruleObject = buildObjectForRule(rule);
         if (!ruleObject)
             continue;
         result->addItem(ruleObject);
@@ -1055,18 +1055,18 @@ PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSRule>>
     return result.release();
 }
 
-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>> InspectorCSSAgent::buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>& matchedRules, StyleResolver& styleResolver, Element* element)
+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> InspectorCSSAgent::buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>& matchedRules, StyleResolver& styleResolver, Element* element)
 {
-    RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>> result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>::create();
+    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> result = Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>::create();
 
     for (unsigned i = 0; i < matchedRules.size(); ++i) {
         if (!matchedRules[i]->isStyleRule())
             continue;
         StyleRule* matchedStyleRule = static_cast<StyleRule*>(matchedRules[i].get());
-        RefPtr<Inspector::TypeBuilder::CSS::CSSRule> ruleObject = buildObjectForRule(matchedStyleRule, styleResolver);
+        RefPtr<Inspector::Protocol::CSS::CSSRule> ruleObject = buildObjectForRule(matchedStyleRule, styleResolver);
         if (!ruleObject)
             continue;
-        RefPtr<Inspector::TypeBuilder::Array<int>> matchingSelectors = Inspector::TypeBuilder::Array<int>::create();
+        RefPtr<Inspector::Protocol::Array<int>> matchingSelectors = Inspector::Protocol::Array<int>::create();
         const CSSSelectorList& selectorList = matchedStyleRule->selectorList();
         long index = 0;
         for (const CSSSelector* selector = selectorList.first(); selector; selector = CSSSelectorList::next(selector)) {
@@ -1075,7 +1075,7 @@ PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>
                 matchingSelectors->addItem(index);
             ++index;
         }
-        RefPtr<Inspector::TypeBuilder::CSS::RuleMatch> match = Inspector::TypeBuilder::CSS::RuleMatch::create()
+        RefPtr<Inspector::Protocol::CSS::RuleMatch> match = Inspector::Protocol::CSS::RuleMatch::create()
             .setRule(ruleObject)
             .setMatchingSelectors(matchingSelectors);
         result->addItem(match);
@@ -1084,7 +1084,7 @@ PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::RuleMatch>
     return result.release();
 }
 
-PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyle> InspectorCSSAgent::buildObjectForAttributesStyle(Element* element)
+PassRefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorCSSAgent::buildObjectForAttributesStyle(Element* element)
 {
     if (!element->isStyledElement())
         return nullptr;
@@ -1101,22 +1101,22 @@ PassRefPtr<Inspector::TypeBuilder::CSS::CSSStyle> InspectorCSSAgent::buildObject
     return inspectorStyle->buildObjectForStyle();
 }
 
-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::Region>> InspectorCSSAgent::buildArrayForRegions(ErrorString* errorString, PassRefPtr<NodeList> regionList, int documentNodeId)
+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> InspectorCSSAgent::buildArrayForRegions(ErrorString* errorString, PassRefPtr<NodeList> regionList, int documentNodeId)
 {
-    RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::Region>> regions = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::Region>::create();
+    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> regions = Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>::create();
 
     for (unsigned i = 0; i < regionList->length(); ++i) {
-        Inspector::TypeBuilder::CSS::Region::RegionOverset regionOverset;
+        Inspector::Protocol::CSS::Region::RegionOverset regionOverset;
 
         switch (toElement(regionList->item(i))->regionOversetState()) {
         case RegionFit:
-            regionOverset = Inspector::TypeBuilder::CSS::Region::RegionOverset::Fit;
+            regionOverset = Inspector::Protocol::CSS::Region::RegionOverset::Fit;
             break;
         case RegionEmpty:
-            regionOverset = Inspector::TypeBuilder::CSS::Region::RegionOverset::Empty;
+            regionOverset = Inspector::Protocol::CSS::Region::RegionOverset::Empty;
             break;
         case RegionOverset:
-            regionOverset = Inspector::TypeBuilder::CSS::Region::RegionOverset::Overset;
+            regionOverset = Inspector::Protocol::CSS::Region::RegionOverset::Overset;
             break;
         case RegionUndefined:
             continue;
@@ -1125,7 +1125,7 @@ PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::Region>> I
             continue;
         }
 
-        RefPtr<Inspector::TypeBuilder::CSS::Region> region = Inspector::TypeBuilder::CSS::Region::create()
+        RefPtr<Inspector::Protocol::CSS::Region> region = Inspector::Protocol::CSS::Region::create()
             .setRegionOverset(regionOverset)
             // documentNodeId was previously asserted
             .setNodeId(m_domAgent->pushNodeToFrontend(errorString, documentNodeId, regionList->item(i)));
@@ -1136,17 +1136,17 @@ PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::Region>> I
     return regions.release();
 }
 
-PassRefPtr<Inspector::TypeBuilder::CSS::NamedFlow> InspectorCSSAgent::buildObjectForNamedFlow(ErrorString* errorString, WebKitNamedFlow* webkitNamedFlow, int documentNodeId)
+PassRefPtr<Inspector::Protocol::CSS::NamedFlow> InspectorCSSAgent::buildObjectForNamedFlow(ErrorString* errorString, WebKitNamedFlow* webkitNamedFlow, int documentNodeId)
 {
     RefPtr<NodeList> contentList = webkitNamedFlow->getContent();
-    RefPtr<Inspector::TypeBuilder::Array<int>> content = Inspector::TypeBuilder::Array<int>::create();
+    RefPtr<Inspector::Protocol::Array<int>> content = Inspector::Protocol::Array<int>::create();
 
     for (unsigned i = 0; i < contentList->length(); ++i) {
         // documentNodeId was previously asserted
         content->addItem(m_domAgent->pushNodeToFrontend(errorString, documentNodeId, contentList->item(i)));
     }
 
-    RefPtr<Inspector::TypeBuilder::CSS::NamedFlow> namedFlow = Inspector::TypeBuilder::CSS::NamedFlow::create()
+    RefPtr<Inspector::Protocol::CSS::NamedFlow> namedFlow = Inspector::Protocol::CSS::NamedFlow::create()
         .setDocumentNodeId(documentNodeId)
         .setName(webkitNamedFlow->name().string())
         .setOverset(webkitNamedFlow->overset())
index 1755d72..edcaf17 100644 (file)
@@ -109,21 +109,21 @@ public:
     void didRegisterNamedFlowContentElement(Document*, WebKitNamedFlow*, Node* contentElement, Node* nextContentElement = nullptr);
     void didUnregisterNamedFlowContentElement(Document*, WebKitNamedFlow*, Node* contentElement);
 
-    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;
+    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;
     virtual void getStyleSheetText(ErrorString*, const String& styleSheetId, String* result) override;
     virtual void setStyleSheetText(ErrorString*, const String& styleSheetId, const String& text) override;
-    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;
+    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;
     virtual void forcePseudoState(ErrorString*, int nodeId, const RefPtr<Inspector::InspectorArray>& forcedPseudoClasses) override;
-    virtual void getNamedFlowCollection(ErrorString*, int documentNodeId, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::NamedFlow>>& result) override;
+    virtual void getNamedFlowCollection(ErrorString*, int documentNodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>>& result) override;
 
 private:
     class StyleSheetAction;
@@ -144,20 +144,20 @@ private:
     InspectorStyleSheetForInlineStyle* asInspectorStyleSheet(Element* element);
     Element* elementForId(ErrorString*, int nodeId);
     int documentNodeWithRequestedFlowsId(Document*);
-    void collectStyleSheets(CSSStyleSheet*, Inspector::TypeBuilder::Array<Inspector::TypeBuilder::CSS::CSSStyleSheetHeader>*);
+    void collectStyleSheets(CSSStyleSheet*, Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>*);
 
     InspectorStyleSheet* bindStyleSheet(CSSStyleSheet*);
     InspectorStyleSheet* viaInspectorStyleSheet(Document*, bool createIfAbsent);
     InspectorStyleSheet* assertStyleSheetForId(ErrorString*, const String&);
-    Inspector::TypeBuilder::CSS::StyleSheetOrigin detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument);
-
-    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);
+    Inspector::Protocol::CSS::StyleSheetOrigin detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument);
+
+    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);
 
     // InspectorDOMAgent::DOMListener implementation
     virtual void didRemoveDocument(Document*) override;
index b2cb4c6..cb7e7da 100644 (file)
@@ -232,7 +232,7 @@ InspectorDOMAgent::~InspectorDOMAgent()
     ASSERT(!m_searchingForNode);
 }
 
-void InspectorDOMAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
+void InspectorDOMAgent::didCreateFrontendAndBackend(InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
 {
     m_frontendDispatcher = std::make_unique<InspectorDOMFrontendDispatcher>(frontendChannel);
     m_backendDispatcher = InspectorDOMBackendDispatcher::create(backendDispatcher, this);
@@ -422,7 +422,7 @@ Element* InspectorDOMAgent::assertEditableElement(ErrorString* errorString, int
     return element;
 }
 
-void InspectorDOMAgent::getDocument(ErrorString* errorString, RefPtr<Inspector::TypeBuilder::DOM::Node>& root)
+void InspectorDOMAgent::getDocument(ErrorString* errorString, RefPtr<Inspector::Protocol::DOM::Node>& root)
 {
     m_documentRequested = true;
 
@@ -462,7 +462,7 @@ void InspectorDOMAgent::pushChildNodesToFrontend(int nodeId, int depth)
         return;
     }
 
-    RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodeMap);
+    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodeMap);
     m_frontendDispatcher->setChildNodes(nodeId, children.release());
 }
 
@@ -540,7 +540,7 @@ void InspectorDOMAgent::querySelector(ErrorString* errorString, int nodeId, cons
         *elementId = pushNodePathToFrontend(element.get());
 }
 
-void InspectorDOMAgent::querySelectorAll(ErrorString* errorString, int nodeId, const String& selectors, RefPtr<Inspector::TypeBuilder::Array<int>>& result)
+void InspectorDOMAgent::querySelectorAll(ErrorString* errorString, int nodeId, const String& selectors, RefPtr<Inspector::Protocol::Array<int>>& result)
 {
     Node* node = assertNode(errorString, nodeId);
     if (!node)
@@ -557,7 +557,7 @@ void InspectorDOMAgent::querySelectorAll(ErrorString* errorString, int nodeId, c
         return;
     }
 
-    result = Inspector::TypeBuilder::Array<int>::create();
+    result = Inspector::Protocol::Array<int>::create();
 
     for (unsigned i = 0; i < nodes->length(); ++i)
         result->addItem(pushNodePathToFrontend(nodes->item(i)));
@@ -588,7 +588,7 @@ int InspectorDOMAgent::pushNodePathToFrontend(Node* nodeToPush)
             auto newMap = std::make_unique<NodeToIdMap>();
             danglingMap = newMap.get();
             m_danglingNodeToIdMaps.append(newMap.release());
-            RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> children = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>::create();
+            RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
             children->addItem(buildObjectForNode(node, 0, danglingMap));
             m_frontendDispatcher->setChildNodes(0, children);
             break;
@@ -809,9 +809,9 @@ void InspectorDOMAgent::setNodeValue(ErrorString* errorString, int nodeId, const
     m_domEditor->replaceWholeText(toText(node), value, errorString);
 }
 
-void InspectorDOMAgent::getEventListenersForNode(ErrorString* errorString, int nodeId, const String* objectGroup, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::EventListener>>& listenersArray)
+void InspectorDOMAgent::getEventListenersForNode(ErrorString* errorString, int nodeId, const String* objectGroup, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>>& listenersArray)
 {
-    listenersArray = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::EventListener>::create();
+    listenersArray = Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>::create();
     Node* node = assertNode(errorString, nodeId);
     if (!node)
         return;
@@ -876,7 +876,7 @@ void InspectorDOMAgent::getEventListeners(Node* node, Vector<EventListenerInfo>&
     }
 }
 
-void InspectorDOMAgent::getAccessibilityPropertiesForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::TypeBuilder::DOM::AccessibilityProperties>& axProperties)
+void InspectorDOMAgent::getAccessibilityPropertiesForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::DOM::AccessibilityProperties>& axProperties)
 {
     Node* node = assertNode(errorString, nodeId);
     if (!node)
@@ -926,7 +926,7 @@ void InspectorDOMAgent::performSearch(ErrorString* errorString, const String& wh
     *resultCount = resultsVector.size();
 }
 
-void InspectorDOMAgent::getSearchResults(ErrorString* errorString, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::TypeBuilder::Array<int>>& nodeIds)
+void InspectorDOMAgent::getSearchResults(ErrorString* errorString, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::Protocol::Array<int>>& nodeIds)
 {
     SearchResults::iterator it = m_searchResults.find(searchId);
     if (it == m_searchResults.end()) {
@@ -940,7 +940,7 @@ void InspectorDOMAgent::getSearchResults(ErrorString* errorString, const String&
         return;
     }
 
-    nodeIds = Inspector::TypeBuilder::Array<int>::create();
+    nodeIds = Inspector::Protocol::Array<int>::create();
     for (int i = fromIndex; i < toIndex; ++i)
         nodeIds->addItem(pushNodePathToFrontend((it->value)[i].get()));
 }
@@ -1186,7 +1186,7 @@ void InspectorDOMAgent::focus(ErrorString* errorString, int nodeId)
     element->focus();
 }
 
-void InspectorDOMAgent::resolveNode(ErrorString* errorString, int nodeId, const String* const objectGroup, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result)
+void InspectorDOMAgent::resolveNode(ErrorString* errorString, int nodeId, const String* const objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result)
 {
     String objectGroupName = objectGroup ? *objectGroup : "";
     Node* node = nodeForId(nodeId);
@@ -1194,7 +1194,7 @@ void InspectorDOMAgent::resolveNode(ErrorString* errorString, int nodeId, const
         *errorString = "No node with given id found";
         return;
     }
-    RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> object = resolveNode(node, objectGroupName);
+    RefPtr<Inspector::Protocol::Runtime::RemoteObject> object = resolveNode(node, objectGroupName);
     if (!object) {
         *errorString = "Node with given id does not belong to the document";
         return;
@@ -1202,7 +1202,7 @@ void InspectorDOMAgent::resolveNode(ErrorString* errorString, int nodeId, const
     result = object;
 }
 
-void InspectorDOMAgent::getAttributes(ErrorString* errorString, int nodeId, RefPtr<Inspector::TypeBuilder::Array<String>>& result)
+void InspectorDOMAgent::getAttributes(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::Array<String>>& result)
 {
     Element* element = assertElement(errorString, nodeId);
     if (!element)
@@ -1233,7 +1233,7 @@ static String documentBaseURLString(Document* document)
     return document->completeURL("").string();
 }
 
-PassRefPtr<Inspector::TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* node, int depth, NodeToIdMap* nodesMap)
+PassRefPtr<Inspector::Protocol::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* node, int depth, NodeToIdMap* nodesMap)
 {
     int id = bind(node, nodesMap);
     String nodeName;
@@ -1262,7 +1262,7 @@ PassRefPtr<Inspector::TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForN
         break;
     }
 
-    RefPtr<Inspector::TypeBuilder::DOM::Node> value = Inspector::TypeBuilder::DOM::Node::create()
+    RefPtr<Inspector::Protocol::DOM::Node> value = Inspector::Protocol::DOM::Node::create()
         .setNodeId(id)
         .setNodeType(static_cast<int>(node->nodeType()))
         .setNodeName(nodeName)
@@ -1272,7 +1272,7 @@ PassRefPtr<Inspector::TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForN
     if (node->isContainerNode()) {
         int nodeCount = innerChildNodeCount(node);
         value->setChildNodeCount(nodeCount);
-        RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodesMap);
+        RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodesMap);
         if (children->length() > 0)
             value->setChildren(children.release());
     }
@@ -1291,7 +1291,7 @@ PassRefPtr<Inspector::TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForN
         }
 
         if (ShadowRoot* root = element->shadowRoot()) {
-            RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> shadowRoots = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>::create();
+            RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> shadowRoots = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
             shadowRoots->addItem(buildObjectForNode(root, 0, nodesMap));
             value->setShadowRoots(shadowRoots);
         }
@@ -1329,9 +1329,9 @@ PassRefPtr<Inspector::TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForN
     return value.release();
 }
 
-PassRefPtr<Inspector::TypeBuilder::Array<String>> InspectorDOMAgent::buildArrayForElementAttributes(Element* element)
+PassRefPtr<Inspector::Protocol::Array<String>> InspectorDOMAgent::buildArrayForElementAttributes(Element* element)
 {
-    RefPtr<Inspector::TypeBuilder::Array<String>> attributesValue = Inspector::TypeBuilder::Array<String>::create();
+    RefPtr<Inspector::Protocol::Array<String>> attributesValue = Inspector::Protocol::Array<String>::create();
     // Go through all attributes and serialize them.
     if (!element->hasAttributes())
         return attributesValue.release();
@@ -1343,9 +1343,9 @@ PassRefPtr<Inspector::TypeBuilder::Array<String>> InspectorDOMAgent::buildArrayF
     return attributesValue.release();
 }
 
-PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> InspectorDOMAgent::buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap)
+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> InspectorDOMAgent::buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap)
 {
-    RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> children = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>::create();
+    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
     if (depth == 0) {
         // Special-case the only text child - pretend that container's children have been requested.
         Node* firstChild = container->firstChild();
@@ -1367,7 +1367,7 @@ PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::DOM::Node>> Ins
     return children.release();
 }
 
-PassRefPtr<Inspector::TypeBuilder::DOM::EventListener> InspectorDOMAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, const AtomicString& eventType, Node* node, const String* objectGroupId)
+PassRefPtr<Inspector::Protocol::DOM::EventListener> InspectorDOMAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, const AtomicString& eventType, Node* node, const String* objectGroupId)
 {
     RefPtr<EventListener> eventListener = registeredEventListener.listener;
 
@@ -1395,7 +1395,7 @@ PassRefPtr<Inspector::TypeBuilder::DOM::EventListener> InspectorDOMAgent::buildO
         }
     }
 
-    RefPtr<Inspector::TypeBuilder::DOM::EventListener> value = Inspector::TypeBuilder::DOM::EventListener::create()
+    RefPtr<Inspector::Protocol::DOM::EventListener> value = Inspector::Protocol::DOM::EventListener::create()
         .setType(eventType)
         .setUseCapture(registeredEventListener.useCapture)
         .setIsAttribute(eventListener->isAttribute())
@@ -1407,7 +1407,7 @@ PassRefPtr<Inspector::TypeBuilder::DOM::EventListener> InspectorDOMAgent::buildO
             value->setHandler(injectedScript.wrapObject(Deprecated::ScriptValue(state->vm(), handler), *objectGroupId));
     }
     if (!scriptID.isNull()) {
-        RefPtr<Inspector::TypeBuilder::Debugger::Location> location = Inspector::TypeBuilder::Debugger::Location::create()
+        RefPtr<Inspector::Protocol::Debugger::Location> location = Inspector::Protocol::Debugger::Location::create()
             .setScriptId(scriptID)
             .setLineNumber(lineNumber);
         value->setLocation(location.release());
@@ -1417,14 +1417,14 @@ PassRefPtr<Inspector::TypeBuilder::DOM::EventListener> InspectorDOMAgent::buildO
     return value.release();
 }
     
-void InspectorDOMAgent::processAccessibilityChildren(PassRefPtr<AccessibilityObject> axObject, RefPtr<Inspector::TypeBuilder::Array<int>>& childNodeIds)
+void InspectorDOMAgent::processAccessibilityChildren(PassRefPtr<AccessibilityObject> axObject, RefPtr<Inspector::Protocol::Array<int>>& childNodeIds)
 {
     const auto& children = axObject->children();
     if (!children.size())
         return;
     
     if (!childNodeIds)
-        childNodeIds = Inspector::TypeBuilder::Array<int>::create();
+        childNodeIds = Inspector::Protocol::Array<int>::create();
     
     for (const auto& childObject : children) {
         if (Node* childNode = childObject->node())
@@ -1434,7 +1434,7 @@ void InspectorDOMAgent::processAccessibilityChildren(PassRefPtr<AccessibilityObj
     }
 }
     
-PassRefPtr<TypeBuilder::DOM::AccessibilityProperties> InspectorDOMAgent::buildObjectForAccessibilityProperties(Node* node)
+PassRefPtr<Inspector::Protocol::DOM::AccessibilityProperties> InspectorDOMAgent::buildObjectForAccessibilityProperties(Node* node)
 {
     ASSERT(node);
     if (!node)
@@ -1445,31 +1445,31 @@ PassRefPtr<TypeBuilder::DOM::AccessibilityProperties> InspectorDOMAgent::buildOb
 
     Node* activeDescendantNode = nullptr;
     bool busy = false;
-    TypeBuilder::DOM::AccessibilityProperties::Checked checked = TypeBuilder::DOM::AccessibilityProperties::Checked::False;
-    RefPtr<Inspector::TypeBuilder::Array<int>> childNodeIds;
-    RefPtr<Inspector::TypeBuilder::Array<int>> controlledNodeIds;
+    Inspector::Protocol::DOM::AccessibilityProperties::Checked checked = Inspector::Protocol::DOM::AccessibilityProperties::Checked::False;
+    RefPtr<Inspector::Protocol::Array<int>> childNodeIds;
+    RefPtr<Inspector::Protocol::Array<int>> controlledNodeIds;
     bool exists = false;
     bool expanded = false;
     bool disabled = false;
-    RefPtr<Inspector::TypeBuilder::Array<int>> flowedNodeIds;
+    RefPtr<Inspector::Protocol::Array<int>> flowedNodeIds;
     bool focused = false;
     bool ignored = true;
     bool ignoredByDefault = false;
-    TypeBuilder::DOM::AccessibilityProperties::Invalid invalid = TypeBuilder::DOM::AccessibilityProperties::Invalid::False;
+    Inspector::Protocol::DOM::AccessibilityProperties::Invalid invalid = Inspector::Protocol::DOM::AccessibilityProperties::Invalid::False;
     bool hidden = false;
     String label;
     bool liveRegionAtomic = false;
-    RefPtr<Inspector::TypeBuilder::Array<String>> liveRegionRelevant;
-    TypeBuilder::DOM::AccessibilityProperties::LiveRegionStatus liveRegionStatus = TypeBuilder::DOM::AccessibilityProperties::LiveRegionStatus::Off;
+    RefPtr<Inspector::Protocol::Array<String>> liveRegionRelevant;
+    Inspector::Protocol::DOM::AccessibilityProperties::LiveRegionStatus liveRegionStatus = Inspector::Protocol::DOM::AccessibilityProperties::LiveRegionStatus::Off;
     Node* mouseEventNode = nullptr;
-    RefPtr<Inspector::TypeBuilder::Array<int>> ownedNodeIds;
+    RefPtr<Inspector::Protocol::Array<int>> ownedNodeIds;
     Node* parentNode = nullptr;
     bool pressed = false;
     bool readonly = false;
     bool required = false;
     String role;
     bool selected = false;
-    RefPtr<Inspector::TypeBuilder::Array<int>> selectedChildNodeIds;
+    RefPtr<Inspector::Protocol::Array<int>> selectedChildNodeIds;
     bool supportsChecked = false;
     bool supportsExpanded = false;
     bool supportsLiveRegion = false;
@@ -1494,11 +1494,11 @@ PassRefPtr<TypeBuilder::DOM::AccessibilityProperties> InspectorDOMAgent::buildOb
   &nb