Changeset 172930 in webkit for trunk/Source/JavaScriptCore


Ignore:
Timestamp:
Aug 25, 2014, 11:39:25 AM (11 years ago)
Author:
Brian Burg
Message:

Web Inspector: rename Inspector::TypeBuilder to Inspector::Protocol
​https://bugs.webkit.org/show_bug.cgi?id=136031

Reviewed by Timothy Hatcher.

Rename TypeBuilder namespace to Protocol. Disambiguate where
necessary. Also rename InspectorTypeBuilder to ProtocolTypes.

  • CMakeLists.txt:
  • DerivedSources.make:

Source/JavaScriptCore:

(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:
Location:
trunk/Source/JavaScriptCore
Files:
49 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r172820 r172930  
    936936    ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_header.py
    937937    ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_implementation.py
    938     ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_type_builder_header.py
    939     ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_type_builder_implementation.py
     938    ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_header.py
     939    ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_implementation.py
    940940    ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator.py
    941941    ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator_templates.py
    … …  
    966966           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
    967967           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
    968            ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.cpp
    969            ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.h
     968           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.cpp
     969           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.h
    970970           ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorJSBackendCommands.js
    971971    MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
    972972    DEPENDS ${JavaScriptCore_INSPECTOR_PROTOCOL_SCRIPTS}
    973     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
     973    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
    974974    VERBATIM)
    975975file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
    … …  
    987987    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.cpp
    988988    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
    989     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.cpp
     989    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.cpp
    990990    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp
    991991)
    … …  
    994994    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.h
    995995    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
    996     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.h
     996    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.h
    997997    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
    998998)

  • trunk/Source/JavaScriptCore/ChangeLog

    r172897 r172930  
     12014-08-24  Brian J. Burg  <[email protected]>
     2
     3        Web Inspector: rename Inspector::TypeBuilder to Inspector::Protocol
     4        https://bugs.webkit.org/show_bug.cgi?id=136031
     5
     6        Reviewed by Timothy Hatcher.
     7
     8        Rename TypeBuilder namespace to Protocol. Disambiguate where
     9        necessary. Also rename InspectorTypeBuilder to ProtocolTypes.
     10
     11        * CMakeLists.txt:
     12        * DerivedSources.make:
     13        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
     14        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
     15        * JavaScriptCore.vcxproj/copy-files.cmd:
     16        * JavaScriptCore.xcodeproj/project.pbxproj:
     17        * inspector/ConsoleMessage.cpp:
     18        (Inspector::messageSourceValue):
     19        (Inspector::messageTypeValue):
     20        (Inspector::messageLevelValue):
     21        (Inspector::ConsoleMessage::addToFrontend):
     22        * inspector/ContentSearchUtilities.cpp:
     23        (Inspector::ContentSearchUtilities::buildObjectForSearchMatch):
     24        (Inspector::ContentSearchUtilities::searchInTextByLines):
     25        * inspector/ContentSearchUtilities.h:
     26        * inspector/InjectedScript.cpp:
     27        (Inspector::InjectedScript::evaluate):
     28        (Inspector::InjectedScript::callFunctionOn):
     29        (Inspector::InjectedScript::evaluateOnCallFrame):
     30        (Inspector::InjectedScript::getFunctionDetails):
     31        (Inspector::InjectedScript::getProperties):
     32        (Inspector::InjectedScript::getInternalProperties):
     33        (Inspector::InjectedScript::wrapCallFrames):
     34        (Inspector::InjectedScript::wrapObject):
     35        (Inspector::InjectedScript::wrapTable):
     36        * inspector/InjectedScript.h:
     37        * inspector/InjectedScriptBase.cpp:
     38        (Inspector::InjectedScriptBase::makeEvalCall):
     39        * inspector/InjectedScriptBase.h:
     40        * inspector/InspectorTypeBuilder.h: Removed.
     41        * inspector/ScriptCallFrame.cpp:
     42        (Inspector::ScriptCallFrame::buildInspectorObject):
     43        * inspector/ScriptCallFrame.h:
     44        * inspector/ScriptCallStack.cpp:
     45        (Inspector::ScriptCallStack::buildInspectorArray):
     46        * inspector/ScriptCallStack.h:
     47        * inspector/agents/InspectorAgent.cpp:
     48        (Inspector::InspectorAgent::inspect):
     49        * inspector/agents/InspectorAgent.h:
     50        * inspector/agents/InspectorDebuggerAgent.cpp:
     51        (Inspector::breakpointActionTypeForString):
     52        (Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
     53        (Inspector::InspectorDebuggerAgent::setBreakpoint):
     54        (Inspector::InspectorDebuggerAgent::resolveBreakpoint):
     55        (Inspector::InspectorDebuggerAgent::searchInContent):
     56        (Inspector::InspectorDebuggerAgent::getFunctionDetails):
     57        (Inspector::InspectorDebuggerAgent::evaluateOnCallFrame):
     58        (Inspector::InspectorDebuggerAgent::currentCallFrames):
     59        (Inspector::InspectorDebuggerAgent::didParseSource):
     60        (Inspector::InspectorDebuggerAgent::breakpointActionProbe):
     61        * inspector/agents/InspectorDebuggerAgent.h:
     62        * inspector/agents/InspectorProfilerAgent.cpp:
     63        (Inspector::InspectorProfilerAgent::createProfileHeader):
     64        (Inspector::InspectorProfilerAgent::getProfileHeaders):
     65        (Inspector::buildInspectorObject):
     66        (Inspector::InspectorProfilerAgent::buildProfileInspectorObject):
     67        (Inspector::InspectorProfilerAgent::getCPUProfile):
     68        * inspector/agents/InspectorProfilerAgent.h:
     69        * inspector/agents/InspectorRuntimeAgent.cpp:
     70        (Inspector::buildErrorRangeObject):
     71        (Inspector::InspectorRuntimeAgent::parse):
     72        (Inspector::InspectorRuntimeAgent::evaluate):
     73        (Inspector::InspectorRuntimeAgent::callFunctionOn):
     74        (Inspector::InspectorRuntimeAgent::getProperties):
     75        (Inspector::InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets):
     76        * inspector/agents/InspectorRuntimeAgent.h:
     77        * inspector/scripts/codegen/__init__.py:
     78        * inspector/scripts/codegen/generate_backend_dispatcher_header.py:
     79        (BackendDispatcherHeaderGenerator.generate_output):
     80        * inspector/scripts/codegen/generate_backend_dispatcher_implementation.py:
     81        (BackendDispatcherImplementationGenerator._generate_async_dispatcher_class_for_domain):
     82        (BackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command):
     83        * inspector/scripts/codegen/generate_frontend_dispatcher_header.py:
     84        (FrontendDispatcherHeaderGenerator.generate_output):
     85        * inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py:
     86        (FrontendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_event):
     87        * inspector/scripts/codegen/generate_type_builder_header.py: Removed.
     88        * inspector/scripts/codegen/generate_type_builder_implementation.py: Removed.
     89        * inspector/scripts/codegen/generator.py:
     90        (Generator.protocol_type_string_for_type):
     91        (Generator.protocol_type_string_for_type_member):
     92        (Generator.type_string_for_type_with_name):
     93        (Generator.type_string_for_formal_out_parameter):
     94        (Generator.type_string_for_formal_async_parameter):
     95        (Generator.type_string_for_stack_in_parameter):
     96        (Generator.type_string_for_stack_out_parameter):
     97        (Generator.assertion_method_for_type_member.assertion_method_for_type):
     98        (Generator.assertion_method_for_type_member):
     99        (Generator.type_builder_string_for_type): Deleted.
     100        (Generator.type_builder_string_for_type_member): Deleted.
     101        * inspector/scripts/codegen/generator_templates.py:
     102        (Inspector):
     103        * inspector/scripts/generate-inspector-protocol-bindings.py:
     104        (generate_from_specification):
     105        * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
     106        * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
     107        * inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
     108        * inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
     109        * inspector/scripts/tests/expected/same-type-id-different-domain.json-result:
     110        * inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
     111        * inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:
     112        * inspector/scripts/tests/expected/type-declaration-array-type.json-result:
     113        * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
     114        * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
     115        * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
     116        * runtime/HighFidelityTypeProfiler.cpp:
     117        (JSC::HighFidelityTypeProfiler::getTypesForVariableAtOffsetForInspector):
     118        * runtime/HighFidelityTypeProfiler.h:
     119        * runtime/TypeSet.cpp:
     120        (JSC::TypeSet::allPrimitiveTypeNames):
     121        (JSC::TypeSet::allStructureRepresentations):
     122        (JSC::StructureShape::inspectorRepresentation):
     123        * runtime/TypeSet.h:
     124
    11252014-08-24  Brian J. Burg  <[email protected]>
    2126

  • trunk/Source/JavaScriptCore/DerivedSources.make

    r172655 r172930  
    129129        $(JavaScriptCore)/inspector/scripts/codegen/generate_frontend_dispatcher_header.py \
    130130        $(JavaScriptCore)/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py \
    131         $(JavaScriptCore)/inspector/scripts/codegen/generate_type_builder_header.py \
    132         $(JavaScriptCore)/inspector/scripts/codegen/generate_type_builder_implementation.py \
     131        $(JavaScriptCore)/inspector/scripts/codegen/generate_protocol_types_header.py \
     132        $(JavaScriptCore)/inspector/scripts/codegen/generate_protocol_types_implementation.py \
    133133        $(JavaScriptCore)/inspector/scripts/codegen/generator_templates.py \
    134134        $(JavaScriptCore)/inspector/scripts/codegen/generator.py \

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj

    r172820 r172930  
    818818    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.cpp" />
    819819    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.cpp" />
    820     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.cpp" />
     820    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.cpp" />
    821821    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCBuiltins.cpp" />
    822822  </ItemGroup>
    … …  
    832832    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.h" />
    833833    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.h" />
    834     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.h" />
     834    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.h" />
    835835    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataViewPrototype.lut.h" />
    836836    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h" />
    … …  
    12481248    <ClInclude Include="..\inspector\InspectorEnvironment.h" />
    12491249    <ClInclude Include="..\inspector\InspectorFrontendChannel.h" />
    1250     <ClInclude Include="..\inspector\InspectorTypeBuilder.h" />
     1250    <ClInclude Include="..\inspector\InspectorProtocolTypes.h" />
    12511251    <ClInclude Include="..\inspector\InspectorValues.h" />
    12521252    <ClInclude Include="..\inspector\JSInjectedScriptHost.h" />
    … …  
    16211621    <None Include="..\inspector\scripts\codegen\generate_frontend_dispatcher_header.py" />
    16221622    <None Include="..\inspector\scripts\codegen\generate_frontend_dispatcher_implementation.py" />
    1623     <None Include="..\inspector\scripts\codegen\generate_type_builder_header.py" />
    1624     <None Include="..\inspector\scripts\codegen\generate_type_builder_implementation.py" />
     1623    <None Include="..\inspector\scripts\codegen\generate_protocol_types_header.py" />
     1624    <None Include="..\inspector\scripts\codegen\generate_protocol_types_implementation.py" />
    16251625    <None Include="..\inspector\scripts\codegen\generator.py" />
    16261626    <None Include="..\inspector\scripts\codegen\generator_templates.py" />

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters

    r172820 r172930  
    13901390      <Filter>Derived Sources</Filter>
    13911391    </ClCompile>
    1392     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.cpp">
     1392    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.cpp">
    13931393      <Filter>Derived Sources</Filter>
    13941394    </ClCompile>
    … …  
    21812181      <Filter>inspector</Filter>
    21822182    </ClInclude>
    2183     <ClInclude Include="..\inspector\InspectorTypeBuilder.h">
     2183    <ClInclude Include="..\inspector\InspectorProtocolTypes.h">
    21842184      <Filter>inspector</Filter>
    21852185    </ClInclude>
    … …  
    29352935      <Filter>Derived Sources</Filter>
    29362936    </ClInclude>
    2937     <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.h">
     2937    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.h">
    29382938      <Filter>Derived Sources</Filter>
    29392939    </ClInclude>
    … …  
    40934093      <Filter>inspector\scripts\codegen</Filter>
    40944094    </None>
    4095     <None Include="..\inspector\scripts\codegen\generate_type_builder_header.py">
     4095    <None Include="..\inspector\scripts\codegen\generate_protocol_types_header.py">
    40964096      <Filter>inspector\scripts\codegen</Filter>
    40974097    </None>
    4098     <None Include="..\inspector\scripts\codegen\generate_type_builder_implementation.py">
     4098    <None Include="..\inspector\scripts\codegen\generate_protocol_types_implementation.py">
    40994099      <Filter>inspector\scripts\codegen</Filter>
    41004100    </None>

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd

    r172655 r172930  
    7272echo Copying Inspector generated files as if they were private headers...
    7373xcopy /y "%DerivedSourcesDirectory%\InspectorJS.json" "%PrivateHeadersDirectory%" >NUL
    74 xcopy /y "%DerivedSourcesDirectory%\InspectorJSTypeBuilders.h" "%PrivateHeadersDirectory%" >NUL
     74xcopy /y "%DerivedSourcesDirectory%\InspectorJSProtocolTypes.h" "%PrivateHeadersDirectory%" >NUL
    7575xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
    7676xcopy /y "%DerivedSourcesDirectory%\InspectorJSFrontendDispatchers.h" "%PrivateHeadersDirectory%" >NUL

  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r172820 r172930  
    13601360                A532438918568335002ED692 /* InspectorJSFrontendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */; };
    13611361                A532438A18568335002ED692 /* InspectorJSFrontendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1362                 A532438B18568335002ED692 /* InspectorJSTypeBuilders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438518568317002ED692 /* InspectorJSTypeBuilders.cpp */; };
    1363                 A532438C18568335002ED692 /* InspectorJSTypeBuilders.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438618568317002ED692 /* InspectorJSTypeBuilders.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1362                A532438B18568335002ED692 /* InspectorJSProtocolTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438518568317002ED692 /* InspectorJSProtocolTypes.cpp */; };
     1363                A532438C18568335002ED692 /* InspectorJSProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438618568317002ED692 /* InspectorJSProtocolTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
    13641364                A532439418569709002ED692 /* generate-combined-inspector-json.py in Headers */ = {isa = PBXBuildFile; fileRef = A5324391185696E6002ED692 /* generate-combined-inspector-json.py */; settings = {ATTRIBUTES = (Private, ); }; };
    13651365                A53243981856A489002ED692 /* InspectorJS.json in Headers */ = {isa = PBXBuildFile; fileRef = A53243951856A475002ED692 /* InspectorJS.json */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    13801380                A55D93A5185012A800400DED /* ScriptFunctionCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A55D93A3185012A800400DED /* ScriptFunctionCall.cpp */; };
    13811381                A55D93A6185012A800400DED /* ScriptFunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = A55D93A4185012A800400DED /* ScriptFunctionCall.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1382                 A55D93AC18514F7900400DED /* InspectorTypeBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = A55D93AB18514F7900400DED /* InspectorTypeBuilder.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1382                A55D93AC18514F7900400DED /* InspectorProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A55D93AB18514F7900400DED /* InspectorProtocolTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
    13831383                A57D23E51890CEBF0031C7FA /* InspectorDebuggerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A57D23E31890CEBF0031C7FA /* InspectorDebuggerAgent.cpp */; };
    13841384                A57D23E61890CEBF0031C7FA /* InspectorDebuggerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = A57D23E41890CEBF0031C7FA /* InspectorDebuggerAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    17931793                C4703CD1192844CC0013FBEA /* generate_frontend_dispatcher_header.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC6192844CC0013FBEA /* generate_frontend_dispatcher_header.py */; settings = {ATTRIBUTES = (Private, ); }; };
    17941794                C4703CD2192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC7192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
    1795                 C4703CD3192844CC0013FBEA /* generate_type_builder_header.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC8192844CC0013FBEA /* generate_type_builder_header.py */; settings = {ATTRIBUTES = (Private, ); }; };
    1796                 C4703CD4192844CC0013FBEA /* generate_type_builder_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CC9192844CC0013FBEA /* generate_type_builder_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
    17971795                C4703CD5192844CC0013FBEA /* generator_templates.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CCA192844CC0013FBEA /* generator_templates.py */; settings = {ATTRIBUTES = (Private, ); }; };
    17981796                C4703CD6192844CC0013FBEA /* generator.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CCB192844CC0013FBEA /* generator.py */; settings = {ATTRIBUTES = (Private, ); }; };
    17991797                C4703CD7192844CC0013FBEA /* models.py in Headers */ = {isa = PBXBuildFile; fileRef = C4703CCC192844CC0013FBEA /* models.py */; settings = {ATTRIBUTES = (Private, ); }; };
     1798                C49FE4A919AAC83E00F40CE9 /* generate_protocol_types_header.py in Resources */ = {isa = PBXBuildFile; fileRef = C49FE4A719AAC83E00F40CE9 /* generate_protocol_types_header.py */; };
     1799                C49FE4AA19AAC83E00F40CE9 /* generate_protocol_types_implementation.py in Resources */ = {isa = PBXBuildFile; fileRef = C49FE4A819AAC83E00F40CE9 /* generate_protocol_types_implementation.py */; };
     1800                C49FE4AB19AAC86100F40CE9 /* generate_protocol_types_header.py in Headers */ = {isa = PBXBuildFile; fileRef = C49FE4A719AAC83E00F40CE9 /* generate_protocol_types_header.py */; settings = {ATTRIBUTES = (Private, ); }; };
     1801                C49FE4AC19AAC86100F40CE9 /* generate_protocol_types_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = C49FE4A819AAC83E00F40CE9 /* generate_protocol_types_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
    18001802                E124A8F70E555775003091F1 /* OpaqueJSString.h in Headers */ = {isa = PBXBuildFile; fileRef = E124A8F50E555775003091F1 /* OpaqueJSString.h */; settings = {ATTRIBUTES = (Private, ); }; };
    18011803                E124A8F80E555775003091F1 /* OpaqueJSString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E124A8F60E555775003091F1 /* OpaqueJSString.cpp */; };
    … …  
    30173019                A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSFrontendDispatchers.cpp; sourceTree = "<group>"; };
    30183020                A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSFrontendDispatchers.h; sourceTree = "<group>"; };
    3019                 A532438518568317002ED692 /* InspectorJSTypeBuilders.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSTypeBuilders.cpp; sourceTree = "<group>"; };
    3020                 A532438618568317002ED692 /* InspectorJSTypeBuilders.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSTypeBuilders.h; sourceTree = "<group>"; };
     3021                A532438518568317002ED692 /* InspectorJSProtocolTypes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSProtocolTypes.cpp; sourceTree = "<group>"; };
     3022                A532438618568317002ED692 /* InspectorJSProtocolTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSProtocolTypes.h; sourceTree = "<group>"; };
    30213023                A532438D185696CA002ED692 /* protocol */ = {isa = PBXFileReference; lastKnownFileType = folder; path = protocol; sourceTree = "<group>"; };
    30223024                A5324391185696E6002ED692 /* generate-combined-inspector-json.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "generate-combined-inspector-json.py"; sourceTree = "<group>"; };
    … …  
    30373039                A55D93A3185012A800400DED /* ScriptFunctionCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptFunctionCall.cpp; sourceTree = "<group>"; };
    30383040                A55D93A4185012A800400DED /* ScriptFunctionCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptFunctionCall.h; sourceTree = "<group>"; };
    3039                 A55D93AB18514F7900400DED /* InspectorTypeBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTypeBuilder.h; sourceTree = "<group>"; };
     3041                A55D93AB18514F7900400DED /* InspectorProtocolTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorProtocolTypes.h; sourceTree = "<group>"; };
    30403042                A57D23E31890CEBF0031C7FA /* InspectorDebuggerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDebuggerAgent.cpp; sourceTree = "<group>"; };
    30413043                A57D23E41890CEBF0031C7FA /* InspectorDebuggerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDebuggerAgent.h; sourceTree = "<group>"; };
    … …  
    34423444                C4703CC6192844CC0013FBEA /* generate_frontend_dispatcher_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_frontend_dispatcher_header.py; sourceTree = "<group>"; };
    34433445                C4703CC7192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_frontend_dispatcher_implementation.py; sourceTree = "<group>"; };
    3444                 C4703CC8192844CC0013FBEA /* generate_type_builder_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_type_builder_header.py; sourceTree = "<group>"; };
    3445                 C4703CC9192844CC0013FBEA /* generate_type_builder_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_type_builder_implementation.py; sourceTree = "<group>"; };
    34463446                C4703CCA192844CC0013FBEA /* generator_templates.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generator_templates.py; sourceTree = "<group>"; };
    34473447                C4703CCB192844CC0013FBEA /* generator.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generator.py; sourceTree = "<group>"; };
    34483448                C4703CCC192844CC0013FBEA /* models.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = models.py; sourceTree = "<group>"; };
     3449                C49FE4A719AAC83E00F40CE9 /* generate_protocol_types_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_protocol_types_header.py; sourceTree = "<group>"; };
     3450                C49FE4A819AAC83E00F40CE9 /* generate_protocol_types_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = generate_protocol_types_implementation.py; sourceTree = "<group>"; };
    34493451                D21202280AD4310C00ED79B6 /* DateConversion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DateConversion.cpp; sourceTree = "<group>"; };
    34503452                D21202290AD4310C00ED79B6 /* DateConversion.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DateConversion.h; sourceTree = "<group>"; };
    … …  
    42314233                                A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */,
    42324234                                A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */,
    4233                                 A532438518568317002ED692 /* InspectorJSTypeBuilders.cpp */,
    4234                                 A532438618568317002ED692 /* InspectorJSTypeBuilders.h */,
     4235                                A532438518568317002ED692 /* InspectorJSProtocolTypes.cpp */,
     4236                                A532438618568317002ED692 /* InspectorJSProtocolTypes.h */,
    42354237                                A7D801A61880D6A80026C39B /* JSCBuiltins.cpp */,
    42364238                                A7D801A71880D6A80026C39B /* JSCBuiltins.h */,
    … …  
    53535355                                A5D0A1BA1862301B00C7B496 /* InspectorEnvironment.h */,
    53545356                                A5945594182479EB00CC3843 /* InspectorFrontendChannel.h */,
    5355                                 A55D93AB18514F7900400DED /* InspectorTypeBuilder.h */,
     5357                                A55D93AB18514F7900400DED /* InspectorProtocolTypes.h */,
    53565358                                A593CF801840377100BFCE27 /* InspectorValues.cpp */,
    53575359                                A593CF811840377100BFCE27 /* InspectorValues.h */,
    … …  
    54265428                                C4703CC6192844CC0013FBEA /* generate_frontend_dispatcher_header.py */,
    54275429                                C4703CC7192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py */,
    5428                                 C4703CC8192844CC0013FBEA /* generate_type_builder_header.py */,
    5429                                 C4703CC9192844CC0013FBEA /* generate_type_builder_implementation.py */,
     5430                                C49FE4A719AAC83E00F40CE9 /* generate_protocol_types_header.py */,
     5431                                C49FE4A819AAC83E00F40CE9 /* generate_protocol_types_implementation.py */,
    54305432                                C4703CCA192844CC0013FBEA /* generator_templates.py */,
    54315433                                C4703CCB192844CC0013FBEA /* generator.py */,
    … …  
    57165718                                A1A009C11831A26E00CF8711 /* ARM64Assembler.h in Headers */,
    57175719                                86D3B2C410156BDE002865E7 /* ARMAssembler.h in Headers */,
     5720                                C49FE4AB19AAC86100F40CE9 /* generate_protocol_types_header.py in Headers */,
     5721                                C49FE4AC19AAC86100F40CE9 /* generate_protocol_types_implementation.py in Headers */,
    57185722                                658D3A5619638268003C45D6 /* VMEntryRecord.h in Headers */,
    57195723                                2AD2EDFB19799E38004D6478 /* EnumerationMode.h in Headers */,
    … …  
    57265730                                A532439418569709002ED692 /* generate-combined-inspector-json.py in Headers */,
    57275731                                A5840E27187C981E00843B10 /* cssmin.py in Headers */,
    5728                                 C4703CD3192844CC0013FBEA /* generate_type_builder_header.py in Headers */,
    57295732                                C4703CD2192844CC0013FBEA /* generate_frontend_dispatcher_implementation.py in Headers */,
    57305733                                C4703CD1192844CC0013FBEA /* generate_frontend_dispatcher_header.py in Headers */,
    … …  
    57355738                                C4703CD0192844CC0013FBEA /* generate_backend_dispatcher_implementation.py in Headers */,
    57365739                                C4703CCE192844CC0013FBEA /* generate_backend_commands.py in Headers */,
    5737                                 C4703CD4192844CC0013FBEA /* generate_type_builder_implementation.py in Headers */,
    57385740                                C4703CD7192844CC0013FBEA /* models.py in Headers */,
    57395741                                2AACE63D18CA5A0300ED0191 /* GCActivityCallback.h in Headers */,
    … …  
    61186120                                A532438A18568335002ED692 /* InspectorJSFrontendDispatchers.h in Headers */,
    61196121                                8606DDEA18DA44AB00A383D0 /* IdentifierInlines.h in Headers */,
    6120                                 A532438C18568335002ED692 /* InspectorJSTypeBuilders.h in Headers */,
     6122                                A532438C18568335002ED692 /* InspectorJSProtocolTypes.h in Headers */,
    61216123                                A50E4B6218809DD50068A46D /* InspectorRuntimeAgent.h in Headers */,
    61226124                                0FBFDD05196C92BF007A5BFA /* DFGPhantomRemovalPhase.h in Headers */,
    6123                                 A55D93AC18514F7900400DED /* InspectorTypeBuilder.h in Headers */,
     6125                                A55D93AC18514F7900400DED /* InspectorProtocolTypes.h in Headers */,
    61246126                                A593CF831840377100BFCE27 /* InspectorValues.h in Headers */,
    61256127                                969A07990ED1D3AE00F1F681 /* Instruction.h in Headers */,
    … …  
    67686770                        buildActionMask = 2147483647;
    67696771                        files = (
     6772                                C49FE4A919AAC83E00F40CE9 /* generate_protocol_types_header.py in Resources */,
    67706773                                A53F1AC018C90F8F0072EB6D /* framework.sb in Resources */,
     6774                                C49FE4AA19AAC83E00F40CE9 /* generate_protocol_types_implementation.py in Resources */,
    67716775                        );
    67726776                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    73877391                                A532438718568335002ED692 /* InspectorJSBackendDispatchers.cpp in Sources */,
    73887392                                A532438918568335002ED692 /* InspectorJSFrontendDispatchers.cpp in Sources */,
    7389                                 A532438B18568335002ED692 /* InspectorJSTypeBuilders.cpp in Sources */,
     7393                                A532438B18568335002ED692 /* InspectorJSProtocolTypes.cpp in Sources */,
    73907394                                A50E4B6118809DD50068A46D /* InspectorRuntimeAgent.cpp in Sources */,
    73917395                                A593CF821840377100BFCE27 /* InspectorValues.cpp in Sources */,

  • trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp

    r172655 r172930  
    132132}
    133133
    134 static Inspector::TypeBuilder::Console::ConsoleMessage::Source messageSourceValue(MessageSource source)
     134static Inspector::Protocol::Console::ConsoleMessage::Source messageSourceValue(MessageSource source)
    135135{
    136136    switch (source) {
    137     case MessageSource::XML: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::XML;
    138     case MessageSource::JS: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Javascript;
    139     case MessageSource::Network: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Network;
    140     case MessageSource::ConsoleAPI: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::ConsoleAPI;
    141     case MessageSource::Storage: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Storage;
    142     case MessageSource::AppCache: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Appcache;
    143     case MessageSource::Rendering: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Rendering;
    144     case MessageSource::CSS: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::CSS;
    145     case MessageSource::Security: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Security;
    146     case MessageSource::Other: return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Other;
    147     }
    148     return Inspector::TypeBuilder::Console::ConsoleMessage::Source::Other;
    149 }
    150 
    151 static Inspector::TypeBuilder::Console::ConsoleMessage::Type messageTypeValue(MessageType type)
     137    case MessageSource::XML: return Inspector::Protocol::Console::ConsoleMessage::Source::XML;
     138    case MessageSource::JS: return Inspector::Protocol::Console::ConsoleMessage::Source::Javascript;
     139    case MessageSource::Network: return Inspector::Protocol::Console::ConsoleMessage::Source::Network;
     140    case MessageSource::ConsoleAPI: return Inspector::Protocol::Console::ConsoleMessage::Source::ConsoleAPI;
     141    case MessageSource::Storage: return Inspector::Protocol::Console::ConsoleMessage::Source::Storage;
     142    case MessageSource::AppCache: return Inspector::Protocol::Console::ConsoleMessage::Source::Appcache;
     143    case MessageSource::Rendering: return Inspector::Protocol::Console::ConsoleMessage::Source::Rendering;
     144    case MessageSource::CSS: return Inspector::Protocol::Console::ConsoleMessage::Source::CSS;
     145    case MessageSource::Security: return Inspector::Protocol::Console::ConsoleMessage::Source::Security;
     146    case MessageSource::Other: return Inspector::Protocol::Console::ConsoleMessage::Source::Other;
     147    }
     148    return Inspector::Protocol::Console::ConsoleMessage::Source::Other;
     149}
     150
     151static Inspector::Protocol::Console::ConsoleMessage::Type messageTypeValue(MessageType type)
    152152{
    153153    switch (type) {
    154     case MessageType::Log: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Log;
    155     case MessageType::Clear: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Clear;
    156     case MessageType::Dir: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Dir;
    157     case MessageType::DirXML: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::DirXML;
    158     case MessageType::Table: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Table;
    159     case MessageType::Trace: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Trace;
    160     case MessageType::StartGroup: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::StartGroup;
    161     case MessageType::StartGroupCollapsed: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::StartGroupCollapsed;
    162     case MessageType::EndGroup: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::EndGroup;
    163     case MessageType::Assert: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Assert;
    164     case MessageType::Timing: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Timing;
    165     case MessageType::Profile: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Profile;
    166     case MessageType::ProfileEnd: return Inspector::TypeBuilder::Console::ConsoleMessage::Type::ProfileEnd;
    167     }
    168     return Inspector::TypeBuilder::Console::ConsoleMessage::Type::Log;
    169 }
    170 
    171 static Inspector::TypeBuilder::Console::ConsoleMessage::Level messageLevelValue(MessageLevel level)
     154    case MessageType::Log: return Inspector::Protocol::Console::ConsoleMessage::Type::Log;
     155    case MessageType::Clear: return Inspector::Protocol::Console::ConsoleMessage::Type::Clear;
     156    case MessageType::Dir: return Inspector::Protocol::Console::ConsoleMessage::Type::Dir;
     157    case MessageType::DirXML: return Inspector::Protocol::Console::ConsoleMessage::Type::DirXML;
     158    case MessageType::Table: return Inspector::Protocol::Console::ConsoleMessage::Type::Table;
     159    case MessageType::Trace: return Inspector::Protocol::Console::ConsoleMessage::Type::Trace;
     160    case MessageType::StartGroup: return Inspector::Protocol::Console::ConsoleMessage::Type::StartGroup;
     161    case MessageType::StartGroupCollapsed: return Inspector::Protocol::Console::ConsoleMessage::Type::StartGroupCollapsed;
     162    case MessageType::EndGroup: return Inspector::Protocol::Console::ConsoleMessage::Type::EndGroup;
     163    case MessageType::Assert: return Inspector::Protocol::Console::ConsoleMessage::Type::Assert;
     164    case MessageType::Timing: return Inspector::Protocol::Console::ConsoleMessage::Type::Timing;
     165    case MessageType::Profile: return Inspector::Protocol::Console::ConsoleMessage::Type::Profile;
     166    case MessageType::ProfileEnd: return Inspector::Protocol::Console::ConsoleMessage::Type::ProfileEnd;
     167    }
     168    return Inspector::Protocol::Console::ConsoleMessage::Type::Log;
     169}
     170
     171static Inspector::Protocol::Console::ConsoleMessage::Level messageLevelValue(MessageLevel level)
    172172{
    173173    switch (level) {
    174     case MessageLevel::Log: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Log;
    175     case MessageLevel::Warning: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Warning;
    176     case MessageLevel::Error: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Error;
    177     case MessageLevel::Debug: return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Debug;
    178     }
    179     return Inspector::TypeBuilder::Console::ConsoleMessage::Level::Log;
     174    case MessageLevel::Log: return Inspector::Protocol::Console::ConsoleMessage::Level::Log;
     175    case MessageLevel::Warning: return Inspector::Protocol::Console::ConsoleMessage::Level::Warning;
     176    case MessageLevel::Error: return Inspector::Protocol::Console::ConsoleMessage::Level::Error;
     177    case MessageLevel::Debug: return Inspector::Protocol::Console::ConsoleMessage::Level::Debug;
     178    }
     179    return Inspector::Protocol::Console::ConsoleMessage::Level::Log;
    180180}
    181181
    182182void ConsoleMessage::addToFrontend(InspectorConsoleFrontendDispatcher* consoleFrontendDispatcher, Inspector::InjectedScriptManager* injectedScriptManager, bool generatePreview)
    183183{
    184     RefPtr<Inspector::TypeBuilder::Console::ConsoleMessage> jsonObj = Inspector::TypeBuilder::Console::ConsoleMessage::create()
     184    RefPtr<Inspector::Protocol::Console::ConsoleMessage> jsonObj = Inspector::Protocol::Console::ConsoleMessage::create()
    185185        .setSource(messageSourceValue(m_source))
    186186        .setLevel(messageLevelValue(m_level))
    … …  
    200200        InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState());
    201201        if (!injectedScript.hasNoValue()) {
    202             RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::RemoteObject>> jsonArgs = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::RemoteObject>::create();
     202            RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>> jsonArgs = Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>::create();
    203203            if (m_type == MessageType::Table && generatePreview && m_arguments->argumentCount()) {
    204204                Deprecated::ScriptValue table = m_arguments->argumentAt(0);
    205205                Deprecated::ScriptValue columns = m_arguments->argumentCount() > 1 ? m_arguments->argumentAt(1) : Deprecated::ScriptValue();
    206                 RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapTable(table, columns);
     206                RefPtr<Inspector::Protocol::Runtime::RemoteObject> inspectorValue = injectedScript.wrapTable(table, columns);
    207207                if (!inspectorValue) {
    208208                    ASSERT_NOT_REACHED();
    … …  
    212212            } else {
    213213                for (unsigned i = 0; i < m_arguments->argumentCount(); ++i) {
    214                     RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> inspectorValue = injectedScript.wrapObject(m_arguments->argumentAt(i), "console", generatePreview);
     214                    RefPtr<Inspector::Protocol::Runtime::RemoteObject> inspectorValue = injectedScript.wrapObject(m_arguments->argumentAt(i), "console", generatePreview);
    215215                    if (!inspectorValue) {
    216216                        ASSERT_NOT_REACHED();

  • trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp

    r165703 r172930  
    3232#if ENABLE(INSPECTOR)
    3333
    34 #include "InspectorJSTypeBuilders.h"
     34#include "InspectorJSProtocolTypes.h"
    3535#include "InspectorValues.h"
    3636#include "RegularExpression.h"
    … …  
    122122}
    123123
    124 static PassRefPtr<Inspector::TypeBuilder::GenericTypes::SearchMatch> buildObjectForSearchMatch(size_t lineNumber, const String& lineContent)
    125 {
    126     return Inspector::TypeBuilder::GenericTypes::SearchMatch::create()
     124static PassRefPtr<Inspector::Protocol::GenericTypes::SearchMatch> buildObjectForSearchMatch(size_t lineNumber, const String& lineContent)
     125{
     126    return Inspector::Protocol::GenericTypes::SearchMatch::create()
    127127        .setLineNumber(lineNumber)
    128128        .setLineContent(lineContent)
    … …  
    155155}
    156156
    157 PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex)
    158 {
    159     RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>> result = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>::create();
     157PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex)
     158{
     159    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> result = Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>::create();
    160160
    161161    JSC::Yarr::RegularExpression regex = ContentSearchUtilities::createSearchRegex(query, caseSensitive, isRegex);

  • trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h

    r164245 r172930  
    3232#if ENABLE(INSPECTOR)
    3333
    34 #include "InspectorJSTypeBuilders.h"
     34#include "InspectorJSProtocolTypes.h"
    3535#include <wtf/Vector.h>
    3636#include <wtf/text/TextPosition.h>
    … …  
    4747JS_EXPORT_PRIVATE JSC::Yarr::RegularExpression createSearchRegex(const String& query, bool caseSensitive, bool isRegex);
    4848JS_EXPORT_PRIVATE int countRegularExpressionMatches(const JSC::Yarr::RegularExpression&, const String&);
    49 JS_EXPORT_PRIVATE PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex);
     49JS_EXPORT_PRIVATE PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex);
    5050JS_EXPORT_PRIVATE TextPosition textPositionFromOffset(size_t offset, const Vector<size_t>& lineEndings);
    5151JS_EXPORT_PRIVATE std::unique_ptr<Vector<size_t>> lineEndings(const String&);

  • trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp

    r172655 r172930  
    4141#include <wtf/text/WTFString.h>
    4242
    43 using Inspector::TypeBuilder::Array;
     43using Inspector::Protocol::Array;
    4444
    4545namespace Inspector {
    … …  
    5959}
    6060
    61 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)
     61void 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)
    6262{
    6363    Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("evaluate"), inspectorEnvironment()->functionCallHandler());
    … …  
    7070}
    7171
    72 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)
     72void 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)
    7373{
    7474    Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("callFunctionOn"), inspectorEnvironment()->functionCallHandler());
    … …  
    8181}
    8282
    83 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)
     83void 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)
    8484{
    8585    Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("evaluateOnCallFrame"), inspectorEnvironment()->functionCallHandler());
    … …  
    9494}
    9595
    96 void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>* result)
     96void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>* result)
    9797{
    9898    Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getFunctionDetails"), inspectorEnvironment()->functionCallHandler());
    … …  
    107107    }
    108108
    109     *result = BindingTraits<Inspector::TypeBuilder::Debugger::FunctionDetails>::runtimeCast(resultValue);
    110 }
    111 
    112 void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>>* properties)
     109    *result = BindingTraits<Inspector::Protocol::Debugger::FunctionDetails>::runtimeCast(resultValue);
     110}
     111
     112void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>* properties)
    113113{
    114114    Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getProperties"), inspectorEnvironment()->functionCallHandler());
    … …  
    123123    }
    124124
    125     *properties = BindingTraits<Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>>::runtimeCast(result);
    126 }
    127 
    128 void InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, RefPtr<Array<Inspector::TypeBuilder::Runtime::InternalPropertyDescriptor>>* properties)
     125    *properties = BindingTraits<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>::runtimeCast(result);
     126}
     127
     128void InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, RefPtr<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>* properties)
    129129{
    130130    Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getInternalProperties"), inspectorEnvironment()->functionCallHandler());
    … …  
    138138    }
    139139
    140     auto array = BindingTraits<Array<Inspector::TypeBuilder::Runtime::InternalPropertyDescriptor>>::runtimeCast(result);
     140    auto array = BindingTraits<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>::runtimeCast(result);
    141141    if (array->length() > 0)
    142142        *properties = array;
    143143}
    144144
    145 PassRefPtr<Array<Inspector::TypeBuilder::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
     145PassRefPtr<Array<Inspector::Protocol::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
    146146{
    147147    ASSERT(!hasNoValue());
    … …  
    154154    RefPtr<InspectorValue> result = callFramesValue.toInspectorValue(scriptState());
    155155    if (result->type() == InspectorValue::Type::Array)
    156         return BindingTraits<Array<Inspector::TypeBuilder::Debugger::CallFrame>>::runtimeCast(result);
    157 
    158     return Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
    159 }
    160 
    161 PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(const Deprecated::ScriptValue& value, const String& groupName, bool generatePreview) const
     156        return BindingTraits<Array<Inspector::Protocol::Debugger::CallFrame>>::runtimeCast(result);
     157
     158    return Array<Inspector::Protocol::Debugger::CallFrame>::create();
     159}
     160
     161PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> InjectedScript::wrapObject(const Deprecated::ScriptValue& value, const String& groupName, bool generatePreview) const
    162162{
    163163    ASSERT(!hasNoValue());
    … …  
    174174
    175175    RefPtr<InspectorObject> rawResult = r.toInspectorValue(scriptState())->asObject();
    176     return BindingTraits<Inspector::TypeBuilder::Runtime::RemoteObject>::runtimeCast(rawResult);
    177 }
    178 
    179 PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const
     176    return BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(rawResult);
     177}
     178
     179PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> InjectedScript::wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const
    180180{
    181181    ASSERT(!hasNoValue());
    … …  
    194194
    195195    RefPtr<InspectorObject> rawResult = r.toInspectorValue(scriptState())->asObject();
    196     return BindingTraits<Inspector::TypeBuilder::Runtime::RemoteObject>::runtimeCast(rawResult);
     196    return BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(rawResult);
    197197}
    198198

  • trunk/Source/JavaScriptCore/inspector/InjectedScript.h

    r162970 r172930  
    3636
    3737#include "InjectedScriptBase.h"
    38 #include "InspectorJSTypeBuilders.h"
     38#include "InspectorJSProtocolTypes.h"
    3939#include <wtf/Forward.h>
    4040#include <wtf/Noncopyable.h>
    … …  
    5757    virtual ~InjectedScript();
    5858
    59     void evaluate(ErrorString*, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown);
    60     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);
    61     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);
    62     void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<TypeBuilder::Debugger::FunctionDetails>* result);
    63     void getProperties(ErrorString*, const String& objectId, bool ownProperties, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::PropertyDescriptor>>* result);
    64     void getInternalProperties(ErrorString*, const String& objectId, RefPtr<TypeBuilder::Array<TypeBuilder::Runtime::InternalPropertyDescriptor>>* result);
     59    void evaluate(ErrorString*, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
     60    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);
     61    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);
     62    void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Protocol::Debugger::FunctionDetails>* result);
     63    void getProperties(ErrorString*, const String& objectId, bool ownProperties, RefPtr<Protocol::Array<Protocol::Runtime::PropertyDescriptor>>* result);
     64    void getInternalProperties(ErrorString*, const String& objectId, RefPtr<Protocol::Array<Protocol::Runtime::InternalPropertyDescriptor>>* result);
    6565
    66     PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame>> wrapCallFrames(const Deprecated::ScriptValue&);
    67     PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapObject(const Deprecated::ScriptValue&, const String& groupName, bool generatePreview = false) const;
    68     PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const;
     66    PassRefPtr<Protocol::Array<Protocol::Debugger::CallFrame>> wrapCallFrames(const Deprecated::ScriptValue&);
     67    PassRefPtr<Protocol::Runtime::RemoteObject> wrapObject(const Deprecated::ScriptValue&, const String& groupName, bool generatePreview = false) const;
     68    PassRefPtr<Protocol::Runtime::RemoteObject> wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const;
    6969
    7070    Deprecated::ScriptValue findObjectById(const String& objectId) const;

  • trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp

    r172655 r172930  
    120120}
    121121
    122 void InjectedScriptBase::makeEvalCall(ErrorString* errorString, Deprecated::ScriptFunctionCall& function, RefPtr<TypeBuilder::Runtime::RemoteObject>* objectResult, TypeBuilder::OptOutput<bool>* wasThrown)
     122void InjectedScriptBase::makeEvalCall(ErrorString* errorString, Deprecated::ScriptFunctionCall& function, RefPtr<Protocol::Runtime::RemoteObject>* objectResult, Protocol::OptOutput<bool>* wasThrown)
    123123{
    124124    RefPtr<InspectorValue> result;
    … …  
    148148    }
    149149
    150     *objectResult = BindingTraits<TypeBuilder::Runtime::RemoteObject>::runtimeCast(resultObj);
     150    *objectResult = BindingTraits<Protocol::Runtime::RemoteObject>::runtimeCast(resultObj);
    151151    *wasThrown = wasThrownVal;
    152152}

  • trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.h

    r161563 r172930  
    3636
    3737#include "InspectorEnvironment.h"
    38 #include "InspectorJSTypeBuilders.h"
     38#include "InspectorJSProtocolTypes.h"
    3939#include "bindings/ScriptObject.h"
    4040#include <wtf/Forward.h>
    … …  
    6969    Deprecated::ScriptValue callFunctionWithEvalEnabled(Deprecated::ScriptFunctionCall&, bool& hadException) const;
    7070    void makeCall(Deprecated::ScriptFunctionCall&, RefPtr<InspectorValue>* result);
    71     void makeEvalCall(ErrorString*, Deprecated::ScriptFunctionCall&, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown);
     71    void makeEvalCall(ErrorString*, Deprecated::ScriptFunctionCall&, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
    7272
    7373private:

  • trunk/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h

    r172929 r172930  
    2525 */
    2626
    27 #ifndef InspectorTypeBuilder_h
    28 #define InspectorTypeBuilder_h
     27#ifndef InspectorProtocolTypes_h
     28#define InspectorProtocolTypes_h
    2929
    3030#if ENABLE(INSPECTOR)
    … …  
    3636namespace Inspector {
    3737
    38 namespace TypeBuilder {
     38namespace Protocol {
    3939
    4040template<typename T>
    … …  
    177177
    178178template<typename T>
    179 struct ArrayItemHelper<TypeBuilder::Array<T>> {
    180     struct Traits {
    181         static void pushRefPtr(InspectorArray* array, PassRefPtr<TypeBuilder::Array<T>> value)
     179struct ArrayItemHelper<Protocol::Array<T>> {
     180    struct Traits {
     181        static void pushRefPtr(InspectorArray* array, PassRefPtr<Protocol::Array<T>> value)
    182182        {
    183183            array->pushValue(value);
    … …  
    186186};
    187187
    188 // Helper methods for TypeBuilder and other Inspector types are provided by
     188// Helper methods for Protocol and other Inspector types are provided by
    189189// specializations of BindingTraits<T>. Some are generated for protocol types.
    190190
    … …  
    211211
    212212template<typename T>
    213 struct BindingTraits<TypeBuilder::Array<T>> {
     213struct BindingTraits<Protocol::Array<T>> {
    214214    static PassRefPtr<Array<T>> runtimeCast(PassRefPtr<InspectorValue> value)
    215215    {
    … …  
    265265};
    266266
    267 } // namespace TypeBuilder
    268 
    269 using TypeBuilder::BindingTraits;
     267} // namespace Protocol
     268
     269using Protocol::BindingTraits;
    270270
    271271} // namespace Inspector
    … …  
    273273#endif // ENABLE(INSPECTOR)
    274274
    275 #endif // !defined(InspectorTypeBuilder_h)
     275#endif // !defined(InspectorProtocolTypes_h)

  • trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp

    r163568 r172930  
    5959
    6060#if ENABLE(INSPECTOR)
    61 PassRefPtr<Inspector::TypeBuilder::Console::CallFrame> ScriptCallFrame::buildInspectorObject() const
     61PassRefPtr<Inspector::Protocol::Console::CallFrame> ScriptCallFrame::buildInspectorObject() const
    6262{
    63     return Inspector::TypeBuilder::Console::CallFrame::create()
     63    return Inspector::Protocol::Console::CallFrame::create()
    6464        .setFunctionName(m_functionName)
    6565        .setUrl(m_scriptName)

  • trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h

    r163568 r172930  
    3737
    3838#if ENABLE(INSPECTOR)
    39 #include "InspectorJSTypeBuilders.h"
     39#include "InspectorJSProtocolTypes.h"
    4040#endif
    4141
    … …  
    5555
    5656#if ENABLE(INSPECTOR)
    57     PassRefPtr<Inspector::TypeBuilder::Console::CallFrame> buildInspectorObject() const;
     57    PassRefPtr<Inspector::Protocol::Console::CallFrame> buildInspectorObject() const;
    5858#endif
    5959

  • trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp

    r164824 r172930  
    108108
    109109#if ENABLE(INSPECTOR)
    110 PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> ScriptCallStack::buildInspectorArray() const
     110PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> ScriptCallStack::buildInspectorArray() const
    111111{
    112     RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> frames = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>::create();
     112    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> frames = Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>::create();
    113113    for (size_t i = 0; i < m_frames.size(); i++)
    114114        frames->addItem(m_frames.at(i).buildInspectorObject());

  • trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h

    r164824 r172930  
    3939
    4040#if ENABLE(INSPECTOR)
    41 #include "InspectorJSTypeBuilders.h"
     41#include "InspectorJSProtocolTypes.h"
    4242#endif
    4343
    … …  
    6363
    6464#if ENABLE(INSPECTOR)
    65     PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Console::CallFrame>> buildInspectorArray() const;
     65    PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> buildInspectorArray() const;
    6666#endif
    6767

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp

    r165676 r172930  
    8888}
    8989
    90 void InspectorAgent::inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints)
     90void InspectorAgent::inspect(PassRefPtr<Protocol::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints)
    9191{
    9292    if (m_enabled && m_frontendDispatcher) {

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h

    r167811 r172930  
    6161    virtual void disable(ErrorString*) override;
    6262
    63     void inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
     63    void inspect(PassRefPtr<Protocol::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
    6464    void evaluateForTestInFrontend(const String& script);
    6565
    … …  
    6868    RefPtr<InspectorInspectorBackendDispatcher> m_backendDispatcher;
    6969    Vector<String> m_pendingEvaluateTestCommands;
    70     std::pair<RefPtr<TypeBuilder::Runtime::RemoteObject>, RefPtr<InspectorObject>> m_pendingInspectData;
     70    std::pair<RefPtr<Protocol::Runtime::RemoteObject>, RefPtr<InspectorObject>> m_pendingInspectData;
    7171    bool m_enabled;
    7272};

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp

    r172655 r172930  
    176176static bool breakpointActionTypeForString(const String& typeString, ScriptBreakpointActionType* output)
    177177{
    178     if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Log)) {
     178    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Log)) {
    179179        *output = ScriptBreakpointActionTypeLog;
    180180        return true;
    181181    }
    182     if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Evaluate)) {
     182    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Evaluate)) {
    183183        *output = ScriptBreakpointActionTypeEvaluate;
    184184        return true;
    185185    }
    186     if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Sound)) {
     186    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Sound)) {
    187187        *output = ScriptBreakpointActionTypeSound;
    188188        return true;
    189189    }
    190     if (typeString == Inspector::TypeBuilder::getJSEnumConstantValue(Inspector::TypeBuilder::Debugger::BreakpointAction::Type::Probe)) {
     190    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Probe)) {
    191191        *output = ScriptBreakpointActionTypeProbe;
    192192        return true;
    … …  
    240240}
    241241
    242 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)
    243 {
    244     locations = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>::create();
     242void 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)
     243{
     244    locations = Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>::create();
    245245    if (!optionalURL == !optionalURLRegex) {
    246246        *errorString = ASCIILiteral("Either url or urlRegex must be specified.");
    … …  
    279279            continue;
    280280
    281         RefPtr<Inspector::TypeBuilder::Debugger::Location> location = resolveBreakpoint(breakpointIdentifier, it->key, breakpoint);
     281        RefPtr<Inspector::Protocol::Debugger::Location> location = resolveBreakpoint(breakpointIdentifier, it->key, breakpoint);
    282282        if (location)
    283283            locations->addItem(location);
    … …  
    301301}
    302302
    303 void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, const RefPtr<InspectorObject>& location, const RefPtr<InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::TypeBuilder::Debugger::Location>& actualLocation)
     303void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, const RefPtr<InspectorObject>& location, const RefPtr<InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation)
    304304{
    305305    JSC::SourceID sourceID;
    … …  
    369369}
    370370
    371 PassRefPtr<Inspector::TypeBuilder::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID sourceID, const ScriptBreakpoint& breakpoint)
     371PassRefPtr<Inspector::Protocol::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID sourceID, const ScriptBreakpoint& breakpoint)
    372372{
    373373    ScriptsMap::iterator scriptIterator = m_scripts.find(sourceID);
    … …  
    389389    debugServerBreakpointIDsIterator->value.append(debugServerBreakpointID);
    390390
    391     RefPtr<Inspector::TypeBuilder::Debugger::Location> location = Inspector::TypeBuilder::Debugger::Location::create()
     391    RefPtr<Inspector::Protocol::Debugger::Location> location = Inspector::Protocol::Debugger::Location::create()
    392392        .setScriptId(String::number(sourceID))
    393393        .setLineNumber(actualLineNumber);
    … …  
    396396}
    397397
    398 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)
     398void 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)
    399399{
    400400    bool isRegex = optionalIsRegex ? *optionalIsRegex : false;
    … …  
    419419}
    420420
    421 void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>& details)
     421void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>& details)
    422422{
    423423    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(functionId);
    … …  
    517517}
    518518
    519 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)
     519void 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)
    520520{
    521521    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(callFrameId);
    … …  
    554554}
    555555
    556 PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>> InspectorDebuggerAgent::currentCallFrames()
     556PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> InspectorDebuggerAgent::currentCallFrames()
    557557{
    558558    if (!m_pausedScriptState)
    559         return Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
     559        return Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>::create();
    560560
    561561    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(m_pausedScriptState);
    562562    if (injectedScript.hasNoValue()) {
    563563        ASSERT_NOT_REACHED();
    564         return Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
     564        return Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>::create();
    565565    }
    566566
    … …  
    613613        }
    614614
    615         RefPtr<Inspector::TypeBuilder::Debugger::Location> location = resolveBreakpoint(it->key, sourceID, breakpoint);
     615        RefPtr<Inspector::Protocol::Debugger::Location> location = resolveBreakpoint(it->key, sourceID, breakpoint);
    616616        if (location)
    617617            m_frontendDispatcher->breakpointResolved(it->key, location);
    … …  
    661661
    662662    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
    663     RefPtr<TypeBuilder::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(action));
    664     RefPtr<TypeBuilder::Debugger::ProbeSample> result = TypeBuilder::Debugger::ProbeSample::create()
     663    RefPtr<Protocol::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(action));
     664    RefPtr<Protocol::Debugger::ProbeSample> result = Protocol::Debugger::ProbeSample::create()
    665665        .setProbeId(action.identifier)
    666666        .setSampleId(sampleId)

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h

    r172655 r172930  
    7272    virtual void disable(ErrorString*) override;
    7373    virtual void setBreakpointsActive(ErrorString*, bool active) override;
    74     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;
    75     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;
     74    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;
     75    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;
    7676    virtual void removeBreakpoint(ErrorString*, const String& breakpointIdentifier) override;
    7777    virtual void continueToLocation(ErrorString*, const RefPtr<InspectorObject>& location) override;
    78     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;
     78    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;
    7979    virtual void getScriptSource(ErrorString*, const String& scriptID, String* scriptSource) override;
    80     virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Inspector::TypeBuilder::Debugger::FunctionDetails>&) override;
     80    virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>&) override;
    8181    virtual void pause(ErrorString*) override;
    8282    virtual void resume(ErrorString*) override;
    … …  
    8585    virtual void stepOut(ErrorString*) override;
    8686    virtual void setPauseOnExceptions(ErrorString*, const String& pauseState) override;
    87     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;
     87    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;
    8888    virtual void setOverlayMessage(ErrorString*, const String*) override;
    8989
    … …  
    130130
    131131private:
    132     PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::CallFrame>> currentCallFrames();
     132    PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> currentCallFrames();
    133133
    134134    virtual void didParseSource(JSC::SourceID, const Script&) override final;
    … …  
    138138    virtual void breakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, int hitCount, const Deprecated::ScriptValue& sample) override final;
    139139
    140     PassRefPtr<Inspector::TypeBuilder::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
     140    PassRefPtr<Inspector::Protocol::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
    141141    bool assertPaused(ErrorString*);
    142142    void clearDebuggerBreakpointState();

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.cpp

    r167530 r172930  
    8585}
    8686
    87 PassRefPtr<TypeBuilder::Profiler::ProfileHeader> InspectorProfilerAgent::createProfileHeader(const JSC::Profile& profile)
    88 {
    89     return TypeBuilder::Profiler::ProfileHeader::create()
    90         .setTypeId(TypeBuilder::Profiler::ProfileHeader::TypeId::CPU)
     87PassRefPtr<Protocol::Profiler::ProfileHeader> InspectorProfilerAgent::createProfileHeader(const JSC::Profile& profile)
     88{
     89    return Protocol::Profiler::ProfileHeader::create()
     90        .setTypeId(Protocol::Profiler::ProfileHeader::TypeId::CPU)
    9191        .setUid(profile.uid())
    9292        .setTitle(profile.title())
    … …  
    132132}
    133133
    134 void InspectorProfilerAgent::getProfileHeaders(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::ProfileHeader>>& headers)
     134void InspectorProfilerAgent::getProfileHeaders(ErrorString*, RefPtr<Protocol::Array<Protocol::Profiler::ProfileHeader>>& headers)
    135135{
    136136    m_profileHeadersRequested = true;
    137     headers = TypeBuilder::Array<TypeBuilder::Profiler::ProfileHeader>::create();
     137    headers = Protocol::Array<Protocol::Profiler::ProfileHeader>::create();
    138138
    139139    for (auto& profile : m_profiles.values())
    … …  
    141141}
    142142
    143 static PassRefPtr<TypeBuilder::Profiler::CPUProfileNodeCall> buildInspectorObject(const JSC::ProfileNode::Call& call)
    144 {
    145     RefPtr<TypeBuilder::Profiler::CPUProfileNodeCall> result = TypeBuilder::Profiler::CPUProfileNodeCall::create()
     143static PassRefPtr<Protocol::Profiler::CPUProfileNodeCall> buildInspectorObject(const JSC::ProfileNode::Call& call)
     144{
     145    RefPtr<Protocol::Profiler::CPUProfileNodeCall> result = Protocol::Profiler::CPUProfileNodeCall::create()
    146146        .setStartTime(call.startTime())
    147147        .setTotalTime(call.totalTime());
    … …  
    149149}
    150150
    151 static PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
    152 {
    153     RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNodeCall>> calls = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNodeCall>::create();
     151static PassRefPtr<Protocol::Profiler::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
     152{
     153    RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNodeCall>> calls = Protocol::Array<Protocol::Profiler::CPUProfileNodeCall>::create();
    154154    for (const JSC::ProfileNode::Call& call : node->calls())
    155155        calls->addItem(buildInspectorObject(call));
    156156
    157     RefPtr<TypeBuilder::Profiler::CPUProfileNode> result = TypeBuilder::Profiler::CPUProfileNode::create()
     157    RefPtr<Protocol::Profiler::CPUProfileNode> result = Protocol::Profiler::CPUProfileNode::create()
    158158        .setId(node->id())
    159159        .setCalls(calls.release());
    … …  
    169169
    170170    if (!node->children().isEmpty()) {
    171         RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>> children = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>::create();
     171        RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNode>> children = Protocol::Array<Protocol::Profiler::CPUProfileNode>::create();
    172172        for (RefPtr<JSC::ProfileNode> profileNode : node->children())
    173173            children->addItem(buildInspectorObject(profileNode.get()));
    … …  
    178178}
    179179
    180 PassRefPtr<TypeBuilder::Profiler::CPUProfile> InspectorProfilerAgent::buildProfileInspectorObject(const JSC::Profile* profile)
    181 {
    182     RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>> rootNodes = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>::create();
     180PassRefPtr<Protocol::Profiler::CPUProfile> InspectorProfilerAgent::buildProfileInspectorObject(const JSC::Profile* profile)
     181{
     182    RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNode>> rootNodes = Protocol::Array<Protocol::Profiler::CPUProfileNode>::create();
    183183    for (RefPtr<JSC::ProfileNode> profileNode : profile->head()->children())
    184184        rootNodes->addItem(buildInspectorObject(profileNode.get()));
    185185
    186     RefPtr<TypeBuilder::Profiler::CPUProfile> result = TypeBuilder::Profiler::CPUProfile::create()
     186    RefPtr<Protocol::Profiler::CPUProfile> result = Protocol::Profiler::CPUProfile::create()
    187187        .setRootNodes(rootNodes);
    188188
    … …  
    193193}
    194194
    195 void InspectorProfilerAgent::getCPUProfile(ErrorString* errorString, int rawUid, RefPtr<TypeBuilder::Profiler::CPUProfile>& profileObject)
     195void InspectorProfilerAgent::getCPUProfile(ErrorString* errorString, int rawUid, RefPtr<Protocol::Profiler::CPUProfile>& profileObject)
    196196{
    197197    unsigned uid = static_cast<unsigned>(rawUid);

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.h

    r167530 r172930  
    6969    virtual void clearProfiles(ErrorString*) override final { reset(); }
    7070
    71     virtual void getProfileHeaders(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::ProfileHeader>>&) override final;
    72     virtual void getCPUProfile(ErrorString*, int uid, RefPtr<TypeBuilder::Profiler::CPUProfile>&) override final;
     71    virtual void getProfileHeaders(ErrorString*, RefPtr<Protocol::Array<Protocol::Profiler::ProfileHeader>>&) override final;
     72    virtual void getCPUProfile(ErrorString*, int uid, RefPtr<Protocol::Profiler::CPUProfile>&) override final;
    7373    virtual void removeProfile(ErrorString*, const String& type, int uid) override final;
    7474
    75     static PassRefPtr<TypeBuilder::Profiler::CPUProfile> buildProfileInspectorObject(const JSC::Profile*);
     75    static PassRefPtr<Protocol::Profiler::CPUProfile> buildProfileInspectorObject(const JSC::Profile*);
    7676
    7777    enum ShouldRecompile { SkipRecompile, Recompile };
    … …  
    101101    String getUserInitiatedProfileName();
    102102
    103     PassRefPtr<TypeBuilder::Profiler::ProfileHeader> createProfileHeader(const JSC::Profile&);
     103    PassRefPtr<Protocol::Profiler::ProfileHeader> createProfileHeader(const JSC::Profile&);
    104104
    105105    std::unique_ptr<InspectorProfilerFrontendDispatcher> m_frontendDispatcher;

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp

    r172820 r172930  
    8181}
    8282
    83 static PassRefPtr<Inspector::TypeBuilder::Runtime::ErrorRange> buildErrorRangeObject(const JSTokenLocation& tokenLocation)
    84 {
    85     RefPtr<Inspector::TypeBuilder::Runtime::ErrorRange> result = Inspector::TypeBuilder::Runtime::ErrorRange::create()
     83static PassRefPtr<Inspector::Protocol::Runtime::ErrorRange> buildErrorRangeObject(const JSTokenLocation& tokenLocation)
     84{
     85    RefPtr<Inspector::Protocol::Runtime::ErrorRange> result = Inspector::Protocol::Runtime::ErrorRange::create()
    8686        .setStartOffset(tokenLocation.startOffset)
    8787        .setEndOffset(tokenLocation.endOffset);
    … …  
    8989}
    9090
    91 void InspectorRuntimeAgent::parse(ErrorString*, const String& expression, Inspector::TypeBuilder::Runtime::SyntaxErrorType* result, Inspector::TypeBuilder::OptOutput<String>* message, RefPtr<Inspector::TypeBuilder::Runtime::ErrorRange>& range)
     91void InspectorRuntimeAgent::parse(ErrorString*, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>& range)
    9292{
    9393    VM& vm = globalVM();
    … …  
    9999    switch (error.m_syntaxErrorType) {
    100100    case ParserError::SyntaxErrorNone:
    101         *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::None;
     101        *result = Inspector::Protocol::Runtime::SyntaxErrorType::None;
    102102        break;
    103103    case ParserError::SyntaxErrorIrrecoverable:
    104         *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::Irrecoverable;
     104        *result = Inspector::Protocol::Runtime::SyntaxErrorType::Irrecoverable;
    105105        break;
    106106    case ParserError::SyntaxErrorUnterminatedLiteral:
    107         *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::UnterminatedLiteral;
     107        *result = Inspector::Protocol::Runtime::SyntaxErrorType::UnterminatedLiteral;
    108108        break;
    109109    case ParserError::SyntaxErrorRecoverable:
    110         *result = Inspector::TypeBuilder::Runtime::SyntaxErrorType::Recoverable;
     110        *result = Inspector::Protocol::Runtime::SyntaxErrorType::Recoverable;
    111111        break;
    112112    }
    … …  
    118118}
    119119
    120 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)
     120void 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)
    121121{
    122122    InjectedScript injectedScript = injectedScriptForEval(errorString, executionContextId);
    … …  
    138138}
    139139
    140 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)
     140void 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)
    141141{
    142142    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
    … …  
    164164}
    165165
    166 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)
     166void 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)
    167167{
    168168    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
    … …  
    198198}
    199199
    200 void InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets(ErrorString* errorString, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::TypeDescription>>& typeDescriptions)
     200void InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets(ErrorString* errorString, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>& typeDescriptions)
    201201{
    202202    static const bool verbose = false;
    203203    VM& vm = globalVM();
    204     typeDescriptions = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::TypeDescription>::create();
     204    typeDescriptions = Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>::create();
    205205    if (!vm.typeProfiler()) {
    206206        *errorString = ASCIILiteral("The VM does not currently have Type Information.");
    … …  
    226226        location->getNumber(ASCIILiteral("divot"), &divot);
    227227
    228         RefPtr<Inspector::TypeBuilder::Runtime::TypeDescription> typeDescription = Inspector::TypeBuilder::Runtime::TypeDescription::create();
     228        RefPtr<Inspector::Protocol::Runtime::TypeDescription> typeDescription = Inspector::Protocol::Runtime::TypeDescription::create();
    229229        bool okay;
    230230        vm.typeProfiler()->getTypesForVariableAtOffsetForInspector(static_cast<TypeProfilerSearchDescriptor>(descriptor), divot, sourceIDAsString.toIntPtrStrict(&okay), typeDescription);

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h

    r172820 r172930  
    6262    virtual void enable(ErrorString*) override { m_enabled = true; }
    6363    virtual void disable(ErrorString*) override { m_enabled = false; }
    64     virtual void parse(ErrorString*, const String& expression, Inspector::TypeBuilder::Runtime::SyntaxErrorType* result, Inspector::TypeBuilder::OptOutput<String>* message, RefPtr<Inspector::TypeBuilder::Runtime::ErrorRange>&) override final;
    65     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;
    66     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;
     64    virtual void parse(ErrorString*, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>&) override final;
     65    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;
     66    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;
    6767    virtual void releaseObject(ErrorString*, const ErrorString& objectId) override final;
    68     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;
     68    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;
    6969    virtual void releaseObjectGroup(ErrorString*, const String& objectGroup) override final;
    7070    virtual void run(ErrorString*) override;
    71     virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString*, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::TypeDescription>>&) override;
     71    virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString*, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
    7272    virtual void enableTypeProfiler(ErrorString*) override;
    7373    virtual void disableTypeProfiler(ErrorString*) override;

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/__init__.py

    r172655 r172930  
    99from generate_frontend_dispatcher_header import *
    1010from generate_frontend_dispatcher_implementation import *
    11 from generate_type_builder_header import *
    12 from generate_type_builder_implementation import *
     11from generate_protocol_types_header import *
     12from generate_protocol_types_implementation import *

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py

    r172655 r172930  
    5050    def generate_output(self):
    5151        headers = [
    52             '"Inspector%sTypeBuilders.h"' % self.model().framework.setting('prefix'),
     52            '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
    5353            '<inspector/InspectorBackendDispatcher.h>',
    5454            '<wtf/PassRefPtr.h>',

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py

    r172655 r172930  
    149149                    out_parameter_assignments.append('        jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), %(parameterName)s);' % param_args)
    150150            elif parameter.type.is_enum():
    151                 out_parameter_assignments.append('    jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::TypeBuilder::get%(frameworkPrefix)sEnumConstantValue(%(parameterName)s));' % param_args)
     151                out_parameter_assignments.append('    jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(%(parameterName)s));' % param_args)
    152152            else:
    153153                out_parameter_assignments.append('    jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), %(parameterName)s);' % param_args)
    … …  
    216216                        out_parameter_assignments.append('            result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), out_%(parameterName)s);' % param_args)
    217217                elif parameter.type.is_enum():
    218                     out_parameter_assignments.append('        result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::TypeBuilder::get%(frameworkPrefix)sEnumConstantValue(out_%(parameterName)s));' % param_args)
     218                    out_parameter_assignments.append('        result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(out_%(parameterName)s));' % param_args)
    219219                else:
    220220                    out_parameter_assignments.append('        result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), out_%(parameterName)s);' % param_args)

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_header.py

    r172655 r172930  
    5050    def generate_output(self):
    5151        headers = [
    52             '"Inspector%sTypeBuilders.h"' % self.model().framework.setting('prefix'),
     52            '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
    5353            '<inspector/InspectorFrontendChannel.h>',
    5454            '<inspector/InspectorValues.h>',

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py

    r172655 r172930  
    8484            if parameter.type.is_enum():
    8585                framework_prefix = self.model().framework.setting('prefix')
    86                 parameter_value = 'Inspector::TypeBuilder::get%sEnumConstantValue(%s)' % (framework_prefix, parameter_value)
     86                parameter_value = 'Inspector::Protocol::get%sEnumConstantValue(%s)' % (framework_prefix, parameter_value)
    8787
    8888            parameter_args = {

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_header.py

    r172929 r172930  
    3838
    3939
    40 class TypeBuilderHeaderGenerator(Generator):
     40class ProtocolTypesHeaderGenerator(Generator):
    4141    def __init__(self, model, input_filepath):
    4242        Generator.__init__(self, model, input_filepath)
    4343
    4444    def output_filename(self):
    45         return "Inspector%sTypeBuilders.h" % self.model().framework.setting('prefix')
     45        return "Inspector%sProtocolTypes.h" % self.model().framework.setting('prefix')
    4646
    4747    def generate_output(self):
    … …  
    5050
    5151        headers = set([
    52             '<inspector/InspectorTypeBuilder.h>',
     52            '<inspector/InspectorProtocolTypes.h>',
    5353            '<wtf/Assertions.h>',
    5454            '<wtf/PassRefPtr.h>'
    … …  
    5656
    5757        if self.model().framework is not Frameworks.JavaScriptCore:
    58             headers.add('<inspector/InspectorJSTypeBuilders.h>')
     58            headers.add('<inspector/InspectorJSProtocolTypes.h>')
    5959
    6060        export_macro = self.model().framework.setting('export_macro', None)
    … …  
    7676        sections.append(self.generate_license())
    7777        sections.append(Template(Templates.CppHeaderPrelude).substitute(None, **header_args))
    78         sections.append('namespace TypeBuilder {')
     78        sections.append('namespace Protocol {')
    7979        sections.append(self._generate_forward_declarations(domains))
    8080        sections.append(self._generate_typedefs(domains))
    … …  
    8989        sections.extend(filter(lambda section: len(section) > 0, builder_sections))
    9090        sections.append(self._generate_forward_declarations_for_binding_traits())
    91         sections.append('} // namespace TypeBuilder')
     91        sections.append('} // namespace Protocol')
    9292        sections.append(Template(Templates.CppHeaderPostlude).substitute(None, **header_args))
    9393        return "\n\n".join(sections)
    … …  
    209209        }
    210210
    211         lines.append(Template(Templates.TypeBuilderDeclarationPrelude).substitute(None, **builder_args))
     211        lines.append(Template(Templates.ProtocolObjectBuilderDeclarationPrelude).substitute(None, **builder_args))
    212212        for type_member in required_members:
    213213            lines.append(self._generate_builder_setter_for_member(type_member, domain))
    214         lines.append(Template(Templates.TypeBuilderDeclarationPostlude).substitute(None, **builder_args))
     214        lines.append(Template(Templates.ProtocolObjectBuilderDeclarationPostlude).substitute(None, **builder_args))
    215215        for member in optional_members:
    216216            lines.append(self._generate_unchecked_setter_for_member(member, domain))
    … …  
    286286
    287287        if isinstance(type_member.type, EnumType):
    288             lines.append('            m_result->%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::TypeBuilder::get%(frameworkPrefix)sEnumConstantValue(static_cast<int>(value)));' % setter_args)
     288            lines.append('            m_result->%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(static_cast<int>(value)));' % setter_args)
    289289        else:
    290290            lines.append('            m_result->%(keyedSet)s(ASCIILiteral("%(name)s"), value);' % setter_args)
    … …  
    307307        lines.append('    {')
    308308        if isinstance(type_member.type, EnumType):
    309             lines.append('        InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::TypeBuilder::get%(frameworkPrefix)sEnumConstantValue(static_cast<int>(value)));' % setter_args)
     309            lines.append('        InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(static_cast<int>(value)));' % setter_args)
    310310        else:
    311311            lines.append('        InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), value);' % setter_args)
    … …  
    323323                for type_member in type_declaration.type_members:
    324324                    if isinstance(type_member.type, EnumType):
    325                         type_arguments.append((Generator.type_builder_string_for_type_member(type_member, type_declaration), False))
     325                        type_arguments.append((Generator.protocol_type_string_for_type_member(type_member, type_declaration), False))
    326326
    327327                if isinstance(type_declaration.type, ObjectType):
    328                     type_arguments.append((Generator.type_builder_string_for_type(type_declaration.type), Generator.type_needs_runtime_casts(type_declaration.type)))
     328                    type_arguments.append((Generator.protocol_type_string_for_type(type_declaration.type), Generator.type_needs_runtime_casts(type_declaration.type)))
    329329
    330330        struct_keywords = ['struct']

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py

    r172929 r172930  
    3737
    3838
    39 class TypeBuilderImplementationGenerator(Generator):
     39class ProtocolTypesImplementationGenerator(Generator):
    4040    def __init__(self, model, input_filepath):
    4141        Generator.__init__(self, model, input_filepath)
    4242
    4343    def output_filename(self):
    44         return "Inspector%sTypeBuilders.cpp" % self.model().framework.setting('prefix')
     44        return "Inspector%sProtocolTypes.cpp" % self.model().framework.setting('prefix')
    4545
    4646    def generate_output(self):
    … …  
    5151
    5252        header_args = {
    53             'primaryInclude': '"Inspector%sTypeBuilders.h"' % self.model().framework.setting('prefix'),
     53            'primaryInclude': '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
    5454            'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),
    5555            'inputFilename': self._input_filepath
    … …  
    5959        sections.append(self.generate_license())
    6060        sections.append(Template(Templates.CppImplementationPrelude).substitute(None, **header_args))
    61         sections.append('namespace TypeBuilder {')
     61        sections.append('namespace Protocol {')
    6262        sections.append(self._generate_enum_mapping())
    6363        sections.append(self._generate_open_field_names())
    6464        builder_sections = map(self._generate_builders_for_domain, domains)
    6565        sections.extend(filter(lambda section: len(section) > 0, builder_sections))
    66         sections.append('} // namespace TypeBuilder')
     66        sections.append('} // namespace Protocol')
    6767        sections.append(Template(Templates.CppImplementationPostlude).substitute(None, **header_args))
    6868
    … …  
    9090            for type_declaration in filter(lambda decl: Generator.type_has_open_fields(decl.type), domain.type_declarations):
    9191                for type_member in sorted(type_declaration.type_members, key=lambda member: member.member_name):
    92                     field_name = '::'.join(['Inspector', 'TypeBuilder', domain.domain_name, ucfirst(type_declaration.type_name), ucfirst(type_member.member_name)])
     92                    field_name = '::'.join(['Inspector', 'Protocol', domain.domain_name, ucfirst(type_declaration.type_name), ucfirst(type_member.member_name)])
    9393                    lines.append('const char* %s = "%s";' % (field_name, type_member.member_name))
    9494
    … …  
    113113    def _generate_runtime_cast_for_object_declaration(self, object_declaration):
    114114        args = {
    115             'objectType': Generator.type_builder_string_for_type(object_declaration.type)
     115            'objectType': Generator.protocol_type_string_for_type(object_declaration.type)
    116116        }
    117         return Template(Templates.TypeBuilderObjectRuntimeCast).substitute(None, **args)
     117        return Template(Templates.ProtocolObjectRuntimeCast).substitute(None, **args)
    118118
    119119    def _generate_assertion_for_object_declaration(self, object_declaration):
    … …  
    124124
    125125        lines.append('#if !ASSERT_DISABLED')
    126         lines.append('void BindingTraits<%s>::assertValueHasExpectedType(Inspector::InspectorValue* value)' % (Generator.type_builder_string_for_type(object_declaration.type)))
     126        lines.append('void BindingTraits<%s>::assertValueHasExpectedType(Inspector::InspectorValue* value)' % (Generator.protocol_type_string_for_type(object_declaration.type)))
    127127        lines.append("""{
    128128    RefPtr<InspectorObject> object;

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py

    r172686 r172930  
    268268    # Generate type representations for various situations.
    269269    @staticmethod
    270     def type_builder_string_for_type(_type):
     270    def protocol_type_string_for_type(_type):
    271271        if isinstance(_type, ObjectType) and len(_type.members) == 0:
    272272            return 'Inspector::InspectorObject'
    273273        if isinstance(_type, (ObjectType, AliasedType, EnumType)):
    274             return 'Inspector::TypeBuilder::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
     274            return 'Inspector::Protocol::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
    275275        if isinstance(_type, ArrayType):
    276             return 'Inspector::TypeBuilder::Array<%s>' % Generator.type_builder_string_for_type(_type.element_type)
     276            return 'Inspector::Protocol::Array<%s>' % Generator.protocol_type_string_for_type(_type.element_type)
    277277        if isinstance(_type, PrimitiveType):
    278278            return Generator.cpp_name_for_primitive_type(_type)
    279279
    280280    @staticmethod
    281     def type_builder_string_for_type_member(type_member, object_declaration):
     281    def protocol_type_string_for_type_member(type_member, object_declaration):
    282282        if isinstance(type_member.type, EnumType) and type_member.type.is_anonymous:
    283             return '::'.join([Generator.type_builder_string_for_type(object_declaration.type), ucfirst(type_member.member_name)])
     283            return '::'.join([Generator.protocol_type_string_for_type(object_declaration.type), ucfirst(type_member.member_name)])
    284284        else:
    285             return Generator.type_builder_string_for_type(type_member.type)
     285            return Generator.protocol_type_string_for_type(type_member.type)
    286286
    287287    @staticmethod
    … …  
    322322    def type_string_for_type_with_name(_type, type_name, is_optional):
    323323        if isinstance(_type, (ArrayType, ObjectType)):
    324             return 'PassRefPtr<%s>' % Generator.type_builder_string_for_type(_type)
    325         if isinstance(_type, AliasedType):
    326             builder_type = Generator.type_builder_string_for_type(_type)
     324            return 'PassRefPtr<%s>' % Generator.protocol_type_string_for_type(_type)
     325        if isinstance(_type, AliasedType):
     326            builder_type = Generator.protocol_type_string_for_type(_type)
    327327            if is_optional:
    328328                return 'const %s* const' % builder_type
    … …  
    349349                enum_type_name = ucfirst(type_name)
    350350            else:
    351                 enum_type_name = 'Inspector::TypeBuilder::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
     351                enum_type_name = 'Inspector::Protocol::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
    352352
    353353            if is_optional:
    … …  
    364364
    365365        if isinstance(_type, (ObjectType, ArrayType)):
    366             return 'RefPtr<%s>&' % Generator.type_builder_string_for_type(_type)
     366            return 'RefPtr<%s>&' % Generator.protocol_type_string_for_type(_type)
    367367        if isinstance(_type, PrimitiveType):
    368368            cpp_name = Generator.cpp_name_for_primitive_type(_type)
    369369            if parameter.is_optional:
    370                 return "Inspector::TypeBuilder::OptOutput<%s>*" % cpp_name
     370                return "Inspector::Protocol::OptOutput<%s>*" % cpp_name
    371371            else:
    372372                return '%s*' % cpp_name
    … …  
    375375                return 'Inspector%sBackendDispatcherHandler::%s*' % (_type.type_domain().domain_name, ucfirst(parameter.parameter_name))
    376376            else:
    377                 return 'Inspector::TypeBuilder::%s::%s*' % (_type.type_domain().domain_name, _type.raw_name())
     377                return 'Inspector::Protocol::%s::%s*' % (_type.type_domain().domain_name, _type.raw_name())
    378378
    379379        raise ValueError("unknown formal out parameter type.")
    … …  
    390390
    391391        if isinstance(_type, (ObjectType, ArrayType)):
    392             return 'PassRefPtr<%s>' % Generator.type_builder_string_for_type(_type)
     392            return 'PassRefPtr<%s>' % Generator.protocol_type_string_for_type(_type)
    393393        if isinstance(_type, PrimitiveType):
    394394            cpp_name = Generator.cpp_name_for_primitive_type(_type)
    395395            if parameter.is_optional:
    396                 return "Inspector::TypeBuilder::OptOutput<%s>*" % cpp_name
     396                return "Inspector::Protocol::OptOutput<%s>*" % cpp_name
    397397            elif _type.qualified_name() in ['integer', 'number']:
    398398                return Generator.cpp_name_for_primitive_type(_type)
    … …  
    426426                return "RefPtr<%s>" % Generator.cpp_name_for_primitive_type(_type)
    427427            elif parameter.is_optional and _type.qualified_name() not in ['boolean', 'string', 'integer']:
    428                 return "Inspector::TypeBuilder::OptOutput<%s>" % cpp_name
     428                return "Inspector::Protocol::OptOutput<%s>" % cpp_name
    429429            else:
    430430                return cpp_name
    … …  
    434434        _type = parameter.type
    435435        if isinstance(_type, (ArrayType, ObjectType)):
    436             return 'RefPtr<%s>' % Generator.type_builder_string_for_type(_type)
    437         if isinstance(_type, AliasedType):
    438             builder_type = Generator.type_builder_string_for_type(_type)
     436            return 'RefPtr<%s>' % Generator.protocol_type_string_for_type(_type)
     437        if isinstance(_type, AliasedType):
     438            builder_type = Generator.protocol_type_string_for_type(_type)
    439439            if parameter.is_optional:
    440                 return "Inspector::TypeBuilder::OptOutput<%s>" % builder_type
     440                return "Inspector::Protocol::OptOutput<%s>" % builder_type
    441441            return '%s' % builder_type
    442442        if isinstance(_type, PrimitiveType):
    443443            cpp_name = Generator.cpp_name_for_primitive_type(_type)
    444444            if parameter.is_optional:
    445                 return "Inspector::TypeBuilder::OptOutput<%s>" % cpp_name
     445                return "Inspector::Protocol::OptOutput<%s>" % cpp_name
    446446            else:
    447447                return cpp_name
    … …  
    450450                return 'Inspector%sBackendDispatcherHandler::%s' % (_type.type_domain().domain_name, ucfirst(parameter.parameter_name))
    451451            else:
    452                 return 'Inspector::TypeBuilder::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
     452                return 'Inspector::Protocol::%s::%s' % (_type.type_domain().domain_name, _type.raw_name())
    453453
    454454    @staticmethod
    … …  
    456456
    457457        def assertion_method_for_type(_type):
    458             return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.type_builder_string_for_type(_type)
     458            return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.protocol_type_string_for_type(_type)
    459459
    460460        if isinstance(type_member.type, AliasedType):
    461461            return assertion_method_for_type(type_member.type.aliased_type)
    462462        if isinstance(type_member.type, EnumType) and type_member.type.is_anonymous:
    463             return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.type_builder_string_for_type_member(type_member, object_declaration)
     463            return 'BindingTraits<%s>::assertValueHasExpectedType' % Generator.protocol_type_string_for_type_member(type_member, object_declaration)
    464464
    465465        return assertion_method_for_type(type_member.type)

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py

    r172655 r172930  
    207207};""")
    208208
    209     TypeBuilderDeclarationPrelude = (
     209    ProtocolObjectBuilderDeclarationPrelude = (
    210210"""    template<int STATE>
    211211    class Builder {
    … …  
    226226    public:""")
    227227
    228     TypeBuilderDeclarationPostlude = (
     228    ProtocolObjectBuilderDeclarationPostlude = (
    229229"""
    230230        operator RefPtr<${objectType}>& ()
    … …  
    249249        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    250250    }
    251     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;""")
    252 
    253     TypeBuilderObjectRuntimeCast = (
     251    typedef Inspector::Protocol::StructItemTraits ItemTraits;""")
     252
     253    ProtocolObjectRuntimeCast = (
    254254"""PassRefPtr<${objectType}> BindingTraits<${objectType}>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
    255255{

  • trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

    r172655 r172930  
    5656    from generate_frontend_dispatcher_header import *
    5757    from generate_frontend_dispatcher_implementation import *
    58     from generate_type_builder_header import *
    59     from generate_type_builder_implementation import *
     58    from generate_protocol_types_header import *
     59    from generate_protocol_types_implementation import *
    6060
    6161
    … …  
    124124    generators.append(FrontendDispatcherHeaderGenerator(protocol, primary_specification_filepath))
    125125    generators.append(FrontendDispatcherImplementationGenerator(protocol, primary_specification_filepath))
    126     generators.append(TypeBuilderHeaderGenerator(protocol, primary_specification_filepath))
    127     generators.append(TypeBuilderImplementationGenerator(protocol, primary_specification_filepath))
     126    generators.append(ProtocolTypesHeaderGenerator(protocol, primary_specification_filepath))
     127    generators.append(ProtocolTypesImplementationGenerator(protocol, primary_specification_filepath))
    128128
    129129    single_output_file_contents = []

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result

    r172687 r172930  
    7575#if ENABLE(INSPECTOR)
    7676
    77 #include "InspectorTestTypeBuilders.h"
     77#include "InspectorTestProtocolTypes.h"
    7878#include <inspector/InspectorBackendDispatcher.h>
    7979#include <wtf/PassRefPtr.h>
    … …  
    100100        Black = 6,
    101101    }; // enum class PrintColor
    102     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;
     102    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;
    103103    class ExecuteSQLAsyncOptionalReturnValuesCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
    104104    public:
    105105        ExecuteSQLAsyncOptionalReturnValuesCallback(PassRefPtr<Inspector::InspectorBackendDispatcher>, int id);
    106         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);
     106        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);
    107107    };
    108108    virtual void executeSQLAsyncOptionalReturnValues(ErrorString*, int in_databaseId, const String& in_query, PassRefPtr<ExecuteSQLAsyncOptionalReturnValuesCallback> callback) = 0;
    109     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;
     109    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;
    110110    class ExecuteSQLAsyncCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
    111111    public:
    112112        ExecuteSQLAsyncCallback(PassRefPtr<Inspector::InspectorBackendDispatcher>, int id);
    113         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);
     113        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);
    114114    };
    115115    virtual void executeSQLAsync(ErrorString*, int in_databaseId, const String& in_query, PassRefPtr<ExecuteSQLAsyncCallback> callback) = 0;
    … …  
    233233    ErrorString error;
    234234    RefPtr<InspectorObject> result = InspectorObject::create();
    235     RefPtr<Inspector::TypeBuilder::Array<String>> out_columnNames;
    236     Inspector::TypeBuilder::OptOutput<String> out_notes;
    237     Inspector::TypeBuilder::OptOutput<double> out_timestamp;
    238     Inspector::TypeBuilder::OptOutput<Inspector::InspectorObject> out_values;
    239     Inspector::TypeBuilder::OptOutput<Inspector::InspectorValue> out_payload;
    240     Inspector::TypeBuilder::OptOutput<Inspector::TypeBuilder::Database::DatabaseId> out_databaseId;
    241     RefPtr<Inspector::TypeBuilder::Database::Error> out_sqlError;
    242     Inspector::TypeBuilder::Database::PrimaryColors out_screenColor;
     235    RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
     236    Inspector::Protocol::OptOutput<String> out_notes;
     237    Inspector::Protocol::OptOutput<double> out_timestamp;
     238    Inspector::Protocol::OptOutput<Inspector::InspectorObject> out_values;
     239    Inspector::Protocol::OptOutput<Inspector::InspectorValue> out_payload;
     240    Inspector::Protocol::OptOutput<Inspector::Protocol::Database::DatabaseId> out_databaseId;
     241    RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
     242    Inspector::Protocol::Database::PrimaryColors out_screenColor;
    243243    InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
    244244    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);
    … …  
    269269InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::ExecuteSQLAsyncOptionalReturnValuesCallback(PassRefPtr<InspectorBackendDispatcher> backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(backendDispatcher, id) { }
    270270
    271 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)
     271void 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)
    272272{
    273273    RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
    … …  
    335335    ErrorString error;
    336336    RefPtr<InspectorObject> result = InspectorObject::create();
    337     RefPtr<Inspector::TypeBuilder::Array<String>> out_columnNames;
     337    RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
    338338    String out_notes;
    339339    double out_timestamp;
    340340    Inspector::InspectorObject out_values;
    341341    Inspector::InspectorValue out_payload;
    342     Inspector::TypeBuilder::Database::DatabaseId out_databaseId;
    343     RefPtr<Inspector::TypeBuilder::Database::Error> out_sqlError;
    344     Inspector::TypeBuilder::Database::PrimaryColors out_screenColor;
     342    Inspector::Protocol::Database::DatabaseId out_databaseId;
     343    RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
     344    Inspector::Protocol::Database::PrimaryColors out_screenColor;
    345345    InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
    346346    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);
    … …  
    354354        result->setNumber(ASCIILiteral("databaseId"), out_databaseId);
    355355        result->setObject(ASCIILiteral("sqlError"), out_sqlError);
    356         result->setString(ASCIILiteral("screenColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_screenColor));
    357         result->setString(ASCIILiteral("printColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_printColor));
     356        result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(out_screenColor));
     357        result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(out_printColor));
    358358    }
    359359    m_backendDispatcher->sendResponse(callId, result.release(), error);
    … …  
    362362InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::ExecuteSQLAsyncCallback(PassRefPtr<InspectorBackendDispatcher> backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(backendDispatcher, id) { }
    363363
    364 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)
     364void 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)
    365365{
    366366    RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
    … …  
    372372    jsonMessage->setNumber(ASCIILiteral("databaseId"), databaseId);
    373373    jsonMessage->setObject(ASCIILiteral("sqlError"), sqlError);
    374     jsonMessage->setString(ASCIILiteral("screenColor"), Inspector::TypeBuilder::getTestEnumConstantValue(screenColor));
    375     jsonMessage->setString(ASCIILiteral("printColor"), Inspector::TypeBuilder::getTestEnumConstantValue(printColor));
     374    jsonMessage->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(screenColor));
     375    jsonMessage->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(printColor));
    376376    sendIfActive(jsonMessage, ErrorString());
    377377}
    … …  
    446446#if ENABLE(INSPECTOR)
    447447
    448 #include "InspectorTestTypeBuilders.h"
     448#include "InspectorTestProtocolTypes.h"
    449449#include <inspector/InspectorFrontendChannel.h>
    450450#include <inspector/InspectorValues.h>
    … …  
    509509### End File: InspectorTestFrontendDispatchers.cpp
    510510
    511 ### Begin File: InspectorTestTypeBuilders.h
     511### Begin File: InspectorTestProtocolTypes.h
    512512/*
    513513 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    540540// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    541541
    542 #ifndef InspectorTestTypeBuilders_h
    543 #define InspectorTestTypeBuilders_h
     542#ifndef InspectorTestProtocolTypes_h
     543#define InspectorTestProtocolTypes_h
    544544
    545545#if ENABLE(INSPECTOR)
    546546
    547 #include <inspector/InspectorJSTypeBuilders.h>
    548 #include <inspector/InspectorTypeBuilder.h>
     547#include <inspector/InspectorJSProtocolTypes.h>
     548#include <inspector/InspectorProtocolTypes.h>
    549549#include <wtf/Assertions.h>
    550550#include <wtf/PassRefPtr.h>
    … …  
    554554
    555555
    556 namespace TypeBuilder {
     556namespace Protocol {
    557557
    558558// Forward declarations.
    … …  
    655655        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    656656    }
    657     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
     657    typedef Inspector::Protocol::StructItemTraits ItemTraits;
    658658};
    659659
    … …  
    663663
    664664
    665 } // namespace TypeBuilder
     665} // namespace Protocol
    666666
    667667} // namespace Inspector
    … …  
    669669#endif // ENABLE(INSPECTOR)
    670670
    671 #endif // !defined(InspectorTestTypeBuilders_h)
    672 ### End File: InspectorTestTypeBuilders.h
    673 
    674 ### Begin File: InspectorTestTypeBuilders.cpp
     671#endif // !defined(InspectorTestProtocolTypes_h)
     672### End File: InspectorTestProtocolTypes.h
     673
     674### Begin File: InspectorTestProtocolTypes.cpp
    675675/*
    676676 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    704704
    705705#include "config.h"
    706 #include "InspectorTestTypeBuilders.h"
     706#include "InspectorTestProtocolTypes.h"
    707707
    708708#if ENABLE(INSPECTOR)
    … …  
    712712namespace Inspector {
    713713
    714 namespace TypeBuilder {
     714namespace Protocol {
    715715
    716716static const char* const enum_constant_values[] = {
    … …  
    730730
    731731
    732 } // namespace TypeBuilder
     732} // namespace Protocol
    733733
    734734} // namespace Inspector
    … …  
    736736#endif // ENABLE(INSPECTOR)
    737737
    738 ### End File: InspectorTestTypeBuilders.cpp
     738### End File: InspectorTestProtocolTypes.cpp

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result

    r172687 r172930  
    7272#if ENABLE(INSPECTOR)
    7373
    74 #include "InspectorTestTypeBuilders.h"
     74#include "InspectorTestProtocolTypes.h"
    7575#include <inspector/InspectorBackendDispatcher.h>
    7676#include <wtf/PassRefPtr.h>
    … …  
    9797        Black = 6,
    9898    }; // enum class PrintColor
    99     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;
    100     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;
     99    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;
     100    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;
    101101protected:
    102102    virtual ~InspectorDatabaseBackendDispatcherHandler();
    … …  
    207207    String in_notes = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("notes"), &notes_valueFound, protocolErrorsPtr);
    208208    bool timestamp_valueFound = false;
    209     Inspector::TypeBuilder::OptOutput<double> in_timestamp = InspectorBackendDispatcher::getNumber(paramsContainerPtr, ASCIILiteral("timestamp"), &timestamp_valueFound, protocolErrorsPtr);
     209    Inspector::Protocol::OptOutput<double> in_timestamp = InspectorBackendDispatcher::getNumber(paramsContainerPtr, ASCIILiteral("timestamp"), &timestamp_valueFound, protocolErrorsPtr);
    210210    bool values_valueFound = false;
    211211    RefPtr<Inspector::InspectorObject> in_values = InspectorBackendDispatcher::getObject(paramsContainerPtr, ASCIILiteral("values"), &values_valueFound, protocolErrorsPtr);
    … …  
    228228    ErrorString error;
    229229    RefPtr<InspectorObject> result = InspectorObject::create();
    230     RefPtr<Inspector::TypeBuilder::Array<String>> out_columnNames;
    231     Inspector::TypeBuilder::OptOutput<String> out_notes;
    232     Inspector::TypeBuilder::OptOutput<double> out_timestamp;
    233     Inspector::TypeBuilder::OptOutput<Inspector::InspectorObject> out_values;
    234     Inspector::TypeBuilder::OptOutput<Inspector::InspectorValue> out_payload;
    235     Inspector::TypeBuilder::OptOutput<Inspector::TypeBuilder::Database::DatabaseId> out_databaseId;
    236     RefPtr<Inspector::TypeBuilder::Database::Error> out_sqlError;
    237     Inspector::TypeBuilder::Database::PrimaryColors out_screenColor;
     230    RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
     231    Inspector::Protocol::OptOutput<String> out_notes;
     232    Inspector::Protocol::OptOutput<double> out_timestamp;
     233    Inspector::Protocol::OptOutput<Inspector::InspectorObject> out_values;
     234    Inspector::Protocol::OptOutput<Inspector::InspectorValue> out_payload;
     235    Inspector::Protocol::OptOutput<Inspector::Protocol::Database::DatabaseId> out_databaseId;
     236    RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
     237    Inspector::Protocol::Database::PrimaryColors out_screenColor;
    238238    InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
    239239    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);
    … …  
    285285    ErrorString error;
    286286    RefPtr<InspectorObject> result = InspectorObject::create();
    287     RefPtr<Inspector::TypeBuilder::Array<String>> out_columnNames;
     287    RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
    288288    String out_notes;
    289289    double out_timestamp;
    290290    Inspector::InspectorObject out_values;
    291291    Inspector::InspectorValue out_payload;
    292     Inspector::TypeBuilder::Database::DatabaseId out_databaseId;
    293     RefPtr<Inspector::TypeBuilder::Database::Error> out_sqlError;
    294     Inspector::TypeBuilder::Database::PrimaryColors out_screenColor;
     292    Inspector::Protocol::Database::DatabaseId out_databaseId;
     293    RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
     294    Inspector::Protocol::Database::PrimaryColors out_screenColor;
    295295    InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
    296296    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);
    … …  
    304304        result->setNumber(ASCIILiteral("databaseId"), out_databaseId);
    305305        result->setObject(ASCIILiteral("sqlError"), out_sqlError);
    306         result->setString(ASCIILiteral("screenColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_screenColor));
    307         result->setString(ASCIILiteral("printColor"), Inspector::TypeBuilder::getTestEnumConstantValue(out_printColor));
     306        result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(out_screenColor));
     307        result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(out_printColor));
    308308    }
    309309    m_backendDispatcher->sendResponse(callId, result.release(), error);
    … …  
    353353#if ENABLE(INSPECTOR)
    354354
    355 #include "InspectorTestTypeBuilders.h"
     355#include "InspectorTestProtocolTypes.h"
    356356#include <inspector/InspectorFrontendChannel.h>
    357357#include <inspector/InspectorValues.h>
    … …  
    416416### End File: InspectorTestFrontendDispatchers.cpp
    417417
    418 ### Begin File: InspectorTestTypeBuilders.h
     418### Begin File: InspectorTestProtocolTypes.h
    419419/*
    420420 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    447447// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    448448
    449 #ifndef InspectorTestTypeBuilders_h
    450 #define InspectorTestTypeBuilders_h
     449#ifndef InspectorTestProtocolTypes_h
     450#define InspectorTestProtocolTypes_h
    451451
    452452#if ENABLE(INSPECTOR)
    453453
    454 #include <inspector/InspectorJSTypeBuilders.h>
    455 #include <inspector/InspectorTypeBuilder.h>
     454#include <inspector/InspectorJSProtocolTypes.h>
     455#include <inspector/InspectorProtocolTypes.h>
    456456#include <wtf/Assertions.h>
    457457#include <wtf/PassRefPtr.h>
    … …  
    461461
    462462
    463 namespace TypeBuilder {
     463namespace Protocol {
    464464
    465465// Forward declarations.
    … …  
    562562        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    563563    }
    564     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
     564    typedef Inspector::Protocol::StructItemTraits ItemTraits;
    565565};
    566566
    … …  
    570570
    571571
    572 } // namespace TypeBuilder
     572} // namespace Protocol
    573573
    574574} // namespace Inspector
    … …  
    576576#endif // ENABLE(INSPECTOR)
    577577
    578 #endif // !defined(InspectorTestTypeBuilders_h)
    579 ### End File: InspectorTestTypeBuilders.h
    580 
    581 ### Begin File: InspectorTestTypeBuilders.cpp
     578#endif // !defined(InspectorTestProtocolTypes_h)
     579### End File: InspectorTestProtocolTypes.h
     580
     581### Begin File: InspectorTestProtocolTypes.cpp
    582582/*
    583583 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    611611
    612612#include "config.h"
    613 #include "InspectorTestTypeBuilders.h"
     613#include "InspectorTestProtocolTypes.h"
    614614
    615615#if ENABLE(INSPECTOR)
    … …  
    619619namespace Inspector {
    620620
    621 namespace TypeBuilder {
     621namespace Protocol {
    622622
    623623static const char* const enum_constant_values[] = {
    … …  
    637637
    638638
    639 } // namespace TypeBuilder
     639} // namespace Protocol
    640640
    641641} // namespace Inspector
    … …  
    643643#endif // ENABLE(INSPECTOR)
    644644
    645 ### End File: InspectorTestTypeBuilders.cpp
     645### End File: InspectorTestProtocolTypes.cpp

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result

    r172687 r172930  
    7979#if ENABLE(INSPECTOR)
    8080
    81 #include "InspectorTestTypeBuilders.h"
     81#include "InspectorTestProtocolTypes.h"
    8282#include <inspector/InspectorBackendDispatcher.h>
    8383#include <wtf/PassRefPtr.h>
    … …  
    370370#if ENABLE(INSPECTOR)
    371371
    372 #include "InspectorTestTypeBuilders.h"
     372#include "InspectorTestProtocolTypes.h"
    373373#include <inspector/InspectorFrontendChannel.h>
    374374#include <inspector/InspectorValues.h>
    … …  
    433433### End File: InspectorTestFrontendDispatchers.cpp
    434434
    435 ### Begin File: InspectorTestTypeBuilders.h
    436 /*
    437  * Copyright (C) 2013 Google Inc. All rights reserved.
    438  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
    439  * Copyright (C) 2014 University of Washington. All rights reserved.
    440  *
    441  * Redistribution and use in source and binary forms, with or without
    442  * modification, are permitted provided that the following conditions
    443  * are met:
    444  * 1. Redistributions of source code must retain the above copyright
    445  *    notice, this list of conditions and the following disclaimer.
    446  * 2. Redistributions in binary form must reproduce the above copyright
    447  *    notice, this list of conditions and the following disclaimer in the
    448  *    documentation and/or other materials provided with the distribution.
    449  *
    450  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
    451  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
    452  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    453  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
    454  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
    455  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
    456  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
    457  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
    458  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    459  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
    460  * THE POSSIBILITY OF SUCH DAMAGE.
    461  */
    462 
    463 // DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
    464 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    465 
    466 #ifndef InspectorTestTypeBuilders_h
    467 #define InspectorTestTypeBuilders_h
     435### Begin File: InspectorTestProtocolTypes.h
     436/*
     437 * Copyright (C) 2013 Google Inc. All rights reserved.
     438 * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
     439 * Copyright (C) 2014 University of Washington. All rights reserved.
     440 *
     441 * Redistribution and use in source and binary forms, with or without
     442 * modification, are permitted provided that the following conditions
     443 * are met:
     444 * 1. Redistributions of source code must retain the above copyright
     445 *    notice, this list of conditions and the following disclaimer.
     446 * 2. Redistributions in binary form must reproduce the above copyright
     447 *    notice, this list of conditions and the following disclaimer in the
     448 *    documentation and/or other materials provided with the distribution.
     449 *
     450 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
     451 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     452 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     453 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
     454 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     455 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     456 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     457 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     458 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     459 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     460 * THE POSSIBILITY OF SUCH DAMAGE.
     461 */
     462
     463// DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
     464// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
     465
     466#ifndef InspectorTestProtocolTypes_h
     467#define InspectorTestProtocolTypes_h
    468468
    469469#if ENABLE(INSPECTOR)
    470470
    471 #include <inspector/InspectorJSTypeBuilders.h>
    472 #include <inspector/InspectorTypeBuilder.h>
     471#include <inspector/InspectorJSProtocolTypes.h>
     472#include <inspector/InspectorProtocolTypes.h>
    473473#include <wtf/Assertions.h>
    474474#include <wtf/PassRefPtr.h>
    … …  
    478478
    479479
    480 namespace TypeBuilder {
     480namespace Protocol {
    481481
    482482
    … …  
    498498
    499499
    500 } // namespace TypeBuilder
     500} // namespace Protocol
    501501
    502502} // namespace Inspector
    … …  
    504504#endif // ENABLE(INSPECTOR)
    505505
    506 #endif // !defined(InspectorTestTypeBuilders_h)
    507 ### End File: InspectorTestTypeBuilders.h
    508 
    509 ### Begin File: InspectorTestTypeBuilders.cpp
     506#endif // !defined(InspectorTestProtocolTypes_h)
     507### End File: InspectorTestProtocolTypes.h
     508
     509### Begin File: InspectorTestProtocolTypes.cpp
    510510/*
    511511 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    539539
    540540#include "config.h"
    541 #include "InspectorTestTypeBuilders.h"
     541#include "InspectorTestProtocolTypes.h"
    542542
    543543#if ENABLE(INSPECTOR)
    … …  
    547547namespace Inspector {
    548548
    549 namespace TypeBuilder {
     549namespace Protocol {
    550550
    551551static const char* const enum_constant_values[] = {
    … …  
    558558
    559559
    560 } // namespace TypeBuilder
     560} // namespace Protocol
    561561
    562562} // namespace Inspector
    … …  
    564564#endif // ENABLE(INSPECTOR)
    565565
    566 ### End File: InspectorTestTypeBuilders.cpp
     566### End File: InspectorTestProtocolTypes.cpp

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result

    r172687 r172930  
    7272#if ENABLE(INSPECTOR)
    7373
    74 #include "InspectorTestTypeBuilders.h"
     74#include "InspectorTestProtocolTypes.h"
    7575#include <inspector/InspectorBackendDispatcher.h>
    7676#include <wtf/PassRefPtr.h>
    … …  
    174174#if ENABLE(INSPECTOR)
    175175
    176 #include "InspectorTestTypeBuilders.h"
     176#include "InspectorTestProtocolTypes.h"
    177177#include <inspector/InspectorFrontendChannel.h>
    178178#include <inspector/InspectorValues.h>
    … …  
    188188public:
    189189    InspectorDatabaseFrontendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
    190     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);
    191     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);
     190    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);
     191    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);
    192192private:
    193193    InspectorFrontendChannel* m_inspectorFrontendChannel;
    … …  
    243243
    244244#if ENABLE(SQL_DATABASE)
    245 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)
     245void 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)
    246246{
    247247    RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
    … …  
    269269}
    270270
    271 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)
     271void 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)
    272272{
    273273    RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
    … …  
    294294### End File: InspectorTestFrontendDispatchers.cpp
    295295
    296 ### Begin File: InspectorTestTypeBuilders.h
    297 /*
    298  * Copyright (C) 2013 Google Inc. All rights reserved.
    299  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
    300  * Copyright (C) 2014 University of Washington. All rights reserved.
    301  *
    302  * Redistribution and use in source and binary forms, with or without
    303  * modification, are permitted provided that the following conditions
    304  * are met:
    305  * 1. Redistributions of source code must retain the above copyright
    306  *    notice, this list of conditions and the following disclaimer.
    307  * 2. Redistributions in binary form must reproduce the above copyright
    308  *    notice, this list of conditions and the following disclaimer in the
    309  *    documentation and/or other materials provided with the distribution.
    310  *
    311  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
    312  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
    313  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    314  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
    315  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
    316  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
    317  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
    318  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
    319  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    320  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
    321  * THE POSSIBILITY OF SUCH DAMAGE.
    322  */
    323 
    324 // DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
    325 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    326 
    327 #ifndef InspectorTestTypeBuilders_h
    328 #define InspectorTestTypeBuilders_h
     296### Begin File: InspectorTestProtocolTypes.h
     297/*
     298 * Copyright (C) 2013 Google Inc. All rights reserved.
     299 * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
     300 * Copyright (C) 2014 University of Washington. All rights reserved.
     301 *
     302 * Redistribution and use in source and binary forms, with or without
     303 * modification, are permitted provided that the following conditions
     304 * are met:
     305 * 1. Redistributions of source code must retain the above copyright
     306 *    notice, this list of conditions and the following disclaimer.
     307 * 2. Redistributions in binary form must reproduce the above copyright
     308 *    notice, this list of conditions and the following disclaimer in the
     309 *    documentation and/or other materials provided with the distribution.
     310 *
     311 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
     312 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     313 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     314 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
     315 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     316 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     317 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     318 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     319 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     320 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     321 * THE POSSIBILITY OF SUCH DAMAGE.
     322 */
     323
     324// DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
     325// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
     326
     327#ifndef InspectorTestProtocolTypes_h
     328#define InspectorTestProtocolTypes_h
    329329
    330330#if ENABLE(INSPECTOR)
    331331
    332 #include <inspector/InspectorJSTypeBuilders.h>
    333 #include <inspector/InspectorTypeBuilder.h>
     332#include <inspector/InspectorJSProtocolTypes.h>
     333#include <inspector/InspectorProtocolTypes.h>
    334334#include <wtf/Assertions.h>
    335335#include <wtf/PassRefPtr.h>
    … …  
    339339
    340340
    341 namespace TypeBuilder {
     341namespace Protocol {
    342342
    343343// Forward declarations.
    … …  
    435435        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    436436    }
    437     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
     437    typedef Inspector::Protocol::StructItemTraits ItemTraits;
    438438};
    439439
    … …  
    443443
    444444
    445 } // namespace TypeBuilder
     445} // namespace Protocol
    446446
    447447} // namespace Inspector
    … …  
    449449#endif // ENABLE(INSPECTOR)
    450450
    451 #endif // !defined(InspectorTestTypeBuilders_h)
    452 ### End File: InspectorTestTypeBuilders.h
    453 
    454 ### Begin File: InspectorTestTypeBuilders.cpp
     451#endif // !defined(InspectorTestProtocolTypes_h)
     452### End File: InspectorTestProtocolTypes.h
     453
     454### Begin File: InspectorTestProtocolTypes.cpp
    455455/*
    456456 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    484484
    485485#include "config.h"
    486 #include "InspectorTestTypeBuilders.h"
     486#include "InspectorTestProtocolTypes.h"
    487487
    488488#if ENABLE(INSPECTOR)
    … …  
    492492namespace Inspector {
    493493
    494 namespace TypeBuilder {
     494namespace Protocol {
    495495
    496496static const char* const enum_constant_values[] = {
    … …  
    503503
    504504
    505 } // namespace TypeBuilder
     505} // namespace Protocol
    506506
    507507} // namespace Inspector
    … …  
    509509#endif // ENABLE(INSPECTOR)
    510510
    511 ### End File: InspectorTestTypeBuilders.cpp
     511### End File: InspectorTestProtocolTypes.cpp

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result

    r172687 r172930  
    6767#if ENABLE(INSPECTOR)
    6868
    69 #include "InspectorTestTypeBuilders.h"
     69#include "InspectorTestProtocolTypes.h"
    7070#include <inspector/InspectorBackendDispatcher.h>
    7171#include <wtf/PassRefPtr.h>
    … …  
    169169#if ENABLE(INSPECTOR)
    170170
    171 #include "InspectorTestTypeBuilders.h"
     171#include "InspectorTestProtocolTypes.h"
    172172#include <inspector/InspectorFrontendChannel.h>
    173173#include <inspector/InspectorValues.h>
    … …  
    232232### End File: InspectorTestFrontendDispatchers.cpp
    233233
    234 ### Begin File: InspectorTestTypeBuilders.h
    235 /*
    236  * Copyright (C) 2013 Google Inc. All rights reserved.
    237  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
    238  * Copyright (C) 2014 University of Washington. All rights reserved.
    239  *
    240  * Redistribution and use in source and binary forms, with or without
    241  * modification, are permitted provided that the following conditions
    242  * are met:
    243  * 1. Redistributions of source code must retain the above copyright
    244  *    notice, this list of conditions and the following disclaimer.
    245  * 2. Redistributions in binary form must reproduce the above copyright
    246  *    notice, this list of conditions and the following disclaimer in the
    247  *    documentation and/or other materials provided with the distribution.
    248  *
    249  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
    250  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
    251  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    252  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
    253  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
    254  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
    255  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
    256  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
    257  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    258  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
    259  * THE POSSIBILITY OF SUCH DAMAGE.
    260  */
    261 
    262 // DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
    263 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    264 
    265 #ifndef InspectorTestTypeBuilders_h
    266 #define InspectorTestTypeBuilders_h
    267 
    268 #if ENABLE(INSPECTOR)
    269 
    270 #include <inspector/InspectorJSTypeBuilders.h>
    271 #include <inspector/InspectorTypeBuilder.h>
     234### Begin File: InspectorTestProtocolTypes.h
     235/*
     236 * Copyright (C) 2013 Google Inc. All rights reserved.
     237 * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
     238 * Copyright (C) 2014 University of Washington. All rights reserved.
     239 *
     240 * Redistribution and use in source and binary forms, with or without
     241 * modification, are permitted provided that the following conditions
     242 * are met:
     243 * 1. Redistributions of source code must retain the above copyright
     244 *    notice, this list of conditions and the following disclaimer.
     245 * 2. Redistributions in binary form must reproduce the above copyright
     246 *    notice, this list of conditions and the following disclaimer in the
     247 *    documentation and/or other materials provided with the distribution.
     248 *
     249 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
     250 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     251 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     252 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
     253 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     254 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     255 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     256 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     257 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     258 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     259 * THE POSSIBILITY OF SUCH DAMAGE.
     260 */
     261
     262// DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
     263// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
     264
     265#ifndef InspectorTestProtocolTypes_h
     266#define InspectorTestProtocolTypes_h
     267
     268#if ENABLE(INSPECTOR)
     269
     270#include <inspector/InspectorJSProtocolTypes.h>
     271#include <inspector/InspectorProtocolTypes.h>
    272272#include <wtf/Assertions.h>
    273273#include <wtf/PassRefPtr.h>
    … …  
    277277
    278278
    279 namespace TypeBuilder {
     279namespace Protocol {
    280280
    281281
    … …  
    302302
    303303
    304 } // namespace TypeBuilder
    305 
    306 } // namespace Inspector
    307 
    308 #endif // ENABLE(INSPECTOR)
    309 
    310 #endif // !defined(InspectorTestTypeBuilders_h)
    311 ### End File: InspectorTestTypeBuilders.h
    312 
    313 ### Begin File: InspectorTestTypeBuilders.cpp
     304} // namespace Protocol
     305
     306} // namespace Inspector
     307
     308#endif // ENABLE(INSPECTOR)
     309
     310#endif // !defined(InspectorTestProtocolTypes_h)
     311### End File: InspectorTestProtocolTypes.h
     312
     313### Begin File: InspectorTestProtocolTypes.cpp
    314314/*
    315315 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    343343
    344344#include "config.h"
    345 #include "InspectorTestTypeBuilders.h"
     345#include "InspectorTestProtocolTypes.h"
    346346
    347347#if ENABLE(INSPECTOR)
    … …  
    351351namespace Inspector {
    352352
    353 namespace TypeBuilder {
     353namespace Protocol {
    354354
    355355static const char* const enum_constant_values[] = {
    … …  
    362362
    363363
    364 } // namespace TypeBuilder
    365 
    366 } // namespace Inspector
    367 
    368 #endif // ENABLE(INSPECTOR)
    369 
    370 ### End File: InspectorTestTypeBuilders.cpp
     364} // namespace Protocol
     365
     366} // namespace Inspector
     367
     368#endif // ENABLE(INSPECTOR)
     369
     370### End File: InspectorTestProtocolTypes.cpp

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result

    r172687 r172930  
    6767#if ENABLE(INSPECTOR)
    6868
    69 #include "InspectorTestTypeBuilders.h"
     69#include "InspectorTestProtocolTypes.h"
    7070#include <inspector/InspectorBackendDispatcher.h>
    7171#include <wtf/PassRefPtr.h>
    … …  
    169169#if ENABLE(INSPECTOR)
    170170
    171 #include "InspectorTestTypeBuilders.h"
     171#include "InspectorTestProtocolTypes.h"
    172172#include <inspector/InspectorFrontendChannel.h>
    173173#include <inspector/InspectorValues.h>
    … …  
    232232### End File: InspectorTestFrontendDispatchers.cpp
    233233
    234 ### Begin File: InspectorTestTypeBuilders.h
    235 /*
    236  * Copyright (C) 2013 Google Inc. All rights reserved.
    237  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
    238  * Copyright (C) 2014 University of Washington. All rights reserved.
    239  *
    240  * Redistribution and use in source and binary forms, with or without
    241  * modification, are permitted provided that the following conditions
    242  * are met:
    243  * 1. Redistributions of source code must retain the above copyright
    244  *    notice, this list of conditions and the following disclaimer.
    245  * 2. Redistributions in binary form must reproduce the above copyright
    246  *    notice, this list of conditions and the following disclaimer in the
    247  *    documentation and/or other materials provided with the distribution.
    248  *
    249  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
    250  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
    251  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    252  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
    253  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
    254  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
    255  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
    256  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
    257  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    258  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
    259  * THE POSSIBILITY OF SUCH DAMAGE.
    260  */
    261 
    262 // DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
    263 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    264 
    265 #ifndef InspectorTestTypeBuilders_h
    266 #define InspectorTestTypeBuilders_h
    267 
    268 #if ENABLE(INSPECTOR)
    269 
    270 #include <inspector/InspectorJSTypeBuilders.h>
    271 #include <inspector/InspectorTypeBuilder.h>
     234### Begin File: InspectorTestProtocolTypes.h
     235/*
     236 * Copyright (C) 2013 Google Inc. All rights reserved.
     237 * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
     238 * Copyright (C) 2014 University of Washington. All rights reserved.
     239 *
     240 * Redistribution and use in source and binary forms, with or without
     241 * modification, are permitted provided that the following conditions
     242 * are met:
     243 * 1. Redistributions of source code must retain the above copyright
     244 *    notice, this list of conditions and the following disclaimer.
     245 * 2. Redistributions in binary form must reproduce the above copyright
     246 *    notice, this list of conditions and the following disclaimer in the
     247 *    documentation and/or other materials provided with the distribution.
     248 *
     249 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
     250 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     251 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     252 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
     253 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     254 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     255 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     256 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     257 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     258 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     259 * THE POSSIBILITY OF SUCH DAMAGE.
     260 */
     261
     262// DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
     263// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
     264
     265#ifndef InspectorTestProtocolTypes_h
     266#define InspectorTestProtocolTypes_h
     267
     268#if ENABLE(INSPECTOR)
     269
     270#include <inspector/InspectorJSProtocolTypes.h>
     271#include <inspector/InspectorProtocolTypes.h>
    272272#include <wtf/Assertions.h>
    273273#include <wtf/PassRefPtr.h>
    … …  
    277277
    278278
    279 namespace TypeBuilder {
     279namespace Protocol {
    280280
    281281// Forward declarations.
    … …  
    332332        {
    333333            COMPILE_ASSERT(!(STATE & TypeSet), property_type_already_set);
    334             m_result->setString(ASCIILiteral("type"), Inspector::TypeBuilder::getTestEnumConstantValue(static_cast<int>(value)));
     334            m_result->setString(ASCIILiteral("type"), Inspector::Protocol::getTestEnumConstantValue(static_cast<int>(value)));
    335335            return castState<TypeSet>();
    336336        }
    … …  
    358358        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    359359    }
    360     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
     360    typedef Inspector::Protocol::StructItemTraits ItemTraits;
    361361
    362362    void setString(const String& value)
    … …  
    365365    }
    366366
    367     void setArray(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
     367    void setArray(PassRefPtr<Inspector::Protocol::Array<String>> value)
    368368    {
    369369        InspectorObjectBase::setArray(ASCIILiteral("array"), value);
    … …  
    375375
    376376
    377 } // namespace TypeBuilder
    378 
    379 } // namespace Inspector
    380 
    381 #endif // ENABLE(INSPECTOR)
    382 
    383 #endif // !defined(InspectorTestTypeBuilders_h)
    384 ### End File: InspectorTestTypeBuilders.h
    385 
    386 ### Begin File: InspectorTestTypeBuilders.cpp
     377} // namespace Protocol
     378
     379} // namespace Inspector
     380
     381#endif // ENABLE(INSPECTOR)
     382
     383#endif // !defined(InspectorTestProtocolTypes_h)
     384### End File: InspectorTestProtocolTypes.h
     385
     386### Begin File: InspectorTestProtocolTypes.cpp
    387387/*
    388388 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    416416
    417417#include "config.h"
    418 #include "InspectorTestTypeBuilders.h"
     418#include "InspectorTestProtocolTypes.h"
    419419
    420420#if ENABLE(INSPECTOR)
    … …  
    424424namespace Inspector {
    425425
    426 namespace TypeBuilder {
     426namespace Protocol {
    427427
    428428static const char* const enum_constant_values[] = {
    … …  
    438438
    439439
    440 } // namespace TypeBuilder
    441 
    442 } // namespace Inspector
    443 
    444 #endif // ENABLE(INSPECTOR)
    445 
    446 ### End File: InspectorTestTypeBuilders.cpp
     440} // namespace Protocol
     441
     442} // namespace Inspector
     443
     444#endif // ENABLE(INSPECTOR)
     445
     446### End File: InspectorTestProtocolTypes.cpp

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result

    r172687 r172930  
    6767#if ENABLE(INSPECTOR)
    6868
    69 #include "InspectorTestTypeBuilders.h"
     69#include "InspectorTestProtocolTypes.h"
    7070#include <inspector/InspectorBackendDispatcher.h>
    7171#include <wtf/PassRefPtr.h>
    … …  
    169169#if ENABLE(INSPECTOR)
    170170
    171 #include "InspectorTestTypeBuilders.h"
     171#include "InspectorTestProtocolTypes.h"
    172172#include <inspector/InspectorFrontendChannel.h>
    173173#include <inspector/InspectorValues.h>
    … …  
    232232### End File: InspectorTestFrontendDispatchers.cpp
    233233
    234 ### Begin File: InspectorTestTypeBuilders.h
    235 /*
    236  * Copyright (C) 2013 Google Inc. All rights reserved.
    237  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
    238  * Copyright (C) 2014 University of Washington. All rights reserved.
    239  *
    240  * Redistribution and use in source and binary forms, with or without
    241  * modification, are permitted provided that the following conditions
    242  * are met:
    243  * 1. Redistributions of source code must retain the above copyright
    244  *    notice, this list of conditions and the following disclaimer.
    245  * 2. Redistributions in binary form must reproduce the above copyright
    246  *    notice, this list of conditions and the following disclaimer in the
    247  *    documentation and/or other materials provided with the distribution.
    248  *
    249  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
    250  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
    251  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    252  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
    253  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
    254  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
    255  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
    256  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
    257  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    258  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
    259  * THE POSSIBILITY OF SUCH DAMAGE.
    260  */
    261 
    262 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
    263 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    264 
    265 #ifndef InspectorTestTypeBuilders_h
    266 #define InspectorTestTypeBuilders_h
    267 
    268 #if ENABLE(INSPECTOR)
    269 
    270 #include <inspector/InspectorJSTypeBuilders.h>
    271 #include <inspector/InspectorTypeBuilder.h>
     234### Begin File: InspectorTestProtocolTypes.h
     235/*
     236 * Copyright (C) 2013 Google Inc. All rights reserved.
     237 * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
     238 * Copyright (C) 2014 University of Washington. All rights reserved.
     239 *
     240 * Redistribution and use in source and binary forms, with or without
     241 * modification, are permitted provided that the following conditions
     242 * are met:
     243 * 1. Redistributions of source code must retain the above copyright
     244 *    notice, this list of conditions and the following disclaimer.
     245 * 2. Redistributions in binary form must reproduce the above copyright
     246 *    notice, this list of conditions and the following disclaimer in the
     247 *    documentation and/or other materials provided with the distribution.
     248 *
     249 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
     250 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     251 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     252 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
     253 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     254 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     255 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     256 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     257 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     258 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     259 * THE POSSIBILITY OF SUCH DAMAGE.
     260 */
     261
     262// DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
     263// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
     264
     265#ifndef InspectorTestProtocolTypes_h
     266#define InspectorTestProtocolTypes_h
     267
     268#if ENABLE(INSPECTOR)
     269
     270#include <inspector/InspectorJSProtocolTypes.h>
     271#include <inspector/InspectorProtocolTypes.h>
    272272#include <wtf/Assertions.h>
    273273#include <wtf/PassRefPtr.h>
    … …  
    277277
    278278
    279 namespace TypeBuilder {
     279namespace Protocol {
    280280
    281281
    … …  
    297297
    298298
    299 } // namespace TypeBuilder
    300 
    301 } // namespace Inspector
    302 
    303 #endif // ENABLE(INSPECTOR)
    304 
    305 #endif // !defined(InspectorTestTypeBuilders_h)
    306 ### End File: InspectorTestTypeBuilders.h
    307 
    308 ### Begin File: InspectorTestTypeBuilders.cpp
     299} // namespace Protocol
     300
     301} // namespace Inspector
     302
     303#endif // ENABLE(INSPECTOR)
     304
     305#endif // !defined(InspectorTestProtocolTypes_h)
     306### End File: InspectorTestProtocolTypes.h
     307
     308### Begin File: InspectorTestProtocolTypes.cpp
    309309/*
    310310 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    338338
    339339#include "config.h"
    340 #include "InspectorTestTypeBuilders.h"
     340#include "InspectorTestProtocolTypes.h"
    341341
    342342#if ENABLE(INSPECTOR)
    … …  
    346346namespace Inspector {
    347347
    348 namespace TypeBuilder {
     348namespace Protocol {
    349349
    350350static const char* const enum_constant_values[] = {
    … …  
    357357
    358358
    359 } // namespace TypeBuilder
    360 
    361 } // namespace Inspector
    362 
    363 #endif // ENABLE(INSPECTOR)
    364 
    365 ### End File: InspectorTestTypeBuilders.cpp
     359} // namespace Protocol
     360
     361} // namespace Inspector
     362
     363#endif // ENABLE(INSPECTOR)
     364
     365### End File: InspectorTestProtocolTypes.cpp

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result

    r172687 r172930  
    7070#if ENABLE(INSPECTOR)
    7171
    72 #include "InspectorTestTypeBuilders.h"
     72#include "InspectorTestProtocolTypes.h"
    7373#include <inspector/InspectorBackendDispatcher.h>
    7474#include <wtf/PassRefPtr.h>
    … …  
    172172#if ENABLE(INSPECTOR)
    173173
    174 #include "InspectorTestTypeBuilders.h"
     174#include "InspectorTestProtocolTypes.h"
    175175#include <inspector/InspectorFrontendChannel.h>
    176176#include <inspector/InspectorValues.h>
    … …  
    235235### End File: InspectorTestFrontendDispatchers.cpp
    236236
    237 ### Begin File: InspectorTestTypeBuilders.h
    238 /*
    239  * Copyright (C) 2013 Google Inc. All rights reserved.
    240  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
    241  * Copyright (C) 2014 University of Washington. All rights reserved.
    242  *
    243  * Redistribution and use in source and binary forms, with or without
    244  * modification, are permitted provided that the following conditions
    245  * are met:
    246  * 1. Redistributions of source code must retain the above copyright
    247  *    notice, this list of conditions and the following disclaimer.
    248  * 2. Redistributions in binary form must reproduce the above copyright
    249  *    notice, this list of conditions and the following disclaimer in the
    250  *    documentation and/or other materials provided with the distribution.
    251  *
    252  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
    253  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
    254  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    255  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
    256  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
    257  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
    258  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
    259  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
    260  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    261  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
    262  * THE POSSIBILITY OF SUCH DAMAGE.
    263  */
    264 
    265 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
    266 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    267 
    268 #ifndef InspectorTestTypeBuilders_h
    269 #define InspectorTestTypeBuilders_h
    270 
    271 #if ENABLE(INSPECTOR)
    272 
    273 #include <inspector/InspectorJSTypeBuilders.h>
    274 #include <inspector/InspectorTypeBuilder.h>
     237### Begin File: InspectorTestProtocolTypes.h
     238/*
     239 * Copyright (C) 2013 Google Inc. All rights reserved.
     240 * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
     241 * Copyright (C) 2014 University of Washington. All rights reserved.
     242 *
     243 * Redistribution and use in source and binary forms, with or without
     244 * modification, are permitted provided that the following conditions
     245 * are met:
     246 * 1. Redistributions of source code must retain the above copyright
     247 *    notice, this list of conditions and the following disclaimer.
     248 * 2. Redistributions in binary form must reproduce the above copyright
     249 *    notice, this list of conditions and the following disclaimer in the
     250 *    documentation and/or other materials provided with the distribution.
     251 *
     252 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
     253 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     254 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     255 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
     256 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     257 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     258 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     259 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     260 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     261 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     262 * THE POSSIBILITY OF SUCH DAMAGE.
     263 */
     264
     265// DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
     266// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
     267
     268#ifndef InspectorTestProtocolTypes_h
     269#define InspectorTestProtocolTypes_h
     270
     271#if ENABLE(INSPECTOR)
     272
     273#include <inspector/InspectorJSProtocolTypes.h>
     274#include <inspector/InspectorProtocolTypes.h>
    275275#include <wtf/Assertions.h>
    276276#include <wtf/PassRefPtr.h>
    … …  
    280280
    281281
    282 namespace TypeBuilder {
     282namespace Protocol {
    283283
    284284// Forward declarations.
    … …  
    317317
    318318
    319 } // namespace TypeBuilder
    320 
    321 } // namespace Inspector
    322 
    323 #endif // ENABLE(INSPECTOR)
    324 
    325 #endif // !defined(InspectorTestTypeBuilders_h)
    326 ### End File: InspectorTestTypeBuilders.h
    327 
    328 ### Begin File: InspectorTestTypeBuilders.cpp
     319} // namespace Protocol
     320
     321} // namespace Inspector
     322
     323#endif // ENABLE(INSPECTOR)
     324
     325#endif // !defined(InspectorTestProtocolTypes_h)
     326### End File: InspectorTestProtocolTypes.h
     327
     328### Begin File: InspectorTestProtocolTypes.cpp
    329329/*
    330330 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    358358
    359359#include "config.h"
    360 #include "InspectorTestTypeBuilders.h"
     360#include "InspectorTestProtocolTypes.h"
    361361
    362362#if ENABLE(INSPECTOR)
    … …  
    366366namespace Inspector {
    367367
    368 namespace TypeBuilder {
     368namespace Protocol {
    369369
    370370static const char* const enum_constant_values[] = {
    … …  
    380380
    381381
    382 } // namespace TypeBuilder
    383 
    384 } // namespace Inspector
    385 
    386 #endif // ENABLE(INSPECTOR)
    387 
    388 ### End File: InspectorTestTypeBuilders.cpp
     382} // namespace Protocol
     383
     384} // namespace Inspector
     385
     386#endif // ENABLE(INSPECTOR)
     387
     388### End File: InspectorTestProtocolTypes.cpp

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result

    r172687 r172930  
    7171#if ENABLE(INSPECTOR)
    7272
    73 #include "InspectorTestTypeBuilders.h"
     73#include "InspectorTestProtocolTypes.h"
    7474#include <inspector/InspectorBackendDispatcher.h>
    7575#include <wtf/PassRefPtr.h>
    … …  
    173173#if ENABLE(INSPECTOR)
    174174
    175 #include "InspectorTestTypeBuilders.h"
     175#include "InspectorTestProtocolTypes.h"
    176176#include <inspector/InspectorFrontendChannel.h>
    177177#include <inspector/InspectorValues.h>
    … …  
    236236### End File: InspectorTestFrontendDispatchers.cpp
    237237
    238 ### Begin File: InspectorTestTypeBuilders.h
    239 /*
    240  * Copyright (C) 2013 Google Inc. All rights reserved.
    241  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
    242  * Copyright (C) 2014 University of Washington. All rights reserved.
    243  *
    244  * Redistribution and use in source and binary forms, with or without
    245  * modification, are permitted provided that the following conditions
    246  * are met:
    247  * 1. Redistributions of source code must retain the above copyright
    248  *    notice, this list of conditions and the following disclaimer.
    249  * 2. Redistributions in binary form must reproduce the above copyright
    250  *    notice, this list of conditions and the following disclaimer in the
    251  *    documentation and/or other materials provided with the distribution.
    252  *
    253  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
    254  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
    255  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    256  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
    257  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
    258  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
    259  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
    260  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
    261  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    262  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
    263  * THE POSSIBILITY OF SUCH DAMAGE.
    264  */
    265 
    266 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
    267 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    268 
    269 #ifndef InspectorTestTypeBuilders_h
    270 #define InspectorTestTypeBuilders_h
    271 
    272 #if ENABLE(INSPECTOR)
    273 
    274 #include <inspector/InspectorJSTypeBuilders.h>
    275 #include <inspector/InspectorTypeBuilder.h>
     238### Begin File: InspectorTestProtocolTypes.h
     239/*
     240 * Copyright (C) 2013 Google Inc. All rights reserved.
     241 * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
     242 * Copyright (C) 2014 University of Washington. All rights reserved.
     243 *
     244 * Redistribution and use in source and binary forms, with or without
     245 * modification, are permitted provided that the following conditions
     246 * are met:
     247 * 1. Redistributions of source code must retain the above copyright
     248 *    notice, this list of conditions and the following disclaimer.
     249 * 2. Redistributions in binary form must reproduce the above copyright
     250 *    notice, this list of conditions and the following disclaimer in the
     251 *    documentation and/or other materials provided with the distribution.
     252 *
     253 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
     254 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
     255 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     256 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
     257 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     258 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     259 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     260 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     261 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     262 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     263 * THE POSSIBILITY OF SUCH DAMAGE.
     264 */
     265
     266// DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
     267// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
     268
     269#ifndef InspectorTestProtocolTypes_h
     270#define InspectorTestProtocolTypes_h
     271
     272#if ENABLE(INSPECTOR)
     273
     274#include <inspector/InspectorJSProtocolTypes.h>
     275#include <inspector/InspectorProtocolTypes.h>
    276276#include <wtf/Assertions.h>
    277277#include <wtf/PassRefPtr.h>
    … …  
    281281
    282282
    283 namespace TypeBuilder {
     283namespace Protocol {
    284284
    285285// Forward declarations.
    … …  
    319319
    320320
    321 } // namespace TypeBuilder
    322 
    323 } // namespace Inspector
    324 
    325 #endif // ENABLE(INSPECTOR)
    326 
    327 #endif // !defined(InspectorTestTypeBuilders_h)
    328 ### End File: InspectorTestTypeBuilders.h
    329 
    330 ### Begin File: InspectorTestTypeBuilders.cpp
     321} // namespace Protocol
     322
     323} // namespace Inspector
     324
     325#endif // ENABLE(INSPECTOR)
     326
     327#endif // !defined(InspectorTestProtocolTypes_h)
     328### End File: InspectorTestProtocolTypes.h
     329
     330### Begin File: InspectorTestProtocolTypes.cpp
    331331/*
    332332 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    360360
    361361#include "config.h"
    362 #include "InspectorTestTypeBuilders.h"
     362#include "InspectorTestProtocolTypes.h"
    363363
    364364#if ENABLE(INSPECTOR)
    … …  
    368368namespace Inspector {
    369369
    370 namespace TypeBuilder {
     370namespace Protocol {
    371371
    372372static const char* const enum_constant_values[] = {
    … …  
    386386
    387387
    388 } // namespace TypeBuilder
    389 
    390 } // namespace Inspector
    391 
    392 #endif // ENABLE(INSPECTOR)
    393 
    394 ### End File: InspectorTestTypeBuilders.cpp
     388} // namespace Protocol
     389
     390} // namespace Inspector
     391
     392#endif // ENABLE(INSPECTOR)
     393
     394### End File: InspectorTestProtocolTypes.cpp

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result

    r172897 r172930  
    6767#if ENABLE(INSPECTOR)
    6868
    69 #include "InspectorTestTypeBuilders.h"
     69#include "InspectorTestProtocolTypes.h"
    7070#include <inspector/InspectorBackendDispatcher.h>
    7171#include <wtf/PassRefPtr.h>
    … …  
    169169#if ENABLE(INSPECTOR)
    170170
    171 #include "InspectorTestTypeBuilders.h"
     171#include "InspectorTestProtocolTypes.h"
    172172#include <inspector/InspectorFrontendChannel.h>
    173173#include <inspector/InspectorValues.h>
    … …  
    232232### End File: InspectorTestFrontendDispatchers.cpp
    233233
    234 ### Begin File: InspectorTestTypeBuilders.h
     234### Begin File: InspectorTestProtocolTypes.h
    235235/*
    236236 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    263263// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    264264
    265 #ifndef InspectorTestTypeBuilders_h
    266 #define InspectorTestTypeBuilders_h
     265#ifndef InspectorTestProtocolTypes_h
     266#define InspectorTestProtocolTypes_h
    267267
    268268#if ENABLE(INSPECTOR)
    269269
    270 #include <inspector/InspectorJSTypeBuilders.h>
    271 #include <inspector/InspectorTypeBuilder.h>
     270#include <inspector/InspectorJSProtocolTypes.h>
     271#include <inspector/InspectorProtocolTypes.h>
    272272#include <wtf/Assertions.h>
    273273#include <wtf/PassRefPtr.h>
    … …  
    277277
    278278
    279 namespace TypeBuilder {
     279namespace Protocol {
    280280
    281281// Forward declarations.
    … …  
    372372        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    373373    }
    374     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
     374    typedef Inspector::Protocol::StructItemTraits ItemTraits;
    375375};
    376376
    … …  
    421421        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    422422    }
    423     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
    424 
    425     void setColumnNames(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
     423    typedef Inspector::Protocol::StructItemTraits ItemTraits;
     424
     425    void setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
    426426    {
    427427        InspectorObjectBase::setArray(ASCIILiteral("columnNames"), value);
    … …  
    448448    }
    449449
    450     void setError(PassRefPtr<Inspector::TypeBuilder::Database::Error> value)
     450    void setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
    451451    {
    452452        InspectorObjectBase::setObject(ASCIILiteral("error"), value);
    … …  
    485485    public:
    486486
    487         Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
     487        Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
    488488        {
    489489            COMPILE_ASSERT(!(STATE & ColumnNamesSet), property_columnNames_already_set);
    … …  
    520520        }
    521521
    522         Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::TypeBuilder::Database::Error> value)
     522        Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
    523523        {
    524524            COMPILE_ASSERT(!(STATE & ErrorSet), property_error_already_set);
    … …  
    554554        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    555555    }
    556     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
     556    typedef Inspector::Protocol::StructItemTraits ItemTraits;
    557557};
    558558
    … …  
    649649        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    650650    }
    651     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
     651    typedef Inspector::Protocol::StructItemTraits ItemTraits;
    652652};
    653653
    … …  
    687687    public:
    688688
    689         Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::TypeBuilder::Array<String>> value)
     689        Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
    690690        {
    691691            COMPILE_ASSERT(!(STATE & ColumnNamesSet), property_columnNames_already_set);
    … …  
    722722        }
    723723
    724         Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::TypeBuilder::Database::Error> value)
     724        Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
    725725        {
    726726            COMPILE_ASSERT(!(STATE & ErrorSet), property_error_already_set);
    … …  
    756756        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    757757    }
    758     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
     758    typedef Inspector::Protocol::StructItemTraits ItemTraits;
    759759};
    760760
    … …  
    763763
    764764
    765 } // namespace TypeBuilder
     765} // namespace Protocol
    766766
    767767} // namespace Inspector
    … …  
    769769#endif // ENABLE(INSPECTOR)
    770770
    771 #endif // !defined(InspectorTestTypeBuilders_h)
    772 ### End File: InspectorTestTypeBuilders.h
    773 
    774 ### Begin File: InspectorTestTypeBuilders.cpp
     771#endif // !defined(InspectorTestProtocolTypes_h)
     772### End File: InspectorTestProtocolTypes.h
     773
     774### Begin File: InspectorTestProtocolTypes.cpp
    775775/*
    776776 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    804804
    805805#include "config.h"
    806 #include "InspectorTestTypeBuilders.h"
     806#include "InspectorTestProtocolTypes.h"
    807807
    808808#if ENABLE(INSPECTOR)
    … …  
    812812namespace Inspector {
    813813
    814 namespace TypeBuilder {
     814namespace Protocol {
    815815
    816816static const char* const enum_constant_values[] = {
    … …  
    823823
    824824
    825 } // namespace TypeBuilder
     825} // namespace Protocol
    826826
    827827} // namespace Inspector
    … …  
    829829#endif // ENABLE(INSPECTOR)
    830830
    831 ### End File: InspectorTestTypeBuilders.cpp
     831### End File: InspectorTestProtocolTypes.cpp

  • trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result

    r172687 r172930  
    7171#if ENABLE(INSPECTOR)
    7272
    73 #include "InspectorTestTypeBuilders.h"
     73#include "InspectorTestProtocolTypes.h"
    7474#include <inspector/InspectorBackendDispatcher.h>
    7575#include <wtf/PassRefPtr.h>
    … …  
    173173#if ENABLE(INSPECTOR)
    174174
    175 #include "InspectorTestTypeBuilders.h"
     175#include "InspectorTestProtocolTypes.h"
    176176#include <inspector/InspectorFrontendChannel.h>
    177177#include <inspector/InspectorValues.h>
    … …  
    236236### End File: InspectorTestFrontendDispatchers.cpp
    237237
    238 ### Begin File: InspectorTestTypeBuilders.h
     238### Begin File: InspectorTestProtocolTypes.h
    239239/*
    240240 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    267267// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
    268268
    269 #ifndef InspectorTestTypeBuilders_h
    270 #define InspectorTestTypeBuilders_h
     269#ifndef InspectorTestProtocolTypes_h
     270#define InspectorTestProtocolTypes_h
    271271
    272272#if ENABLE(INSPECTOR)
    273273
    274 #include <inspector/InspectorJSTypeBuilders.h>
    275 #include <inspector/InspectorTypeBuilder.h>
     274#include <inspector/InspectorJSProtocolTypes.h>
     275#include <inspector/InspectorProtocolTypes.h>
    276276#include <wtf/Assertions.h>
    277277#include <wtf/PassRefPtr.h>
    … …  
    281281
    282282
    283 namespace TypeBuilder {
     283namespace Protocol {
    284284
    285285// Forward declarations.
    … …  
    355355        }
    356356
    357         Builder<STATE | AnimalsSet>& setAnimals(Inspector::TypeBuilder::Test::CastedAnimals value)
     357        Builder<STATE | AnimalsSet>& setAnimals(Inspector::Protocol::Test::CastedAnimals value)
    358358        {
    359359            COMPILE_ASSERT(!(STATE & AnimalsSet), property_animals_already_set);
    360             m_result->setString(ASCIILiteral("animals"), Inspector::TypeBuilder::getTestEnumConstantValue(static_cast<int>(value)));
     360            m_result->setString(ASCIILiteral("animals"), Inspector::Protocol::getTestEnumConstantValue(static_cast<int>(value)));
    361361            return castState<AnimalsSet>();
    362362        }
    … …  
    369369        }
    370370
    371         Builder<STATE | TreeSet>& setTree(PassRefPtr<Inspector::TypeBuilder::Test::RecursiveObject1> value)
     371        Builder<STATE | TreeSet>& setTree(PassRefPtr<Inspector::Protocol::Test::RecursiveObject1> value)
    372372        {
    373373            COMPILE_ASSERT(!(STATE & TreeSet), property_tree_already_set);
    … …  
    402402        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    403403    }
    404     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
     404    typedef Inspector::Protocol::StructItemTraits ItemTraits;
    405405};
    406406
    … …  
    465465        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    466466    }
    467     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
    468 
    469     void setObj(PassRefPtr<Inspector::TypeBuilder::Test::RecursiveObject2> value)
     467    typedef Inspector::Protocol::StructItemTraits ItemTraits;
     468
     469    void setObj(PassRefPtr<Inspector::Protocol::Test::RecursiveObject2> value)
    470470    {
    471471        InspectorObjectBase::setObject(ASCIILiteral("obj"), value);
    … …  
    519519        return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
    520520    }
    521     typedef Inspector::TypeBuilder::StructItemTraits ItemTraits;
    522 
    523     void setObj(PassRefPtr<Inspector::TypeBuilder::Test::RecursiveObject1> value)
     521    typedef Inspector::Protocol::StructItemTraits ItemTraits;
     522
     523    void setObj(PassRefPtr<Inspector::Protocol::Test::RecursiveObject1> value)
    524524    {
    525525        InspectorObjectBase::setObject(ASCIILiteral("obj"), value);
    … …  
    529529} // Test
    530530
    531 template<> struct BindingTraits<Inspector::TypeBuilder::Test::CastedAnimals> {
     531template<> struct BindingTraits<Inspector::Protocol::Test::CastedAnimals> {
    532532#if !ASSERT_DISABLED
    533533static void assertValueHasExpectedType(Inspector::InspectorValue*);
    534534#endif // !ASSERT_DISABLED
    535535};
    536 template<> struct BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast> {
    537 static PassRefPtr<Inspector::TypeBuilder::Test::TypeNeedingCast> runtimeCast(PassRefPtr<Inspector::InspectorValue> value);
     536template<> struct BindingTraits<Inspector::Protocol::Test::TypeNeedingCast> {
     537static PassRefPtr<Inspector::Protocol::Test::TypeNeedingCast> runtimeCast(PassRefPtr<Inspector::InspectorValue> value);
    538538#if !ASSERT_DISABLED
    539539static void assertValueHasExpectedType(Inspector::InspectorValue*);
    540540#endif // !ASSERT_DISABLED
    541541};
    542 template<> struct BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1> {
     542template<> struct BindingTraits<Inspector::Protocol::Test::RecursiveObject1> {
    543543#if !ASSERT_DISABLED
    544544static void assertValueHasExpectedType(Inspector::InspectorValue*);
    545545#endif // !ASSERT_DISABLED
    546546};
    547 template<> struct BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject2> {
     547template<> struct BindingTraits<Inspector::Protocol::Test::RecursiveObject2> {
    548548#if !ASSERT_DISABLED
    549549static void assertValueHasExpectedType(Inspector::InspectorValue*);
    … …  
    551551};
    552552
    553 } // namespace TypeBuilder
     553} // namespace Protocol
    554554
    555555} // namespace Inspector
    … …  
    557557#endif // ENABLE(INSPECTOR)
    558558
    559 #endif // !defined(InspectorTestTypeBuilders_h)
    560 ### End File: InspectorTestTypeBuilders.h
    561 
    562 ### Begin File: InspectorTestTypeBuilders.cpp
     559#endif // !defined(InspectorTestProtocolTypes_h)
     560### End File: InspectorTestProtocolTypes.h
     561
     562### Begin File: InspectorTestProtocolTypes.cpp
    563563/*
    564564 * Copyright (C) 2013 Google Inc. All rights reserved.
    … …  
    592592
    593593#include "config.h"
    594 #include "InspectorTestTypeBuilders.h"
     594#include "InspectorTestProtocolTypes.h"
    595595
    596596#if ENABLE(INSPECTOR)
    … …  
    600600namespace Inspector {
    601601
    602 namespace TypeBuilder {
     602namespace Protocol {
    603603
    604604static const char* const enum_constant_values[] = {
    … …  
    619619
    620620#if !ASSERT_DISABLED
    621 void BindingTraits<Inspector::TypeBuilder::Test::CastedAnimals>::assertValueHasExpectedType(Inspector::InspectorValue* value)
     621void BindingTraits<Inspector::Protocol::Test::CastedAnimals>::assertValueHasExpectedType(Inspector::InspectorValue* value)
    622622{
    623623    String s;
    … …  
    629629
    630630#if !ASSERT_DISABLED
    631 void BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::assertValueHasExpectedType(Inspector::InspectorValue* value)
     631void BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::assertValueHasExpectedType(Inspector::InspectorValue* value)
    632632{
    633633    RefPtr<InspectorObject> object;
    … …  
    647647        InspectorObject::iterator animalsPos = object->find(ASCIILiteral("animals"));
    648648        ASSERT(animalsPos != object->end());
    649         BindingTraits<Inspector::TypeBuilder::Test::CastedAnimals>::assertValueHasExpectedType(animalsPos->value.get());
     649        BindingTraits<Inspector::Protocol::Test::CastedAnimals>::assertValueHasExpectedType(animalsPos->value.get());
    650650    }
    651651    {
    … …  
    657657        InspectorObject::iterator treePos = object->find(ASCIILiteral("tree"));
    658658        ASSERT(treePos != object->end());
    659         BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1>::assertValueHasExpectedType(treePos->value.get());
     659        BindingTraits<Inspector::Protocol::Test::RecursiveObject1>::assertValueHasExpectedType(treePos->value.get());
    660660    }
    661661
    … …  
    666666#endif // !ASSERT_DISABLED
    667667
    668 PassRefPtr<Inspector::TypeBuilder::Test::TypeNeedingCast> BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
     668PassRefPtr<Inspector::Protocol::Test::TypeNeedingCast> BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
    669669{
    670670    RefPtr<Inspector::InspectorObject> object;
    … …  
    672672    ASSERT_UNUSED(castRes, castRes);
    673673#if !ASSERT_DISABLED
    674     BindingTraits<Inspector::TypeBuilder::Test::TypeNeedingCast>::assertValueHasExpectedType(object.get());
     674    BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::assertValueHasExpectedType(object.get());
    675675#endif  // !ASSERT_DISABLED
    676     COMPILE_ASSERT(sizeof(Inspector::TypeBuilder::Test::TypeNeedingCast) == sizeof(Inspector::InspectorObjectBase), type_cast_problem);
    677     return static_cast<Inspector::TypeBuilder::Test::TypeNeedingCast*>(static_cast<Inspector::InspectorObjectBase*>(object.get()));
     676    COMPILE_ASSERT(sizeof(Inspector::Protocol::Test::TypeNeedingCast) == sizeof(Inspector::InspectorObjectBase), type_cast_problem);
     677    return static_cast<Inspector::Protocol::Test::TypeNeedingCast*>(static_cast<Inspector::InspectorObjectBase*>(object.get()));
    678678}
    679679
    680680
    681681#if !ASSERT_DISABLED
    682 void BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1>::assertValueHasExpectedType(Inspector::InspectorValue* value)
     682void BindingTraits<Inspector::Protocol::Test::RecursiveObject1>::assertValueHasExpectedType(Inspector::InspectorValue* value)
    683683{
    684684    RefPtr<InspectorObject> object;
    … …  
    690690        InspectorObject::iterator objPos = object->find(ASCIILiteral("obj"));
    691691        if (objPos != object->end()) {
    692             BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject2>::assertValueHasExpectedType(objPos->value.get());
     692            BindingTraits<Inspector::Protocol::Test::RecursiveObject2>::assertValueHasExpectedType(objPos->value.get());
    693693            ++foundPropertiesCount;
    694694        }
    … …  
    700700
    701701#if !ASSERT_DISABLED
    702 void BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject2>::assertValueHasExpectedType(Inspector::InspectorValue* value)
     702void BindingTraits<Inspector::Protocol::Test::RecursiveObject2>::assertValueHasExpectedType(Inspector::InspectorValue* value)
    703703{
    704704    RefPtr<InspectorObject> object;
    … …  
    710710        InspectorObject::iterator objPos = object->find(ASCIILiteral("obj"));
    711711        if (objPos != object->end()) {
    712             BindingTraits<Inspector::TypeBuilder::Test::RecursiveObject1>::assertValueHasExpectedType(objPos->value.get());
     712            BindingTraits<Inspector::Protocol::Test::RecursiveObject1>::assertValueHasExpectedType(objPos->value.get());
    713713            ++foundPropertiesCount;
    714714        }
    … …  
    719719#endif // !ASSERT_DISABLED
    720720
    721 } // namespace TypeBuilder
     721} // namespace Protocol
    722722
    723723} // namespace Inspector
    … …  
    725725#endif // ENABLE(INSPECTOR)
    726726
    727 ### End File: InspectorTestTypeBuilders.cpp
     727### End File: InspectorTestProtocolTypes.cpp

  • trunk/Source/JavaScriptCore/runtime/TypeProfiler.cpp

    r172820 r172930  
    2727#include "TypeProfiler.h"
    2828
    29 #include "InspectorJSTypeBuilders.h"
     29#include "InspectorJSProtocolTypes.h"
    3030#include "TypeLocation.h"
    3131
    … …  
    6666}
    6767
    68 void TypeProfiler::getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor descriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::TypeBuilder::Runtime::TypeDescription>& description)
     68void TypeProfiler::getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor descriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::Protocol::Runtime::TypeDescription>& description)
    6969{
    7070    TypeLocation* location = findLocation(divot, sourceID, descriptor);

  • trunk/Source/JavaScriptCore/runtime/TypeProfiler.h

    r172820 r172930  
    3434#include <wtf/text/WTFString.h>
    3535
    36 namespace Inspector { namespace TypeBuilder  { namespace Runtime {
     36namespace Inspector { namespace Protocol  { namespace Runtime {
    3737class TypeDescription;
    3838}}}
    … …  
    9696public:
    9797    void logTypesForTypeLocation(TypeLocation*);
    98     void getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::TypeBuilder::Runtime::TypeDescription>&);
     98    void getTypesForVariableAtOffsetForInspector(TypeProfilerSearchDescriptor, unsigned divot, intptr_t sourceID, RefPtr<Inspector::Protocol::Runtime::TypeDescription>&);
    9999    void insertNewLocation(TypeLocation*);
    100100    FunctionHasExecutedCache* functionHasExecutedCache() { return &m_functionHasExecutedCache; }

  • trunk/Source/JavaScriptCore/runtime/TypeSet.cpp

    r172804 r172930  
    2727#include "TypeSet.h"
    2828
    29 #include "InspectorJSTypeBuilders.h"
     29#include "InspectorJSProtocolTypes.h"
    3030#include "JSCJSValue.h"
    3131#include "JSCJSValueInlines.h"
    … …  
    214214}
    215215
    216 PassRefPtr<Inspector::TypeBuilder::Array<String>> TypeSet::allPrimitiveTypeNames() const
    217 {
    218     RefPtr<Inspector::TypeBuilder::Array<String>> seen = Inspector::TypeBuilder::Array<String>::create();
     216PassRefPtr<Inspector::Protocol::Array<String>> TypeSet::allPrimitiveTypeNames() const
     217{
     218    RefPtr<Inspector::Protocol::Array<String>> seen = Inspector::Protocol::Array<String>::create();
    219219    if (m_seenTypes & TypeUndefined)
    220220         seen->addItem("Undefined");
    … …  
    233233}
    234234
    235 PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>> TypeSet::allStructureRepresentations() const
    236 {
    237     RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>> description = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>::create();
     235PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> TypeSet::allStructureRepresentations() const
     236{
     237    RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> description = Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>::create();
    238238
    239239    for (size_t i = 0; i < m_structureHistory.size(); i++)
    … …  
    361361}
    362362
    363 PassRefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> StructureShape::inspectorRepresentation()
    364 {
    365     RefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> base = Inspector::TypeBuilder::Runtime::StructureDescription::create();
    366     RefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> currentObject = base;
     363PassRefPtr<Inspector::Protocol::Runtime::StructureDescription> StructureShape::inspectorRepresentation()
     364{
     365    RefPtr<Inspector::Protocol::Runtime::StructureDescription> base = Inspector::Protocol::Runtime::StructureDescription::create();
     366    RefPtr<Inspector::Protocol::Runtime::StructureDescription> currentObject = base;
    367367    RefPtr<StructureShape> currentShape = this;
    368368
    369369    while (currentShape) {
    370         auto fields = Inspector::TypeBuilder::Array<String>::create();
     370        auto fields = Inspector::Protocol::Array<String>::create();
    371371        for (auto it = currentShape->m_fields.begin(), end = currentShape->m_fields.end(); it != end; ++it)
    372372            fields->addItem((*it).get());
    … …  
    376376
    377377        if (currentShape->m_proto) {
    378             RefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> nextObject = Inspector::TypeBuilder::Runtime::StructureDescription::create();
     378            RefPtr<Inspector::Protocol::Runtime::StructureDescription> nextObject = Inspector::Protocol::Runtime::StructureDescription::create();
    379379            currentObject->setPrototypeStructure(nextObject);
    380380            currentObject = nextObject;

  • trunk/Source/JavaScriptCore/runtime/TypeSet.h

    r172804 r172930  
    3434
    3535namespace Inspector {
    36 namespace TypeBuilder  {
     36namespace Protocol  {
    3737template<typename T> class Array;
    3838
    … …  
    7171    void addProperty(RefPtr<StringImpl>);
    7272    String stringRepresentation();
    73     PassRefPtr<Inspector::TypeBuilder::Runtime::StructureDescription> inspectorRepresentation();
     73    PassRefPtr<Inspector::Protocol::Runtime::StructureDescription> inspectorRepresentation();
    7474    void setConstructorName(String name) { m_constructorName = (name.isEmpty() ? "Object" : name); }
    7575    String constructorName() { return m_constructorName; }
    … …  
    9595    JS_EXPORT_PRIVATE String seenTypes() const;
    9696    String displayName() const;
    97     PassRefPtr<Inspector::TypeBuilder::Array<String>> allPrimitiveTypeNames() const;
    98     PassRefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Runtime::StructureDescription>> allStructureRepresentations() const;
     97    PassRefPtr<Inspector::Protocol::Array<String>> allPrimitiveTypeNames() const;
     98    PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> allStructureRepresentations() const;
    9999
    100100private:
Note: See TracChangeset for help on using the changeset viewer.