<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178042] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178042">178042</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-07 11:32:05 -0800 (Wed, 07 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/178039">r178039</a>.
https://bugs.webkit.org/show_bug.cgi?id=140187
Breaks ObjC Inspector Protocol (Requested by JoePeck on
#webkit).
Reverted changeset:
"Web Inspector: purge PassRefPtr from Inspector code and use
Ref for typed and untyped protocol objects"
https://bugs.webkit.org/show_bug.cgi?id=140053
http://trac.webkit.org/changeset/178039</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebindingsScriptValuecpp">trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebindingsScriptValueh">trunk/Source/JavaScriptCore/bindings/ScriptValue.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleMessagecpp">trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorContentSearchUtilitiescpp">trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorContentSearchUtilitiesh">trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptcpp">trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScripth">trunk/Source/JavaScriptCore/inspector/InjectedScript.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptBasecpp">trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorBackendDispatchercpp">trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorBackendDispatcherh">trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorEnvironmenth">trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorProtocolTypesh">trunk/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorValuescpp">trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorValuesh">trunk/Source/JavaScriptCore/inspector/InspectorValues.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClientcpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClienth">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllerh">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallFrameh">trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackcpp">trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackh">trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generatorpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generator_templatespy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_backend_dispatcher_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_backend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_frontend_dispatcher_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_frontend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_backend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_frontend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_types_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpecteddomainswithvaryingcommandsizesjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedsametypeiddifferentdomainjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedshadowedoptionaltypesettersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationaliasedprimitivetypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationarraytypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationenumtypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayEncodedValuecpp">trunk/Source/JavaScriptCore/replay/EncodedValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayEncodedValueh">trunk/Source/JavaScriptCore/replay/EncodedValue.h</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayscriptsCodeGeneratorReplayInputspy">trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConsoleClientcpp">trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConsoleClienth">trunk/Source/JavaScriptCore/runtime/ConsoleClient.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTypeSetcpp">trunk/Source/JavaScriptCore/runtime/TypeSet.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTypeSeth">trunk/Source/JavaScriptCore/runtime/TypeSet.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfStopwatchh">trunk/Source/WTF/wtf/Stopwatch.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCorehtmlparserXSSAuditorDelegatecpp">trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorCommandLineAPIHostcpp">trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorCommandLineAPIHosth">trunk/Source/WebCore/inspector/CommandLineAPIHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp">trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth">trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgenth">trunk/Source/WebCore/inspector/InspectorCSSAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh">trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgenth">trunk/Source/WebCore/inspector/InspectorDOMAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMStorageAgenth">trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp">trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseAgenth">trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseInstrumentationh">trunk/Source/WebCore/inspector/InspectorDatabaseInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseResourcecpp">trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseResourceh">trunk/Source/WebCore/inspector/InspectorDatabaseResource.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHosth">trunk/Source/WebCore/inspector/InspectorFrontendHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgenth">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp">trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorLayerTreeAgenth">trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlayh">trunk/Source/WebCore/inspector/InspectorOverlay.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgenth">trunk/Source/WebCore/inspector/InspectorPageAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorReplayAgentcpp">trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorReplayAgenth">trunk/Source/WebCore/inspector/InspectorReplayAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgenth">trunk/Source/WebCore/inspector/InspectorResourceAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheeth">trunk/Source/WebCore/inspector/InspectorStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerAgentcpp">trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerAgenth">trunk/Source/WebCore/inspector/InspectorWorkerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorNetworkResourcesDatacpp">trunk/Source/WebCore/inspector/NetworkResourcesData.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorNetworkResourcesDatah">trunk/Source/WebCore/inspector/NetworkResourcesData.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorTimelineRecordFactorycpp">trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorTimelineRecordFactoryh">trunk/Source/WebCore/inspector/TimelineRecordFactory.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllerh">trunk/Source/WebCore/inspector/WorkerInspectorController.h</a></li>
<li><a href="#trunkSourceWebCorepagePageConsoleClientcpp">trunk/Source/WebCore/page/PageConsoleClient.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsoleClienth">trunk/Source/WebCore/page/PageConsoleClient.h</a></li>
<li><a href="#trunkSourceWebCorereplayReplayControllercpp">trunk/Source/WebCore/replay/ReplayController.cpp</a></li>
<li><a href="#trunkSourceWebCorereplayReplayInputCreationMethodscpp">trunk/Source/WebCore/replay/ReplayInputCreationMethods.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersSharedWorkerGlobalScopecpp">trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersSharedWorkerGlobalScopeh">trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeh">trunk/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-07 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r178039.
+ https://bugs.webkit.org/show_bug.cgi?id=140187
+
+ Breaks ObjC Inspector Protocol (Requested by JoePeck on
+ #webkit).
+
+ Reverted changeset:
+
+ "Web Inspector: purge PassRefPtr from Inspector code and use
+ Ref for typed and untyped protocol objects"
+ https://bugs.webkit.org/show_bug.cgi?id=140053
+ http://trac.webkit.org/changeset/178039
+
</ins><span class="cx"> 2015-01-06 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: purge PassRefPtr from Inspector code and use Ref for typed and untyped protocol objects
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebindingsScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-static RefPtr<InspectorValue> jsToInspectorValue(ExecState* scriptState, JSValue value, int maxDepth)
</del><ins>+static PassRefPtr<InspectorValue> jsToInspectorValue(ExecState* scriptState, JSValue value, int maxDepth)
</ins><span class="cx"> {
</span><span class="cx"> if (!value) {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">
</span><span class="cx"> if (value.isObject()) {
</span><span class="cx"> if (isJSArray(value)) {
</span><del>- Ref<InspectorArray> inspectorArray = InspectorArray::create();
</del><ins>+ RefPtr<InspectorArray> inspectorArray = InspectorArray::create();
</ins><span class="cx"> JSArray* array = asArray(value);
</span><span class="cx"> unsigned length = array->length();
</span><span class="cx"> for (unsigned i = 0; i < length; i++) {
</span><span class="lines">@@ -131,11 +131,11 @@
</span><span class="cx"> RefPtr<InspectorValue> elementValue = jsToInspectorValue(scriptState, element, maxDepth);
</span><span class="cx"> if (!elementValue)
</span><span class="cx"> return nullptr;
</span><del>- inspectorArray->pushValue(WTF::move(elementValue));
</del><ins>+ inspectorArray->pushValue(elementValue);
</ins><span class="cx"> }
</span><del>- return WTF::move(inspectorArray);
</del><ins>+ return inspectorArray;
</ins><span class="cx"> }
</span><del>- Ref<InspectorObject> inspectorObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> inspectorObject = InspectorObject::create();
</ins><span class="cx"> JSObject* object = value.getObject();
</span><span class="cx"> PropertyNameArray propertyNames(scriptState);
</span><span class="cx"> object->methodTable()->getOwnPropertyNames(object, scriptState, propertyNames, ExcludeDontEnumProperties);
</span><span class="lines">@@ -145,16 +145,16 @@
</span><span class="cx"> RefPtr<InspectorValue> inspectorValue = jsToInspectorValue(scriptState, propertyValue, maxDepth);
</span><span class="cx"> if (!inspectorValue)
</span><span class="cx"> return nullptr;
</span><del>- inspectorObject->setValue(name.string(), WTF::move(inspectorValue));
</del><ins>+ inspectorObject->setValue(name.string(), inspectorValue);
</ins><span class="cx"> }
</span><del>- return WTF::move(inspectorObject);
</del><ins>+ return inspectorObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorValue> ScriptValue::toInspectorValue(ExecState* scriptState) const
</del><ins>+PassRefPtr<InspectorValue> ScriptValue::toInspectorValue(ExecState* scriptState) const
</ins><span class="cx"> {
</span><span class="cx"> JSLockHolder holder(scriptState);
</span><span class="cx"> return jsToInspectorValue(scriptState, m_value.get(), InspectorValue::maxDepth);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebindingsScriptValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bindings/ScriptValue.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bindings/ScriptValue.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/bindings/ScriptValue.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> bool operator==(const ScriptValue& other) const { return m_value == other.m_value; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- RefPtr<Inspector::InspectorValue> toInspectorValue(JSC::ExecState*) const;
</del><ins>+ PassRefPtr<Inspector::InspectorValue> toInspectorValue(JSC::ExecState*) const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleMessagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -181,11 +181,10 @@
</span><span class="cx">
</span><span class="cx"> void ConsoleMessage::addToFrontend(InspectorConsoleFrontendDispatcher* consoleFrontendDispatcher, Inspector::InjectedScriptManager* injectedScriptManager, bool generatePreview)
</span><span class="cx"> {
</span><del>- Ref<Inspector::Protocol::Console::ConsoleMessage> jsonObj = Inspector::Protocol::Console::ConsoleMessage::create()
</del><ins>+ RefPtr<Inspector::Protocol::Console::ConsoleMessage> jsonObj = Inspector::Protocol::Console::ConsoleMessage::create()
</ins><span class="cx"> .setSource(messageSourceValue(m_source))
</span><span class="cx"> .setLevel(messageLevelValue(m_level))
</span><del>- .setText(m_message)
- .release();
</del><ins>+ .setText(m_message);
</ins><span class="cx">
</span><span class="cx"> // FIXME: only send out type for ConsoleAPI source messages.
</span><span class="cx"> jsonObj->setType(messageTypeValue(m_type));
</span><span class="lines">@@ -200,7 +199,7 @@
</span><span class="cx"> if (m_arguments && m_arguments->argumentCount()) {
</span><span class="cx"> InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState());
</span><span class="cx"> if (!injectedScript.hasNoValue()) {
</span><del>- Ref<Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>> jsonArgs = Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>> jsonArgs = Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>::create();
</ins><span class="cx"> if (m_type == MessageType::Table && generatePreview && m_arguments->argumentCount()) {
</span><span class="cx"> Deprecated::ScriptValue table = m_arguments->argumentAt(0);
</span><span class="cx"> Deprecated::ScriptValue columns = m_arguments->argumentCount() > 1 ? m_arguments->argumentAt(1) : Deprecated::ScriptValue();
</span><span class="lines">@@ -209,7 +208,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- jsonArgs->addItem(inspectorValue.copyRef());
</del><ins>+ jsonArgs->addItem(inspectorValue);
</ins><span class="cx"> } else {
</span><span class="cx"> for (unsigned i = 0; i < m_arguments->argumentCount(); ++i) {
</span><span class="cx"> RefPtr<Inspector::Protocol::Runtime::RemoteObject> inspectorValue = injectedScript.wrapObject(m_arguments->argumentAt(i), ASCIILiteral("console"), generatePreview);
</span><span class="lines">@@ -217,17 +216,17 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- jsonArgs->addItem(inspectorValue.copyRef());
</del><ins>+ jsonArgs->addItem(inspectorValue);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- jsonObj->setParameters(WTF::move(jsonArgs));
</del><ins>+ jsonObj->setParameters(jsonArgs);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_callStack)
</span><span class="cx"> jsonObj->setStackTrace(m_callStack->buildInspectorArray());
</span><span class="cx">
</span><del>- consoleFrontendDispatcher->messageAdded(WTF::move(jsonObj));
</del><ins>+ consoleFrontendDispatcher->messageAdded(jsonObj);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ConsoleMessage::updateRepeatCountInConsole(InspectorConsoleFrontendDispatcher* consoleFrontendDispatcher)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorContentSearchUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::GenericTypes::SearchMatch> buildObjectForSearchMatch(size_t lineNumber, const String& lineContent)
</del><ins>+static PassRefPtr<Inspector::Protocol::GenericTypes::SearchMatch> buildObjectForSearchMatch(size_t lineNumber, const String& lineContent)
</ins><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::GenericTypes::SearchMatch::create()
</span><span class="cx"> .setLineNumber(lineNumber)
</span><span class="lines">@@ -153,17 +153,15 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex)
</ins><span class="cx"> {
</span><del>- Ref<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> result = Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> result = Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>::create();
</ins><span class="cx">
</span><span class="cx"> JSC::Yarr::RegularExpression regex = ContentSearchUtilities::createSearchRegex(query, caseSensitive, isRegex);
</span><span class="cx"> Vector<std::pair<size_t, String>> matches = getRegularExpressionMatchesByLines(regex, text);
</span><span class="cx">
</span><del>- for (const auto& match : matches) {
- Ref<Inspector::Protocol::GenericTypes::SearchMatch> matchObject = buildObjectForSearchMatch(match.first, match.second);
- result->addItem(WTF::move(matchObject));
- }
</del><ins>+ for (const auto& match : matches)
+ result->addItem(buildObjectForSearchMatch(match.first, match.second));
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorContentSearchUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE JSC::Yarr::RegularExpression createSearchRegex(const String& query, bool caseSensitive, bool isRegex);
</span><span class="cx"> JS_EXPORT_PRIVATE int countRegularExpressionMatches(const JSC::Yarr::RegularExpression&, const String&);
</span><del>-JS_EXPORT_PRIVATE Ref<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex);
</del><ins>+JS_EXPORT_PRIVATE PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>> searchInTextByLines(const String& text, const String& query, const bool caseSensitive, const bool isRegex);
</ins><span class="cx"> JS_EXPORT_PRIVATE TextPosition textPositionFromOffset(size_t offset, const Vector<size_t>& lineEndings);
</span><span class="cx"> JS_EXPORT_PRIVATE std::unique_ptr<Vector<size_t>> lineEndings(const String&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *result = BindingTraits<Inspector::Protocol::Debugger::FunctionDetails>::runtimeCast(WTF::move(resultValue));
</del><ins>+ *result = BindingTraits<Inspector::Protocol::Debugger::FunctionDetails>::runtimeCast(resultValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedScript::getProperties(ErrorString& errorString, const String& objectId, bool ownProperties, RefPtr<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>* properties)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *properties = BindingTraits<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>::runtimeCast(WTF::move(result));
</del><ins>+ *properties = BindingTraits<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>::runtimeCast(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedScript::getInternalProperties(ErrorString& errorString, const String& objectId, RefPtr<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>* properties)
</span><span class="lines">@@ -137,12 +137,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto array = BindingTraits<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>::runtimeCast(WTF::move(result));
</del><ins>+ auto array = BindingTraits<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>::runtimeCast(result);
</ins><span class="cx"> if (array->length() > 0)
</span><span class="cx"> *properties = array;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Array<Inspector::Protocol::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
</del><ins>+PassRefPtr<Array<Inspector::Protocol::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!hasNoValue());
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("wrapCallFrames"), inspectorEnvironment()->functionCallHandler());
</span><span class="lines">@@ -153,12 +153,12 @@
</span><span class="cx"> ASSERT(!hadException);
</span><span class="cx"> RefPtr<InspectorValue> result = callFramesValue.toInspectorValue(scriptState());
</span><span class="cx"> if (result->type() == InspectorValue::Type::Array)
</span><del>- return BindingTraits<Array<Inspector::Protocol::Debugger::CallFrame>>::runtimeCast(WTF::move(result)).releaseNonNull();
</del><ins>+ return BindingTraits<Array<Inspector::Protocol::Debugger::CallFrame>>::runtimeCast(result);
</ins><span class="cx">
</span><span class="cx"> return Array<Inspector::Protocol::Debugger::CallFrame>::create();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::Runtime::RemoteObject> InjectedScript::wrapObject(const Deprecated::ScriptValue& value, const String& groupName, bool generatePreview) const
</del><ins>+PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> InjectedScript::wrapObject(const Deprecated::ScriptValue& value, const String& groupName, bool generatePreview) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!hasNoValue());
</span><span class="cx"> Deprecated::ScriptFunctionCall wrapFunction(injectedScriptObject(), ASCIILiteral("wrapObject"), inspectorEnvironment()->functionCallHandler());
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> return BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(resultObject);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::Runtime::RemoteObject> InjectedScript::wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const
</del><ins>+PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> InjectedScript::wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!hasNoValue());
</span><span class="cx"> Deprecated::ScriptFunctionCall wrapFunction(injectedScriptObject(), ASCIILiteral("wrapTable"), inspectorEnvironment()->functionCallHandler());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScript.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScript.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScript.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -62,9 +62,9 @@
</span><span class="cx"> void getProperties(ErrorString&, const String& objectId, bool ownProperties, RefPtr<Protocol::Array<Protocol::Runtime::PropertyDescriptor>>* result);
</span><span class="cx"> void getInternalProperties(ErrorString&, const String& objectId, RefPtr<Protocol::Array<Protocol::Runtime::InternalPropertyDescriptor>>* result);
</span><span class="cx">
</span><del>- Ref<Protocol::Array<Protocol::Debugger::CallFrame>> wrapCallFrames(const Deprecated::ScriptValue&);
- RefPtr<Protocol::Runtime::RemoteObject> wrapObject(const Deprecated::ScriptValue&, const String& groupName, bool generatePreview = false) const;
- RefPtr<Protocol::Runtime::RemoteObject> wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const;
</del><ins>+ PassRefPtr<Protocol::Array<Protocol::Debugger::CallFrame>> wrapCallFrames(const Deprecated::ScriptValue&);
+ PassRefPtr<Protocol::Runtime::RemoteObject> wrapObject(const Deprecated::ScriptValue&, const String& groupName, bool generatePreview = false) const;
+ PassRefPtr<Protocol::Runtime::RemoteObject> wrapTable(const Deprecated::ScriptValue& table, const Deprecated::ScriptValue& columns) const;
</ins><span class="cx">
</span><span class="cx"> void setExceptionValue(const Deprecated::ScriptValue&);
</span><span class="cx"> void clearExceptionValue();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -135,20 +135,15 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<InspectorObject> resultObject;
- if (!resultPair->getObject(ASCIILiteral("result"), resultObject)) {
</del><ins>+ RefPtr<InspectorObject> resultObject = resultPair->getObject(ASCIILiteral("result"));
+ bool wasThrownVal = false;
+ if (!resultObject || !resultPair->getBoolean(ASCIILiteral("wasThrown"), wasThrownVal)) {
</ins><span class="cx"> errorString = ASCIILiteral("Internal error: result is not a pair of value and wasThrown flag");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool wasThrownValue = false;
- if (!resultPair->getBoolean(ASCIILiteral("wasThrown"), wasThrownValue)) {
- errorString = ASCIILiteral("Internal error: result is not a pair of value and wasThrown flag");
- return;
- }
-
</del><span class="cx"> *objectResult = BindingTraits<Protocol::Runtime::RemoteObject>::runtimeCast(resultObject);
</span><del>- *wasThrown = wasThrownValue;
</del><ins>+ *wasThrown = wasThrownVal;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorBackendDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-InspectorBackendDispatcher::CallbackBase::CallbackBase(Ref<InspectorBackendDispatcher>&& backendDispatcher, int id)
- : m_backendDispatcher(WTF::move(backendDispatcher))
</del><ins>+InspectorBackendDispatcher::CallbackBase::CallbackBase(PassRefPtr<InspectorBackendDispatcher> backendDispatcher, int id)
+ : m_backendDispatcher(backendDispatcher)
</ins><span class="cx"> , m_id(id)
</span><span class="cx"> , m_alreadySent(false)
</span><span class="cx"> {
</span><span class="lines">@@ -54,18 +54,18 @@
</span><span class="cx"> sendIfActive(nullptr, error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorBackendDispatcher::CallbackBase::sendIfActive(RefPtr<InspectorObject>&& partialMessage, const ErrorString& invocationError)
</del><ins>+void InspectorBackendDispatcher::CallbackBase::sendIfActive(PassRefPtr<InspectorObject> partialMessage, const ErrorString& invocationError)
</ins><span class="cx"> {
</span><span class="cx"> if (m_alreadySent)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_backendDispatcher->sendResponse(m_id, WTF::move(partialMessage), invocationError);
</del><ins>+ m_backendDispatcher->sendResponse(m_id, partialMessage, invocationError);
</ins><span class="cx"> m_alreadySent = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorBackendDispatcher> InspectorBackendDispatcher::create(InspectorFrontendChannel* inspectorFrontendChannel)
</del><ins>+PassRefPtr<InspectorBackendDispatcher> InspectorBackendDispatcher::create(InspectorFrontendChannel* inspectorFrontendChannel)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorBackendDispatcher(inspectorFrontendChannel));
</del><ins>+ return adoptRef(new InspectorBackendDispatcher(inspectorFrontendChannel));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorBackendDispatcher::registerDispatcherForDomain(const String& domain, InspectorSupplementalBackendDispatcher* dispatcher)
</span><span class="lines">@@ -90,8 +90,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<InspectorValue> callIdValue;
- if (!messageObject->getValue(ASCIILiteral("id"), callIdValue)) {
</del><ins>+ RefPtr<InspectorValue> callIdValue = messageObject->get(ASCIILiteral("id"));
+ if (!callIdValue) {
</ins><span class="cx"> reportProtocolError(nullptr, InvalidRequest, ASCIILiteral("'id' property was not found"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -102,8 +102,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<InspectorValue> methodValue;
- if (!messageObject->getValue(ASCIILiteral("method"), methodValue)) {
</del><ins>+ RefPtr<InspectorValue> methodValue = messageObject->get(ASCIILiteral("method"));
+ if (!methodValue) {
</ins><span class="cx"> reportProtocolError(&callId, InvalidRequest, ASCIILiteral("'method' property wasn't found"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -128,10 +128,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String domainMethod = method.substring(position + 1);
</span><del>- domainDispatcher->dispatch(callId, domainMethod, messageObject.releaseNonNull());
</del><ins>+ domainDispatcher->dispatch(callId, domainMethod, messageObject.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorBackendDispatcher::sendResponse(long callId, RefPtr<InspectorObject>&& result, const ErrorString& invocationError)
</del><ins>+void InspectorBackendDispatcher::sendResponse(long callId, PassRefPtr<InspectorObject> result, const ErrorString& invocationError)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_inspectorFrontendChannel)
</span><span class="cx"> return;
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<InspectorObject> responseMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> responseMessage = InspectorObject::create();
</ins><span class="cx"> responseMessage->setObject(ASCIILiteral("result"), result);
</span><span class="cx"> responseMessage->setInteger(ASCIILiteral("id"), callId);
</span><span class="cx"> m_inspectorFrontendChannel->sendMessageToFrontend(responseMessage->toJSONString());
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> reportProtocolError(callId, errorCode, errorMessage, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorBackendDispatcher::reportProtocolError(const long* const callId, CommonErrorCode errorCode, const String& errorMessage, RefPtr<Inspector::Protocol::Array<String>>&& data) const
</del><ins>+void InspectorBackendDispatcher::reportProtocolError(const long* const callId, CommonErrorCode errorCode, const String& errorMessage, PassRefPtr<InspectorArray> data) const
</ins><span class="cx"> {
</span><span class="cx"> static const int errorCodes[] = {
</span><span class="cx"> -32700, // ParseError
</span><span class="lines">@@ -163,21 +163,21 @@
</span><span class="cx"> -32000, // ServerError
</span><span class="cx"> };
</span><span class="cx">
</span><del>- ASSERT_ARG(errorCode, errorCode >= 0);
- ASSERT_ARG(errorCode, (unsigned)errorCode < WTF_ARRAY_LENGTH(errorCodes));
- ASSERT_ARG(errorCode, errorCodes[errorCode]);
</del><ins>+ ASSERT(errorCode >= 0);
+ ASSERT((unsigned)errorCode < WTF_ARRAY_LENGTH(errorCodes));
+ ASSERT(errorCodes[errorCode]);
</ins><span class="cx">
</span><span class="cx"> if (!m_inspectorFrontendChannel)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Ref<InspectorObject> error = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> error = InspectorObject::create();
</ins><span class="cx"> error->setInteger(ASCIILiteral("code"), errorCodes[errorCode]);
</span><span class="cx"> error->setString(ASCIILiteral("message"), errorMessage);
</span><span class="cx"> if (data)
</span><del>- error->setArray(ASCIILiteral("data"), WTF::move(data));
</del><ins>+ error->setArray(ASCIILiteral("data"), data);
</ins><span class="cx">
</span><del>- Ref<InspectorObject> message = InspectorObject::create();
- message->setObject(ASCIILiteral("error"), WTF::move(error));
</del><ins>+ RefPtr<InspectorObject> message = InspectorObject::create();
+ message->setObject(ASCIILiteral("error"), error.release());
</ins><span class="cx"> if (callId)
</span><span class="cx"> message->setInteger(ASCIILiteral("id"), *callId);
</span><span class="cx"> else
</span><span class="lines">@@ -187,36 +187,37 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename ReturnValueType, typename ValueType, typename DefaultValueType>
</span><del>-static ReturnValueType getPropertyValue(InspectorObject* object, const String& name, bool* out_optionalValueFound, Inspector::Protocol::Array<String>& protocolErrors, DefaultValueType defaultValue, bool (*asMethod)(InspectorValue&, ValueType&), const char* typeName)
</del><ins>+static ReturnValueType getPropertyValue(InspectorObject* object, const String& name, bool* valueFound, InspectorArray* protocolErrors, DefaultValueType defaultValue, bool (*asMethod)(InspectorValue&, ValueType&), const char* typeName)
</ins><span class="cx"> {
</span><del>- ValueType result = defaultValue;
- // out_optionalValueFound signals to the caller whether an optional property was found.
- // if out_optionalValueFound == nullptr, then this is a required property.
- if (out_optionalValueFound)
- *out_optionalValueFound = false;
</del><ins>+ ASSERT(protocolErrors);
</ins><span class="cx">
</span><ins>+ ValueType value = defaultValue;
+ if (valueFound)
+ *valueFound = false;
+
</ins><span class="cx"> if (!object) {
</span><del>- if (!out_optionalValueFound)
- protocolErrors.addItem(String::format("'params' object must contain required parameter '%s' with type '%s'.", name.utf8().data(), typeName));
- return result;
</del><ins>+ if (!valueFound)
+ protocolErrors->pushString(String::format("'params' object must contain required parameter '%s' with type '%s'.", name.utf8().data(), typeName));
+ return value;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- auto findResult = object->find(name);
- if (findResult == object->end()) {
- if (!out_optionalValueFound)
- protocolErrors.addItem(String::format("Parameter '%s' with type '%s' was not found.", name.utf8().data(), typeName));
- return result;
</del><ins>+ InspectorObject::const_iterator end = object->end();
+ InspectorObject::const_iterator valueIterator = object->find(name);
+ if (valueIterator == end) {
+ if (!valueFound)
+ protocolErrors->pushString(String::format("Parameter '%s' with type '%s' was not found.", name.utf8().data(), typeName));
+ return value;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!asMethod(*findResult->value, result)) {
- protocolErrors.addItem(String::format("Parameter '%s' has wrong type. It must be '%s'.", name.utf8().data(), typeName));
- return result;
</del><ins>+ if (!asMethod(*valueIterator->value, value)) {
+ protocolErrors->pushString(String::format("Parameter '%s' has wrong type. It must be '%s'.", name.utf8().data(), typeName));
+ return value;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (out_optionalValueFound)
- *out_optionalValueFound = true;
</del><ins>+ if (valueFound)
+ *valueFound = true;
</ins><span class="cx">
</span><del>- return result;
</del><ins>+ return value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct AsMethodBridges {
</span><span class="lines">@@ -229,39 +230,39 @@
</span><span class="cx"> static bool asValue(InspectorValue& value, RefPtr<InspectorValue>& output) { return value.asValue(output); }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-int InspectorBackendDispatcher::getInteger(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+int InspectorBackendDispatcher::getInteger(InspectorObject* object, const String& name, bool* valueFound, InspectorArray* protocolErrors)
</ins><span class="cx"> {
</span><span class="cx"> return getPropertyValue<int, int, int>(object, name, valueFound, protocolErrors, 0, AsMethodBridges::asInteger, "Integer");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double InspectorBackendDispatcher::getDouble(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+double InspectorBackendDispatcher::getDouble(InspectorObject* object, const String& name, bool* valueFound, InspectorArray* protocolErrors)
</ins><span class="cx"> {
</span><span class="cx"> return getPropertyValue<double, double, double>(object, name, valueFound, protocolErrors, 0, AsMethodBridges::asDouble, "Number");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String InspectorBackendDispatcher::getString(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+String InspectorBackendDispatcher::getString(InspectorObject* object, const String& name, bool* valueFound, InspectorArray* protocolErrors)
</ins><span class="cx"> {
</span><span class="cx"> return getPropertyValue<String, String, String>(object, name, valueFound, protocolErrors, "", AsMethodBridges::asString, "String");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorBackendDispatcher::getBoolean(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+bool InspectorBackendDispatcher::getBoolean(InspectorObject* object, const String& name, bool* valueFound, InspectorArray* protocolErrors)
</ins><span class="cx"> {
</span><span class="cx"> return getPropertyValue<bool, bool, bool>(object, name, valueFound, protocolErrors, false, AsMethodBridges::asBoolean, "Boolean");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorObject> InspectorBackendDispatcher::getObject(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+PassRefPtr<InspectorObject> InspectorBackendDispatcher::getObject(InspectorObject* object, const String& name, bool* valueFound, InspectorArray* protocolErrors)
</ins><span class="cx"> {
</span><del>- return getPropertyValue<RefPtr<InspectorObject>, RefPtr<InspectorObject>, InspectorObject*>(object, name, valueFound, protocolErrors, nullptr, AsMethodBridges::asObject, "Object");
</del><ins>+ return getPropertyValue<PassRefPtr<InspectorObject>, RefPtr<InspectorObject>, InspectorObject*>(object, name, valueFound, protocolErrors, nullptr, AsMethodBridges::asObject, "Object");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorArray> InspectorBackendDispatcher::getArray(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+PassRefPtr<InspectorArray> InspectorBackendDispatcher::getArray(InspectorObject* object, const String& name, bool* valueFound, InspectorArray* protocolErrors)
</ins><span class="cx"> {
</span><del>- return getPropertyValue<RefPtr<InspectorArray>, RefPtr<InspectorArray>, InspectorArray*>(object, name, valueFound, protocolErrors, nullptr, AsMethodBridges::asArray, "Array");
</del><ins>+ return getPropertyValue<PassRefPtr<InspectorArray>, RefPtr<InspectorArray>, InspectorArray*>(object, name, valueFound, protocolErrors, nullptr, AsMethodBridges::asArray, "Array");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorValue> InspectorBackendDispatcher::getValue(InspectorObject* object, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors)
</del><ins>+PassRefPtr<InspectorValue> InspectorBackendDispatcher::getValue(InspectorObject* object, const String& name, bool* valueFound, InspectorArray* protocolErrors)
</ins><span class="cx"> {
</span><del>- return getPropertyValue<RefPtr<InspectorValue>, RefPtr<InspectorValue>, InspectorValue*>(object, name, valueFound, protocolErrors, nullptr, AsMethodBridges::asValue, "Value");
</del><ins>+ return getPropertyValue<PassRefPtr<InspectorValue>, RefPtr<InspectorValue>, InspectorValue*>(object, name, valueFound, protocolErrors, nullptr, AsMethodBridges::asValue, "Value");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorBackendDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #ifndef InspectorBackendDispatcher_h
</span><span class="cx"> #define InspectorBackendDispatcher_h
</span><span class="cx">
</span><del>-#include "InspectorProtocolTypes.h"
</del><ins>+#include "InspectorValues.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -40,31 +40,30 @@
</span><span class="cx">
</span><span class="cx"> class InspectorSupplementalBackendDispatcher : public RefCounted<InspectorSupplementalBackendDispatcher> {
</span><span class="cx"> public:
</span><del>- InspectorSupplementalBackendDispatcher(InspectorBackendDispatcher& backendDispatcher)
- : m_backendDispatcher(backendDispatcher) { }
</del><ins>+ InspectorSupplementalBackendDispatcher(InspectorBackendDispatcher* backendDispatcher) : m_backendDispatcher(backendDispatcher) { }
</ins><span class="cx"> virtual ~InspectorSupplementalBackendDispatcher() { }
</span><del>- virtual void dispatch(long callId, const String& method, Ref<InspectorObject>&& message) = 0;
</del><ins>+ virtual void dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message) = 0;
</ins><span class="cx"> protected:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class JS_EXPORT_PRIVATE InspectorBackendDispatcher : public RefCounted<InspectorBackendDispatcher> {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorBackendDispatcher> create(InspectorFrontendChannel*);
</del><ins>+ static PassRefPtr<InspectorBackendDispatcher> create(InspectorFrontendChannel*);
</ins><span class="cx">
</span><span class="cx"> class JS_EXPORT_PRIVATE CallbackBase : public RefCounted<CallbackBase> {
</span><span class="cx"> public:
</span><del>- CallbackBase(Ref<InspectorBackendDispatcher>&&, int id);
</del><ins>+ CallbackBase(PassRefPtr<InspectorBackendDispatcher>, int id);
</ins><span class="cx">
</span><span class="cx"> bool isActive() const;
</span><span class="cx"> void sendFailure(const ErrorString&);
</span><span class="cx"> void disable() { m_alreadySent = true; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- void sendIfActive(RefPtr<InspectorObject>&& partialMessage, const ErrorString& invocationError);
</del><ins>+ void sendIfActive(PassRefPtr<InspectorObject> partialMessage, const ErrorString& invocationError);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> int m_id;
</span><span class="cx"> bool m_alreadySent;
</span><span class="cx"> };
</span><span class="lines">@@ -83,17 +82,17 @@
</span><span class="cx">
</span><span class="cx"> void registerDispatcherForDomain(const String& domain, InspectorSupplementalBackendDispatcher*);
</span><span class="cx"> void dispatch(const String& message);
</span><del>- void sendResponse(long callId, RefPtr<InspectorObject>&& result, const ErrorString& invocationError);
</del><ins>+ void sendResponse(long callId, PassRefPtr<InspectorObject> result, const ErrorString& invocationError);
</ins><span class="cx"> void reportProtocolError(const long* const callId, CommonErrorCode, const String& errorMessage) const;
</span><del>- void reportProtocolError(const long* const callId, CommonErrorCode, const String& errorMessage, RefPtr<Inspector::Protocol::Array<String>>&& data) const;
</del><ins>+ void reportProtocolError(const long* const callId, CommonErrorCode, const String& errorMessage, PassRefPtr<InspectorArray> data) const;
</ins><span class="cx">
</span><del>- static int getInteger(InspectorObject*, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors);
- static double getDouble(InspectorObject*, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors);
- static String getString(InspectorObject*, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors);
- static bool getBoolean(InspectorObject*, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors);
- static RefPtr<InspectorValue> getValue(InspectorObject*, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors);
- static RefPtr<InspectorObject> getObject(InspectorObject*, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors);
- static RefPtr<InspectorArray> getArray(InspectorObject*, const String& name, bool* valueFound, Inspector::Protocol::Array<String>& protocolErrors);
</del><ins>+ static int getInteger(InspectorObject*, const String& name, bool* valueFound, InspectorArray* protocolErrors);
+ static double getDouble(InspectorObject*, const String& name, bool* valueFound, InspectorArray* protocolErrors);
+ static String getString(InspectorObject*, const String& name, bool* valueFound, InspectorArray* protocolErrors);
+ static bool getBoolean(InspectorObject*, const String& name, bool* valueFound, InspectorArray* protocolErrors);
+ static PassRefPtr<InspectorValue> getValue(InspectorObject*, const String& name, bool* valueFound, InspectorArray* protocolErrors);
+ static PassRefPtr<InspectorObject> getObject(InspectorObject*, const String& name, bool* valueFound, InspectorArray* protocolErrors);
+ static PassRefPtr<InspectorArray> getArray(InspectorObject*, const String& name, bool* valueFound, InspectorArray* protocolErrors);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> InspectorBackendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorEnvironmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> virtual void willCallInjectedScriptFunction(JSC::ExecState*, const String& scriptName, int scriptLine) = 0;
</span><span class="cx"> virtual void didCallInjectedScriptFunction(JSC::ExecState*) = 0;
</span><span class="cx"> virtual void frontendInitialized() = 0;
</span><del>- virtual Ref<WTF::Stopwatch> executionStopwatch() = 0;
</del><ins>+ virtual PassRefPtr<WTF::Stopwatch> executionStopwatch() = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorProtocolTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/InspectorProtocolTypes.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -31,13 +31,12 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorValues.h"
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx"> namespace Protocol {
</span><span class="cx">
</span><del>-template<typename T> struct BindingTraits;
-
</del><span class="cx"> template<typename T>
</span><span class="cx"> class OptOutput {
</span><span class="cx"> public:
</span><span class="lines">@@ -64,44 +63,128 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(OptOutput);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+// This class provides "Traits" type for the input type T. It is programmed using C++ template specialization
+// technique. By default it simply takes "ItemTraits" type from T, but it doesn't work with the base types.
</ins><span class="cx"> template<typename T>
</span><ins>+struct ArrayItemHelper {
+ typedef typename T::ItemTraits Traits;
+};
+
+template<typename T>
</ins><span class="cx"> class Array : public InspectorArrayBase {
</span><span class="cx"> private:
</span><span class="cx"> Array() { }
</span><span class="cx">
</span><del>- InspectorArray& openAccessors()
</del><ins>+ InspectorArray* openAccessors()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(sizeof(InspectorArray) == sizeof(Array<T>), cannot_cast);
</span><del>- return *static_cast<InspectorArray*>(static_cast<InspectorArrayBase*>(this));
</del><ins>+ return static_cast<InspectorArray*>(static_cast<InspectorArrayBase*>(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- void addItem(Ref<T>&& value)
</del><ins>+ void addItem(PassRefPtr<T> value)
</ins><span class="cx"> {
</span><del>- openAccessors().pushValue(&value.get());
</del><ins>+ ArrayItemHelper<T>::Traits::pushRefPtr(this->openAccessors(), value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void addItem(RefPtr<T>&& value)
</del><ins>+ void addItem(T value)
</ins><span class="cx"> {
</span><del>- openAccessors().pushValue(WTF::move(value));
</del><ins>+ ArrayItemHelper<T>::Traits::pushRaw(this->openAccessors(), value);
</ins><span class="cx"> }
</span><del>-
- void addItem(const String& value)
</del><ins>+
+ static PassRefPtr<Array<T>> create()
</ins><span class="cx"> {
</span><del>- openAccessors().pushString(value);
</del><ins>+ return adoptRef(new Array<T>());
</ins><span class="cx"> }
</span><ins>+};
</ins><span class="cx">
</span><del>- void addItem(int value)
</del><ins>+struct StructItemTraits {
+ static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorValue> value)
</ins><span class="cx"> {
</span><del>- openAccessors().pushInteger(value);
</del><ins>+ array->pushValue(value);
</ins><span class="cx"> }
</span><del>-
- static Ref<Array<T>> create()
- {
- return adoptRef(*new Array<T>());
- }
</del><span class="cx"> };
</span><span class="cx">
</span><ins>+template<>
+struct ArrayItemHelper<String> {
+ struct Traits {
+ static void pushRaw(InspectorArray* array, const String& value)
+ {
+ array->pushString(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<int> {
+ struct Traits {
+ static void pushRaw(InspectorArray* array, int value)
+ {
+ array->pushInteger(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<double> {
+ struct Traits {
+ static void pushRaw(InspectorArray* array, double value)
+ {
+ array->pushDouble(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<bool> {
+ struct Traits {
+ static void pushRaw(InspectorArray* array, bool value)
+ {
+ array->pushBoolean(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<InspectorValue> {
+ struct Traits {
+ static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorValue> value)
+ {
+ array->pushValue(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<InspectorObject> {
+ struct Traits {
+ static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorValue> value)
+ {
+ array->pushValue(value);
+ }
+ };
+};
+
+template<>
+struct ArrayItemHelper<InspectorArray> {
+ struct Traits {
+ static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorArray> value)
+ {
+ array->pushArray(value);
+ }
+ };
+};
+
+template<typename T>
+struct ArrayItemHelper<Protocol::Array<T>> {
+ struct Traits {
+ static void pushRefPtr(InspectorArray* array, PassRefPtr<Protocol::Array<T>> value)
+ {
+ array->pushValue(value);
+ }
+ };
+};
+
</ins><span class="cx"> // Helper methods for Protocol and other Inspector types are provided by
</span><span class="cx"> // specializations of BindingTraits<T>. Some are generated for protocol types.
</span><span class="cx">
</span><span class="lines">@@ -109,9 +192,8 @@
</span><span class="cx"> struct BindingTraits {
</span><span class="cx"> typedef T BindingType;
</span><span class="cx">
</span><del>- static void push(InspectorArray&, BindingType&);
</del><span class="cx"> static InspectorValue::Type typeTag();
</span><del>- static RefPtr<T> runtimeCast(RefPtr<InspectorObject>&&);
</del><ins>+ static PassRefPtr<T> runtimeCast(PassRefPtr<InspectorObject>);
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> static void assertValueHasExpectedType(InspectorValue*);
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="lines">@@ -122,16 +204,15 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> static void assertValueHasExpectedType(InspectorValue* value)
</span><span class="cx"> {
</span><del>- ASSERT_ARG(value, value && value->type() == TYPE);
</del><ins>+ ASSERT(value->type() == TYPE);
</ins><span class="cx"> }
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="cx"> struct BindingTraits<Protocol::Array<T>> {
</span><del>- static RefPtr<Array<T>> runtimeCast(RefPtr<InspectorValue>&& value)
</del><ins>+ static PassRefPtr<Array<T>> runtimeCast(PassRefPtr<InspectorValue> value)
</ins><span class="cx"> {
</span><del>- ASSERT_ARG(value, value);
</del><span class="cx"> RefPtr<InspectorArray> array;
</span><span class="cx"> bool castSucceeded = value->asArray(array);
</span><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="lines">@@ -145,7 +226,6 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> static void assertValueHasExpectedType(InspectorValue* value)
</span><span class="cx"> {
</span><del>- ASSERT_ARG(value, value);
</del><span class="cx"> RefPtr<InspectorArray> array;
</span><span class="cx"> bool castSucceeded = value->asArray(array);
</span><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorValue> buildValue(const UChar* start, const UChar* end, const UChar** valueTokenEnd, int depth)
</del><ins>+PassRefPtr<InspectorValue> buildValue(const UChar* start, const UChar* end, const UChar** valueTokenEnd, int depth)
</ins><span class="cx"> {
</span><span class="cx"> if (depth > stackLimit)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -385,14 +385,14 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case ARRAY_BEGIN: {
</span><del>- Ref<InspectorArray> array = InspectorArray::create();
</del><ins>+ RefPtr<InspectorArray> array = InspectorArray::create();
</ins><span class="cx"> start = tokenEnd;
</span><span class="cx"> token = parseToken(start, end, &tokenStart, &tokenEnd);
</span><span class="cx"> while (token != ARRAY_END) {
</span><span class="cx"> RefPtr<InspectorValue> arrayNode = buildValue(start, end, &tokenEnd, depth + 1);
</span><span class="cx"> if (!arrayNode)
</span><span class="cx"> return nullptr;
</span><del>- array->pushValue(WTF::move(arrayNode));
</del><ins>+ array->pushValue(arrayNode);
</ins><span class="cx">
</span><span class="cx"> // After a list value, we expect a comma or the end of the list.
</span><span class="cx"> start = tokenEnd;
</span><span class="lines">@@ -409,11 +409,11 @@
</span><span class="cx"> }
</span><span class="cx"> if (token != ARRAY_END)
</span><span class="cx"> return nullptr;
</span><del>- result = WTF::move(array);
</del><ins>+ result = array.release();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case OBJECT_BEGIN: {
</span><del>- Ref<InspectorObject> object = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> object = InspectorObject::create();
</ins><span class="cx"> start = tokenEnd;
</span><span class="cx"> token = parseToken(start, end, &tokenStart, &tokenEnd);
</span><span class="cx"> while (token != OBJECT_END) {
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> RefPtr<InspectorValue> value = buildValue(start, end, &tokenEnd, depth + 1);
</span><span class="cx"> if (!value)
</span><span class="cx"> return nullptr;
</span><del>- object->setValue(key, WTF::move(value));
</del><ins>+ object->setValue(key, value);
</ins><span class="cx"> start = tokenEnd;
</span><span class="cx">
</span><span class="cx"> // After a key/value pair, we expect a comma or the end of the
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (token != OBJECT_END)
</span><span class="cx"> return nullptr;
</span><del>- result = WTF::move(object);
</del><ins>+ result = object.release();
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -739,8 +739,8 @@
</span><span class="cx">
</span><span class="cx"> bool InspectorObjectBase::getBoolean(const String& name, bool& output) const
</span><span class="cx"> {
</span><del>- RefPtr<InspectorValue> value;
- if (!getValue(name, value))
</del><ins>+ RefPtr<InspectorValue> value = get(name);
+ if (!value)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return value->asBoolean(output);
</span><span class="lines">@@ -748,39 +748,40 @@
</span><span class="cx">
</span><span class="cx"> bool InspectorObjectBase::getString(const String& name, String& output) const
</span><span class="cx"> {
</span><del>- RefPtr<InspectorValue> value;
- if (!getValue(name, value))
</del><ins>+ RefPtr<InspectorValue> value = get(name);
+ if (!value)
</ins><span class="cx"> return false;
</span><del>-
</del><span class="cx"> return value->asString(output);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorObjectBase::getObject(const String& name, RefPtr<InspectorObject>& output) const
</del><ins>+PassRefPtr<InspectorObject> InspectorObjectBase::getObject(const String& name) const
</ins><span class="cx"> {
</span><del>- RefPtr<InspectorValue> value;
- if (!getValue(name, value))
- return false;
</del><ins>+ PassRefPtr<InspectorValue> value = get(name);
+ if (!value)
+ return nullptr;
</ins><span class="cx">
</span><del>- return value->asObject(output);
</del><ins>+ RefPtr<InspectorObject> result;
+ value->asObject(result);
+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorObjectBase::getArray(const String& name, RefPtr<InspectorArray>& output) const
</del><ins>+PassRefPtr<InspectorArray> InspectorObjectBase::getArray(const String& name) const
</ins><span class="cx"> {
</span><del>- RefPtr<InspectorValue> value;
- if (!getValue(name, value))
- return false;
</del><ins>+ PassRefPtr<InspectorValue> value = get(name);
+ if (!value)
+ return nullptr;
</ins><span class="cx">
</span><del>- return value->asArray(output);
</del><ins>+ RefPtr<InspectorArray> result;
+ value->asArray(result);
+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorObjectBase::getValue(const String& name, RefPtr<InspectorValue>& output) const
</del><ins>+PassRefPtr<InspectorValue> InspectorObjectBase::get(const String& name) const
</ins><span class="cx"> {
</span><del>- Dictionary::const_iterator findResult = m_data.find(name);
- if (findResult == m_data.end())
- return false;
-
- output = findResult->value;
- return true;
</del><ins>+ Dictionary::const_iterator it = m_data.find(name);
+ if (it == m_data.end())
+ return nullptr;
+ return it->value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorObjectBase::remove(const String& name)
</span><span class="lines">@@ -798,13 +799,13 @@
</span><span class="cx"> {
</span><span class="cx"> output.append('{');
</span><span class="cx"> for (size_t i = 0; i < m_order.size(); ++i) {
</span><del>- auto findResult = m_data.find(m_order[i]);
- ASSERT(findResult != m_data.end());
</del><ins>+ Dictionary::const_iterator it = m_data.find(m_order[i]);
+ ASSERT(it != m_data.end());
</ins><span class="cx"> if (i)
</span><span class="cx"> output.append(',');
</span><del>- doubleQuoteString(findResult->key, output);
</del><ins>+ doubleQuoteString(it->key, output);
</ins><span class="cx"> output.append(':');
</span><del>- findResult->value->writeJSON(output);
</del><ins>+ it->value->writeJSON(output);
</ins><span class="cx"> }
</span><span class="cx"> output.append('}');
</span><span class="cx"> }
</span><span class="lines">@@ -844,50 +845,50 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorValue> InspectorArrayBase::get(size_t index)
</del><ins>+PassRefPtr<InspectorValue> InspectorArrayBase::get(size_t index)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(index < m_data.size());
</span><span class="cx"> return m_data[index];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> InspectorObject::create()
</del><ins>+PassRefPtr<InspectorObject> InspectorObject::create()
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorObject);
</del><ins>+ return adoptRef(new InspectorObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorArray> InspectorArray::create()
</del><ins>+PassRefPtr<InspectorArray> InspectorArray::create()
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorArray);
</del><ins>+ return adoptRef(new InspectorArray);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorValue> InspectorValue::null()
</del><ins>+PassRefPtr<InspectorValue> InspectorValue::null()
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorValue);
</del><ins>+ return adoptRef(new InspectorValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorString> InspectorString::create(const String& value)
</del><ins>+PassRefPtr<InspectorString> InspectorString::create(const String& value)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorString(value));
</del><ins>+ return adoptRef(new InspectorString(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorString> InspectorString::create(const char* value)
</del><ins>+PassRefPtr<InspectorString> InspectorString::create(const char* value)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorString(value));
</del><ins>+ return adoptRef(new InspectorString(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorBasicValue> InspectorBasicValue::create(bool value)
</del><ins>+PassRefPtr<InspectorBasicValue> InspectorBasicValue::create(bool value)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorBasicValue(value));
</del><ins>+ return adoptRef(new InspectorBasicValue(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorBasicValue> InspectorBasicValue::create(int value)
</del><ins>+PassRefPtr<InspectorBasicValue> InspectorBasicValue::create(int value)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorBasicValue(value));
</del><ins>+ return adoptRef(new InspectorBasicValue(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorBasicValue> InspectorBasicValue::create(double value)
</del><ins>+PassRefPtr<InspectorBasicValue> InspectorBasicValue::create(double value)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorBasicValue(value));
</del><ins>+ return adoptRef(new InspectorBasicValue(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorValues.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorValues.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/InspectorValues.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #ifndef InspectorValues_h
</span><span class="cx"> #define InspectorValues_h
</span><span class="cx">
</span><del>-#include <wtf/Assertions.h>
</del><ins>+#include <wtf/Forward.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> : m_type(Type::Null) { }
</span><span class="cx"> virtual ~InspectorValue() { }
</span><span class="cx">
</span><del>- static Ref<InspectorValue> null();
</del><ins>+ static PassRefPtr<InspectorValue> null();
</ins><span class="cx">
</span><span class="cx"> enum class Type {
</span><span class="cx"> Null = 0,
</span><span class="lines">@@ -99,9 +99,9 @@
</span><span class="cx"> class JS_EXPORT_PRIVATE InspectorBasicValue : public InspectorValue {
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- static Ref<InspectorBasicValue> create(bool);
- static Ref<InspectorBasicValue> create(int);
- static Ref<InspectorBasicValue> create(double);
</del><ins>+ static PassRefPtr<InspectorBasicValue> create(bool);
+ static PassRefPtr<InspectorBasicValue> create(int);
+ static PassRefPtr<InspectorBasicValue> create(double);
</ins><span class="cx">
</span><span class="cx"> virtual bool asBoolean(bool&) const override;
</span><span class="cx"> // Numbers from the frontend are always parsed as doubles, so we allow
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx">
</span><span class="cx"> class JS_EXPORT_PRIVATE InspectorString : public InspectorValue {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorString> create(const String&);
- static Ref<InspectorString> create(const char*);
</del><ins>+ static PassRefPtr<InspectorString> create(const String&);
+ static PassRefPtr<InspectorString> create(const char*);
</ins><span class="cx">
</span><span class="cx"> virtual bool asString(String& output) const override;
</span><span class="cx">
</span><span class="lines">@@ -177,9 +177,9 @@
</span><span class="cx"> void setInteger(const String& name, int);
</span><span class="cx"> void setDouble(const String& name, double);
</span><span class="cx"> void setString(const String& name, const String&);
</span><del>- void setValue(const String& name, RefPtr<InspectorValue>&&);
- void setObject(const String& name, RefPtr<InspectorObjectBase>&&);
- void setArray(const String& name, RefPtr<InspectorArrayBase>&&);
</del><ins>+ void setValue(const String& name, PassRefPtr<InspectorValue>);
+ void setObject(const String& name, PassRefPtr<InspectorObjectBase>);
+ void setArray(const String& name, PassRefPtr<InspectorArrayBase>);
</ins><span class="cx">
</span><span class="cx"> iterator find(const String& name);
</span><span class="cx"> const_iterator find(const String& name) const;
</span><span class="lines">@@ -188,25 +188,23 @@
</span><span class="cx"> bool getBoolean(const String& name, bool& output) const;
</span><span class="cx"> template<class T> bool getDouble(const String& name, T& output) const
</span><span class="cx"> {
</span><del>- RefPtr<InspectorValue> value;
- if (!getValue(name, value))
</del><ins>+ RefPtr<InspectorValue> value = get(name);
+ if (!value)
</ins><span class="cx"> return false;
</span><del>-
</del><span class="cx"> return value->asDouble(output);
</span><span class="cx"> }
</span><span class="cx"> template<class T> bool getInteger(const String& name, T& output) const
</span><span class="cx"> {
</span><del>- RefPtr<InspectorValue> value;
- if (!getValue(name, value))
</del><ins>+ RefPtr<InspectorValue> value = get(name);
+ if (!value)
</ins><span class="cx"> return false;
</span><del>-
</del><span class="cx"> return value->asInteger(output);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool getString(const String& name, String& output) const;
</span><del>- bool getObject(const String& name, RefPtr<InspectorObject>&) const;
- bool getArray(const String& name, RefPtr<InspectorArray>&) const;
- bool getValue(const String& name, RefPtr<InspectorValue>&) const;
</del><ins>+ PassRefPtr<InspectorObject> getObject(const String& name) const;
+ PassRefPtr<InspectorArray> getArray(const String& name) const;
+ PassRefPtr<InspectorValue> get(const String& name) const;
</ins><span class="cx">
</span><span class="cx"> void remove(const String& name);
</span><span class="cx">
</span><span class="lines">@@ -229,7 +227,7 @@
</span><span class="cx">
</span><span class="cx"> class InspectorObject : public InspectorObjectBase {
</span><span class="cx"> public:
</span><del>- static JS_EXPORT_PRIVATE Ref<InspectorObject> create();
</del><ins>+ static JS_EXPORT_PRIVATE PassRefPtr<InspectorObject> create();
</ins><span class="cx">
</span><span class="cx"> using InspectorObjectBase::asObject;
</span><span class="cx">
</span><span class="lines">@@ -248,7 +246,7 @@
</span><span class="cx"> using InspectorObjectBase::getString;
</span><span class="cx"> using InspectorObjectBase::getObject;
</span><span class="cx"> using InspectorObjectBase::getArray;
</span><del>- using InspectorObjectBase::getValue;
</del><ins>+ using InspectorObjectBase::get;
</ins><span class="cx">
</span><span class="cx"> using InspectorObjectBase::remove;
</span><span class="cx">
</span><span class="lines">@@ -275,11 +273,11 @@
</span><span class="cx"> void pushInteger(int);
</span><span class="cx"> void pushDouble(double);
</span><span class="cx"> void pushString(const String&);
</span><del>- void pushValue(RefPtr<InspectorValue>&&);
- void pushObject(RefPtr<InspectorObjectBase>&&);
- void pushArray(RefPtr<InspectorArrayBase>&&);
</del><ins>+ void pushValue(PassRefPtr<InspectorValue>);
+ void pushObject(PassRefPtr<InspectorObject>);
+ void pushArray(PassRefPtr<InspectorArray>);
</ins><span class="cx">
</span><del>- RefPtr<InspectorValue> get(size_t index);
</del><ins>+ PassRefPtr<InspectorValue> get(size_t index);
</ins><span class="cx">
</span><span class="cx"> virtual void writeJSON(StringBuilder& output) const override;
</span><span class="cx">
</span><span class="lines">@@ -297,7 +295,7 @@
</span><span class="cx">
</span><span class="cx"> class InspectorArray : public InspectorArrayBase {
</span><span class="cx"> public:
</span><del>- static JS_EXPORT_PRIVATE Ref<InspectorArray> create();
</del><ins>+ static JS_EXPORT_PRIVATE PassRefPtr<InspectorArray> create();
</ins><span class="cx">
</span><span class="cx"> using InspectorArrayBase::asArray;
</span><span class="cx">
</span><span class="lines">@@ -346,24 +344,24 @@
</span><span class="cx"> setValue(name, InspectorString::create(value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorObjectBase::setValue(const String& name, RefPtr<InspectorValue>&& value)
</del><ins>+inline void InspectorObjectBase::setValue(const String& name, PassRefPtr<InspectorValue> value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- if (m_data.set(name, WTF::move(value)).isNewEntry)
</del><ins>+ if (m_data.set(name, value).isNewEntry)
</ins><span class="cx"> m_order.append(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorObjectBase::setObject(const String& name, RefPtr<InspectorObjectBase>&& value)
</del><ins>+inline void InspectorObjectBase::setObject(const String& name, PassRefPtr<InspectorObjectBase> value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- if (m_data.set(name, WTF::move(value)).isNewEntry)
</del><ins>+ if (m_data.set(name, value).isNewEntry)
</ins><span class="cx"> m_order.append(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorObjectBase::setArray(const String& name, RefPtr<InspectorArrayBase>&& value)
</del><ins>+inline void InspectorObjectBase::setArray(const String& name, PassRefPtr<InspectorArrayBase> value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- if (m_data.set(name, WTF::move(value)).isNewEntry)
</del><ins>+ if (m_data.set(name, value).isNewEntry)
</ins><span class="cx"> m_order.append(name);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -387,22 +385,22 @@
</span><span class="cx"> m_data.append(InspectorString::create(value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorArrayBase::pushValue(RefPtr<InspectorValue>&& value)
</del><ins>+inline void InspectorArrayBase::pushValue(PassRefPtr<InspectorValue> value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- m_data.append(WTF::move(value));
</del><ins>+ m_data.append(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorArrayBase::pushObject(RefPtr<InspectorObjectBase>&& value)
</del><ins>+inline void InspectorArrayBase::pushObject(PassRefPtr<InspectorObject> value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- m_data.append(WTF::move(value));
</del><ins>+ m_data.append(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorArrayBase::pushArray(RefPtr<InspectorArrayBase>&& value)
</del><ins>+inline void InspectorArrayBase::pushArray(PassRefPtr<InspectorArray> value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- m_data.append(WTF::move(value));
</del><ins>+ m_data.append(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -75,18 +75,19 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void JSGlobalObjectConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, PassRefPtr<ScriptArguments> prpArguments)
</ins><span class="cx"> {
</span><ins>+ RefPtr<ScriptArguments> arguments = prpArguments;
</ins><span class="cx">
</span><span class="cx"> if (JSGlobalObjectConsoleClient::logToSystemConsole())
</span><del>- ConsoleClient::printConsoleMessageWithArguments(MessageSource::ConsoleAPI, type, level, exec, arguments.copyRef());
</del><ins>+ ConsoleClient::printConsoleMessageWithArguments(MessageSource::ConsoleAPI, type, level, exec, arguments);
</ins><span class="cx">
</span><span class="cx"> String message;
</span><span class="cx"> arguments->getFirstArgumentAsString(message);
</span><del>- m_consoleAgent->addMessageToConsole(MessageSource::ConsoleAPI, type, level, message, exec, WTF::move(arguments));
</del><ins>+ m_consoleAgent->addMessageToConsole(MessageSource::ConsoleAPI, type, level, message, exec, arguments.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectConsoleClient::count(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void JSGlobalObjectConsoleClient::count(ExecState* exec, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><span class="cx"> m_consoleAgent->count(exec, arguments);
</span><span class="cx"> }
</span><span class="lines">@@ -109,10 +110,10 @@
</span><span class="cx"> void JSGlobalObjectConsoleClient::timeEnd(ExecState* exec, const String& title)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, 1));
</span><del>- m_consoleAgent->stopTiming(title, WTF::move(callStack));
</del><ins>+ m_consoleAgent->stopTiming(title, callStack.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectConsoleClient::timeStamp(ExecState*, RefPtr<ScriptArguments>&&)
</del><ins>+void JSGlobalObjectConsoleClient::timeStamp(ExecState*, PassRefPtr<ScriptArguments>)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: JSContext inspection needs a timeline.
</span><span class="cx"> warnUnimplemented(ASCIILiteral("console.timeStamp"));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -43,17 +43,17 @@
</span><span class="cx"> static void initializeLogToSystemConsole();
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
- virtual void count(JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
</del><ins>+ virtual void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, PassRefPtr<ScriptArguments>) override;
+ virtual void count(JSC::ExecState*, PassRefPtr<ScriptArguments>) override;
</ins><span class="cx"> virtual void profile(JSC::ExecState*, const String& title) override;
</span><span class="cx"> virtual void profileEnd(JSC::ExecState*, const String& title) override;
</span><span class="cx"> virtual void time(JSC::ExecState*, const String& title) override;
</span><span class="cx"> virtual void timeEnd(JSC::ExecState*, const String& title) override;
</span><del>- virtual void timeStamp(JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
</del><ins>+ virtual void timeStamp(JSC::ExecState*, PassRefPtr<ScriptArguments>) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void warnUnimplemented(const String& method);
</span><del>- void internalAddMessage(MessageType, MessageLevel, JSC::ExecState*, RefPtr<ScriptArguments>&&);
</del><ins>+ void internalAddMessage(MessageType, MessageLevel, JSC::ExecState*, PassRefPtr<ScriptArguments>);
</ins><span class="cx">
</span><span class="cx"> InspectorConsoleAgent* m_consoleAgent;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -222,9 +222,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Stopwatch> JSGlobalObjectInspectorController::executionStopwatch()
</del><ins>+PassRefPtr<Stopwatch> JSGlobalObjectInspectorController::executionStopwatch()
</ins><span class="cx"> {
</span><del>- return m_executionStopwatch.copyRef();
</del><ins>+ return m_executionStopwatch;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> virtual void willCallInjectedScriptFunction(JSC::ExecState*, const String&, int) override { }
</span><span class="cx"> virtual void didCallInjectedScriptFunction(JSC::ExecState*) override { }
</span><span class="cx"> virtual void frontendInitialized() override;
</span><del>- virtual Ref<WTF::Stopwatch> executionStopwatch() override;
</del><ins>+ virtual PassRefPtr<WTF::Stopwatch> executionStopwatch() override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> virtual AugmentableInspectorControllerClient* augmentableInspectorControllerClient() const override { return m_augmentingClient; }
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> InspectorAgentRegistry m_agents;
</span><span class="cx"> InspectorFrontendChannel* m_inspectorFrontendChannel;
</span><span class="cx"> RefPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher;
</span><del>- Ref<WTF::Stopwatch> m_executionStopwatch;
</del><ins>+ RefPtr<WTF::Stopwatch> m_executionStopwatch;
</ins><span class="cx"> bool m_includeNativeCallStackWithExceptions;
</span><span class="cx"> bool m_isAutomaticInspection;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-Ref<Inspector::Protocol::Console::CallFrame> ScriptCallFrame::buildInspectorObject() const
</del><ins>+PassRefPtr<Inspector::Protocol::Console::CallFrame> ScriptCallFrame::buildInspectorObject() const
</ins><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::Console::CallFrame::create()
</span><span class="cx"> .setFunctionName(m_functionName)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallFrame.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> bool isEqual(const ScriptCallFrame&) const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- Ref<Inspector::Protocol::Console::CallFrame> buildInspectorObject() const;
</del><ins>+ PassRefPtr<Inspector::Protocol::Console::CallFrame> buildInspectorObject() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStack.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -36,14 +36,14 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-Ref<ScriptCallStack> ScriptCallStack::create()
</del><ins>+PassRefPtr<ScriptCallStack> ScriptCallStack::create()
</ins><span class="cx"> {
</span><del>- return adoptRef(*new ScriptCallStack);
</del><ins>+ return adoptRef(new ScriptCallStack);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<ScriptCallStack> ScriptCallStack::create(Vector<ScriptCallFrame>& frames)
</del><ins>+PassRefPtr<ScriptCallStack> ScriptCallStack::create(Vector<ScriptCallFrame>& frames)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new ScriptCallStack(frames));
</del><ins>+ return adoptRef(new ScriptCallStack(frames));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScriptCallStack::ScriptCallStack()
</span><span class="lines">@@ -107,12 +107,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-Ref<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> ScriptCallStack::buildInspectorArray() const
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> ScriptCallStack::buildInspectorArray() const
</ins><span class="cx"> {
</span><del>- auto frames = Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> frames = Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>::create();
</ins><span class="cx"> for (size_t i = 0; i < m_frames.size(); i++)
</span><span class="cx"> frames->addItem(m_frames.at(i).buildInspectorObject());
</span><del>- return WTF::move(frames);
</del><ins>+ return frames;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStack.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx"> public:
</span><span class="cx"> static const size_t maxCallStackSizeToCapture = 200;
</span><span class="cx">
</span><del>- static Ref<ScriptCallStack> create();
- static Ref<ScriptCallStack> create(Vector<ScriptCallFrame>&);
</del><ins>+ static PassRefPtr<ScriptCallStack> create();
+ static PassRefPtr<ScriptCallStack> create(Vector<ScriptCallFrame>&);
</ins><span class="cx">
</span><span class="cx"> ~ScriptCallStack();
</span><span class="cx">
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> bool isEqual(ScriptCallStack*) const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- Ref<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> buildInspectorArray() const;
</del><ins>+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Console::CallFrame>> buildInspectorArray() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> m_enabled = true;
</span><span class="cx">
</span><span class="cx"> if (m_pendingInspectData.first)
</span><del>- inspect(m_pendingInspectData.first.copyRef(), m_pendingInspectData.second.copyRef());
</del><ins>+ inspect(m_pendingInspectData.first, m_pendingInspectData.second);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_pendingExtraDomainsData)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> m_environment.frontendInitialized();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::inspect(RefPtr<Protocol::Runtime::RemoteObject>&& objectToInspect, RefPtr<InspectorObject>&& hints)
</del><ins>+void InspectorAgent::inspect(PassRefPtr<Protocol::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints)
</ins><span class="cx"> {
</span><span class="cx"> if (m_enabled && m_frontendDispatcher) {
</span><span class="cx"> m_frontendDispatcher->inspect(objectToInspect, hints);
</span><span class="lines">@@ -130,9 +130,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<Inspector::Protocol::Array<String>> domainNames = Inspector::Protocol::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> domainNames = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> domainNames->addItem(domainName);
</span><del>- m_frontendDispatcher->activateExtraDomains(WTF::move(domainNames));
</del><ins>+ m_frontendDispatcher->activateExtraDomains(domainNames.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorAgent::activateExtraDomains(const Vector<String>& extraDomains)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span><span class="cx"> virtual void initialized(ErrorString&) override;
</span><span class="cx">
</span><del>- void inspect(RefPtr<Protocol::Runtime::RemoteObject>&& objectToInspect, RefPtr<InspectorObject>&& hints);
</del><ins>+ void inspect(PassRefPtr<Protocol::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
</ins><span class="cx"> void evaluateForTestInFrontend(const String& script);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -141,16 +141,16 @@
</span><span class="cx"> void InspectorDebuggerAgent::handleConsoleAssert(const String& message)
</span><span class="cx"> {
</span><span class="cx"> if (scriptDebugServer().pauseOnExceptionsState() != JSC::Debugger::DontPauseOnExceptions) {
</span><del>- Ref<Inspector::Protocol::Debugger::AssertPauseReason> reason = Inspector::Protocol::Debugger::AssertPauseReason::create().release();
</del><ins>+ RefPtr<Inspector::Protocol::Debugger::AssertPauseReason> reason = Inspector::Protocol::Debugger::AssertPauseReason::create();
</ins><span class="cx"> if (!message.isNull())
</span><span class="cx"> reason->setMessage(message);
</span><span class="cx"> breakProgram(InspectorDebuggerFrontendDispatcher::Reason::Assert, reason->openAccessors());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorObject> buildObjectForBreakpointCookie(const String& url, int lineNumber, int columnNumber, const String& condition, RefPtr<InspectorArray>& actions, bool isRegex, bool autoContinue)
</del><ins>+static PassRefPtr<InspectorObject> buildObjectForBreakpointCookie(const String& url, int lineNumber, int columnNumber, const String& condition, RefPtr<InspectorArray>& actions, bool isRegex, bool autoContinue)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> breakpointObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> breakpointObject = InspectorObject::create();
</ins><span class="cx"> breakpointObject->setString(ASCIILiteral("url"), url);
</span><span class="cx"> breakpointObject->setInteger(ASCIILiteral("lineNumber"), lineNumber);
</span><span class="cx"> breakpointObject->setInteger(ASCIILiteral("columnNumber"), columnNumber);
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString& errorString, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const RefPtr<InspectorObject>&& options, Inspector::Protocol::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations)
</del><ins>+void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString& errorString, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const RefPtr<InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations)
</ins><span class="cx"> {
</span><span class="cx"> locations = Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>::create();
</span><span class="cx"> if (!optionalURL == !optionalURLRegex) {
</span><span class="lines">@@ -261,9 +261,9 @@
</span><span class="cx"> bool autoContinue = false;
</span><span class="cx"> RefPtr<InspectorArray> actions;
</span><span class="cx"> if (options) {
</span><del>- options->getString(ASCIILiteral("condition"), condition);
- options->getBoolean(ASCIILiteral("autoContinue"), autoContinue);
- options->getArray(ASCIILiteral("actions"), actions);
</del><ins>+ (*options)->getString(ASCIILiteral("condition"), condition);
+ (*options)->getBoolean(ASCIILiteral("autoContinue"), autoContinue);
+ actions = (*options)->getArray(ASCIILiteral("actions"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BreakpointActions breakpointActions;
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Inspector::Protocol::Debugger::Location> location = resolveBreakpoint(breakpointIdentifier, it->key, breakpoint);
</span><span class="cx"> if (location)
</span><del>- locations->addItem(WTF::move(location));
</del><ins>+ locations->addItem(location);
</ins><span class="cx"> }
</span><span class="cx"> *outBreakpointIdentifier = breakpointIdentifier;
</span><span class="cx"> }
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::setBreakpoint(ErrorString& errorString, const RefPtr<InspectorObject>&& location, const RefPtr<InspectorObject>&& options, Inspector::Protocol::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation)
</del><ins>+void InspectorDebuggerAgent::setBreakpoint(ErrorString& errorString, const RefPtr<InspectorObject>& location, const RefPtr<InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation)
</ins><span class="cx"> {
</span><span class="cx"> JSC::SourceID sourceID;
</span><span class="cx"> unsigned lineNumber;
</span><span class="lines">@@ -312,9 +312,9 @@
</span><span class="cx"> bool autoContinue = false;
</span><span class="cx"> RefPtr<InspectorArray> actions;
</span><span class="cx"> if (options) {
</span><del>- options->getString(ASCIILiteral("condition"), condition);
- options->getBoolean(ASCIILiteral("autoContinue"), autoContinue);
- options->getArray(ASCIILiteral("actions"), actions);
</del><ins>+ (*options)->getString(ASCIILiteral("condition"), condition);
+ (*options)->getBoolean(ASCIILiteral("autoContinue"), autoContinue);
+ actions = (*options)->getArray(ASCIILiteral("actions"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BreakpointActions breakpointActions;
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::continueToLocation(ErrorString& errorString, const RefPtr<InspectorObject>&& location)
</del><ins>+void InspectorDebuggerAgent::continueToLocation(ErrorString& errorString, const RefPtr<InspectorObject>& location)
</ins><span class="cx"> {
</span><span class="cx"> if (m_continueToLocationBreakpointID != JSC::noBreakpointID) {
</span><span class="cx"> scriptDebugServer().removeBreakpoint(m_continueToLocationBreakpointID);
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> resume(errorString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID sourceID, const ScriptBreakpoint& breakpoint)
</del><ins>+PassRefPtr<Inspector::Protocol::Debugger::Location> InspectorDebuggerAgent::resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID sourceID, const ScriptBreakpoint& breakpoint)
</ins><span class="cx"> {
</span><span class="cx"> ScriptsMap::iterator scriptIterator = m_scripts.find(sourceID);
</span><span class="cx"> if (scriptIterator == m_scripts.end())
</span><span class="lines">@@ -388,12 +388,11 @@
</span><span class="cx"> debugServerBreakpointIDsIterator = m_breakpointIdentifierToDebugServerBreakpointIDs.set(breakpointIdentifier, Vector<JSC::BreakpointID>()).iterator;
</span><span class="cx"> debugServerBreakpointIDsIterator->value.append(debugServerBreakpointID);
</span><span class="cx">
</span><del>- auto location = Inspector::Protocol::Debugger::Location::create()
</del><ins>+ RefPtr<Inspector::Protocol::Debugger::Location> location = Inspector::Protocol::Debugger::Location::create()
</ins><span class="cx"> .setScriptId(String::number(sourceID))
</span><del>- .setLineNumber(actualLineNumber)
- .release();
</del><ins>+ .setLineNumber(actualLineNumber);
</ins><span class="cx"> location->setColumnNumber(actualColumnNumber);
</span><del>- return WTF::move(location);
</del><ins>+ return location;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::searchInContent(ErrorString& error, const String& scriptIDStr, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>& results)
</span><span class="lines">@@ -431,13 +430,13 @@
</span><span class="cx"> injectedScript.getFunctionDetails(errorString, functionId, &details);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data)
</del><ins>+void InspectorDebuggerAgent::schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason breakReason, PassRefPtr<InspectorObject> data)
</ins><span class="cx"> {
</span><span class="cx"> if (m_javaScriptPauseScheduled)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_breakReason = breakReason;
</span><del>- m_breakAuxData = WTF::move(data);
</del><ins>+ m_breakAuxData = data;
</ins><span class="cx"> scriptDebugServer().setPauseOnNextStatement(true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -545,14 +544,12 @@
</span><span class="cx"> void InspectorDebuggerAgent::scriptExecutionBlockedByCSP(const String& directiveText)
</span><span class="cx"> {
</span><span class="cx"> if (scriptDebugServer().pauseOnExceptionsState() != JSC::Debugger::DontPauseOnExceptions) {
</span><del>- auto reason = Inspector::Protocol::Debugger::CSPViolationPauseReason::create()
- .setDirective(directiveText)
- .release();
</del><ins>+ RefPtr<Inspector::Protocol::Debugger::CSPViolationPauseReason> reason = Inspector::Protocol::Debugger::CSPViolationPauseReason::create().setDirective(directiveText);
</ins><span class="cx"> breakProgram(InspectorDebuggerFrontendDispatcher::Reason::CSPViolation, reason->openAccessors());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> InspectorDebuggerAgent::currentCallFrames()
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> InspectorDebuggerAgent::currentCallFrames()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_pausedScriptState)
</span><span class="cx"> return Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>::create();
</span><span class="lines">@@ -609,8 +606,7 @@
</span><span class="cx"> breakpointObject->getString(ASCIILiteral("condition"), breakpoint.condition);
</span><span class="cx"> breakpointObject->getBoolean(ASCIILiteral("autoContinue"), breakpoint.autoContinue);
</span><span class="cx"> ErrorString errorString;
</span><del>- RefPtr<InspectorArray> actions;
- breakpointObject->getArray(ASCIILiteral("actions"), actions);
</del><ins>+ RefPtr<InspectorArray> actions = breakpointObject->getArray(ASCIILiteral("actions"));
</ins><span class="cx"> if (!breakpointActionsFromProtocol(errorString, actions, &breakpoint.actions)) {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> continue;
</span><span class="lines">@@ -669,15 +665,14 @@
</span><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
</span><span class="cx"> RefPtr<Protocol::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(action));
</span><del>- auto result = Protocol::Debugger::ProbeSample::create()
</del><ins>+ RefPtr<Protocol::Debugger::ProbeSample> result = Protocol::Debugger::ProbeSample::create()
</ins><span class="cx"> .setProbeId(action.identifier)
</span><span class="cx"> .setBatchId(batchId)
</span><span class="cx"> .setSampleId(sampleId)
</span><span class="cx"> .setTimestamp(m_injectedScriptManager->inspectorEnvironment().executionStopwatch()->elapsedTime())
</span><del>- .setPayload(payload.release())
- .release();
</del><ins>+ .setPayload(payload.release());
</ins><span class="cx">
</span><del>- m_frontendDispatcher->didSampleProbe(WTF::move(result));
</del><ins>+ m_frontendDispatcher->didSampleProbe(result.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::didContinue()
</span><span class="lines">@@ -692,10 +687,10 @@
</span><span class="cx"> m_frontendDispatcher->resumed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::breakProgram(InspectorDebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data)
</del><ins>+void InspectorDebuggerAgent::breakProgram(InspectorDebuggerFrontendDispatcher::Reason breakReason, PassRefPtr<InspectorObject> data)
</ins><span class="cx"> {
</span><span class="cx"> m_breakReason = breakReason;
</span><del>- m_breakAuxData = WTF::move(data);
</del><ins>+ m_breakAuxData = data;
</ins><span class="cx"> scriptDebugServer().breakProgram();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="lines">@@ -73,10 +74,10 @@
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span><span class="cx"> virtual void setBreakpointsActive(ErrorString&, bool active) override;
</span><del>- virtual void setBreakpointByUrl(ErrorString&, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const RefPtr<Inspector::InspectorObject>&& options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations) override;
- virtual void setBreakpoint(ErrorString&, const RefPtr<Inspector::InspectorObject>&& location, const RefPtr<Inspector::InspectorObject>&& options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation) override;
</del><ins>+ virtual void setBreakpointByUrl(ErrorString&, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const RefPtr<Inspector::InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations) override;
+ virtual void setBreakpoint(ErrorString&, const RefPtr<Inspector::InspectorObject>& location, const RefPtr<Inspector::InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation) override;
</ins><span class="cx"> virtual void removeBreakpoint(ErrorString&, const String& breakpointIdentifier) override;
</span><del>- virtual void continueToLocation(ErrorString&, const RefPtr<InspectorObject>&& location) override;
</del><ins>+ virtual void continueToLocation(ErrorString&, const RefPtr<InspectorObject>& location) override;
</ins><span class="cx"> 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;
</span><span class="cx"> virtual void getScriptSource(ErrorString&, const String& scriptID, String* scriptSource) override;
</span><span class="cx"> virtual void getFunctionDetails(ErrorString&, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>&) override;
</span><span class="lines">@@ -93,9 +94,9 @@
</span><span class="cx">
</span><span class="cx"> void handleConsoleAssert(const String& message);
</span><span class="cx">
</span><del>- void schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data);
</del><ins>+ void schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason breakReason, PassRefPtr<InspectorObject> data);
</ins><span class="cx"> void cancelPauseOnNextStatement();
</span><del>- void breakProgram(InspectorDebuggerFrontendDispatcher::Reason breakReason, RefPtr<InspectorObject>&& data);
</del><ins>+ void breakProgram(InspectorDebuggerFrontendDispatcher::Reason breakReason, PassRefPtr<InspectorObject> data);
</ins><span class="cx"> void scriptExecutionBlockedByCSP(const String& directiveText);
</span><span class="cx">
</span><span class="cx"> class Listener {
</span><span class="lines">@@ -131,7 +132,7 @@
</span><span class="cx"> void didClearGlobalObject();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Ref<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> currentCallFrames();
</del><ins>+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> currentCallFrames();
</ins><span class="cx">
</span><span class="cx"> virtual void didParseSource(JSC::SourceID, const Script&) override final;
</span><span class="cx"> virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) override final;
</span><span class="lines">@@ -139,7 +140,7 @@
</span><span class="cx"> virtual void breakpointActionSound(int breakpointActionIdentifier) override;
</span><span class="cx"> virtual void breakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, unsigned batchId, unsigned sampleId, const Deprecated::ScriptValue& sample) override final;
</span><span class="cx">
</span><del>- RefPtr<Inspector::Protocol::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
</del><ins>+ PassRefPtr<Inspector::Protocol::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
</ins><span class="cx"> bool assertPaused(ErrorString&);
</span><span class="cx"> void clearDebuggerBreakpointState();
</span><span class="cx"> void clearInspectorBreakpointState();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -80,12 +80,12 @@
</span><span class="cx"> return presentState;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Runtime::ErrorRange> buildErrorRangeObject(const JSTokenLocation& tokenLocation)
</del><ins>+static PassRefPtr<Inspector::Protocol::Runtime::ErrorRange> buildErrorRangeObject(const JSTokenLocation& tokenLocation)
</ins><span class="cx"> {
</span><del>- return Inspector::Protocol::Runtime::ErrorRange::create()
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::ErrorRange> result = Inspector::Protocol::Runtime::ErrorRange::create()
</ins><span class="cx"> .setStartOffset(tokenLocation.startOffset)
</span><del>- .setEndOffset(tokenLocation.endOffset)
- .release();
</del><ins>+ .setEndOffset(tokenLocation.endOffset);
+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorRuntimeAgent::parse(ErrorString&, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>& range)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::callFunctionOn(ErrorString& errorString, const String& objectId, const String& expression, const RefPtr<InspectorArray>&& optionalArguments, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</del><ins>+void InspectorRuntimeAgent::callFunctionOn(ErrorString& errorString, const String& objectId, const String& expression, const RefPtr<InspectorArray>* const optionalArguments, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> String arguments;
</span><span class="cx"> if (optionalArguments)
</span><del>- arguments = optionalArguments->toJSONString();
</del><ins>+ arguments = (*optionalArguments)->toJSONString();
</ins><span class="cx">
</span><span class="cx"> ScriptDebugServer::PauseOnExceptionsState previousPauseOnExceptionsState = ScriptDebugServer::DontPauseOnExceptions;
</span><span class="cx"> if (asBool(doNotPauseOnExceptionsAndMuteConsole))
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets(ErrorString& errorString, const RefPtr<Inspector::InspectorArray>&& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>& typeDescriptions)
</del><ins>+void InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets(ErrorString& errorString, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>& typeDescriptions)
</ins><span class="cx"> {
</span><span class="cx"> static const bool verbose = false;
</span><span class="cx"> VM& vm = globalVM();
</span><span class="lines">@@ -237,9 +237,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isValid = typeLocation && typeSet && !typeSet->isEmpty();
</span><del>- auto description = Inspector::Protocol::Runtime::TypeDescription::create()
- .setIsValid(isValid)
- .release();
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::TypeDescription> description = Inspector::Protocol::Runtime::TypeDescription::create()
+ .setIsValid(isValid);
</ins><span class="cx">
</span><span class="cx"> if (isValid) {
</span><span class="cx"> description->setLeastCommonAncestor(typeSet->leastCommonAncestor());
</span><span class="lines">@@ -248,7 +247,7 @@
</span><span class="cx"> description->setIsTruncated(typeSet->isOverflown());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- typeDescriptions->addItem(WTF::move(description));
</del><ins>+ typeDescriptions->addItem(description);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double end = currentTimeMS();
</span><span class="lines">@@ -332,12 +331,11 @@
</span><span class="cx"> const Vector<BasicBlockRange>& basicBlockRanges = vm.controlFlowProfiler()->getBasicBlocksForSourceID(sourceID, vm);
</span><span class="cx"> basicBlocks = Inspector::Protocol::Array<Inspector::Protocol::Runtime::BasicBlock>::create();
</span><span class="cx"> for (const BasicBlockRange& block : basicBlockRanges) {
</span><del>- Ref<Inspector::Protocol::Runtime::BasicBlock> location = Inspector::Protocol::Runtime::BasicBlock::create()
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::BasicBlock> location = Inspector::Protocol::Runtime::BasicBlock::create()
</ins><span class="cx"> .setStartOffset(block.m_startOffset)
</span><span class="cx"> .setEndOffset(block.m_endOffset)
</span><del>- .setHasExecuted(block.m_hasExecuted)
- .release();
- basicBlocks->addItem(WTF::move(location));
</del><ins>+ .setHasExecuted(block.m_hasExecuted);
+ basicBlocks->addItem(location);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -63,12 +63,12 @@
</span><span class="cx"> virtual void disable(ErrorString&) override { m_enabled = false; }
</span><span class="cx"> virtual void parse(ErrorString&, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>&) override final;
</span><span class="cx"> 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;
</span><del>- 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;
</del><ins>+ virtual void callFunctionOn(ErrorString&, const String& objectId, const String& expression, const RefPtr<Inspector::InspectorArray>* optionalArguments, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override final;
</ins><span class="cx"> virtual void releaseObject(ErrorString&, const ErrorString& objectId) override final;
</span><span class="cx"> 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;
</span><span class="cx"> virtual void releaseObjectGroup(ErrorString&, const String& objectGroup) override final;
</span><span class="cx"> virtual void run(ErrorString&) override;
</span><del>- virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString&, const RefPtr<Inspector::InspectorArray>&& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
</del><ins>+ virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString&, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
</ins><span class="cx"> virtual void enableTypeProfiler(ErrorString&) override;
</span><span class="cx"> virtual void disableTypeProfiler(ErrorString&) override;
</span><span class="cx"> virtual void getBasicBlocks(ErrorString&, const String& in_sourceID, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::BasicBlock>>& out_basicBlocks) override;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -116,11 +116,12 @@
</span><span class="cx"> if isinstance(_type, EnumType):
</span><span class="cx"> _type = _type.primitive_type # Fall through to primitive.
</span><span class="cx">
</span><ins>+ sigil = '*' if parameter.is_optional else '&'
</ins><span class="cx"> # This handles the 'any' type and objects with defined properties.
</span><span class="cx"> if isinstance(_type, ObjectType) or _type.qualified_name() is 'object':
</span><del>- return 'const RefPtr<Inspector::InspectorObject>&&'
</del><ins>+ return 'const RefPtr<Inspector::InspectorObject>' + sigil
</ins><span class="cx"> if isinstance(_type, ArrayType):
</span><del>- return 'const RefPtr<Inspector::InspectorArray>&&'
</del><ins>+ return 'const RefPtr<Inspector::InspectorArray>' + sigil
</ins><span class="cx"> if isinstance(_type, PrimitiveType):
</span><span class="cx"> cpp_name = CppGenerator.cpp_name_for_primitive_type(_type)
</span><span class="cx"> if parameter.is_optional:
</span><span class="lines">@@ -143,7 +144,7 @@
</span><span class="cx"> @staticmethod
</span><span class="cx"> def cpp_type_for_type_with_name(_type, type_name, is_optional):
</span><span class="cx"> if isinstance(_type, (ArrayType, ObjectType)):
</span><del>- return 'RefPtr<%s>' % CppGenerator.cpp_protocol_type_for_type(_type)
</del><ins>+ return 'PassRefPtr<%s>' % CppGenerator.cpp_protocol_type_for_type(_type)
</ins><span class="cx"> if isinstance(_type, AliasedType):
</span><span class="cx"> builder_type = CppGenerator.cpp_protocol_type_for_type(_type)
</span><span class="cx"> if is_optional:
</span><span class="lines">@@ -157,9 +158,9 @@
</span><span class="cx"> if isinstance(_type, PrimitiveType):
</span><span class="cx"> cpp_name = CppGenerator.cpp_name_for_primitive_type(_type)
</span><span class="cx"> if _type.qualified_name() in ['object']:
</span><del>- return 'RefPtr<Inspector::InspectorObject>'
</del><ins>+ return 'PassRefPtr<Inspector::InspectorObject>'
</ins><span class="cx"> elif _type.qualified_name() in ['any']:
</span><del>- return 'RefPtr<Inspector::InspectorValue>'
</del><ins>+ return 'PassRefPtr<Inspector::InspectorValue>'
</ins><span class="cx"> elif is_optional:
</span><span class="cx"> return 'const %s* const' % cpp_name
</span><span class="cx"> elif _type.qualified_name() in ['string']:
</span><span class="lines">@@ -211,7 +212,7 @@
</span><span class="cx"> _type = _type.primitive_type # Fall through.
</span><span class="cx">
</span><span class="cx"> if isinstance(_type, (ObjectType, ArrayType)):
</span><del>- return 'RefPtr<%s>&&' % CppGenerator.cpp_protocol_type_for_type(_type)
</del><ins>+ return 'PassRefPtr<%s>' % CppGenerator.cpp_protocol_type_for_type(_type)
</ins><span class="cx"> if isinstance(_type, PrimitiveType):
</span><span class="cx"> cpp_name = CppGenerator.cpp_name_for_primitive_type(_type)
</span><span class="cx"> if parameter.is_optional:
</span><span class="lines">@@ -296,9 +297,5 @@
</span><span class="cx"> return not isinstance(_type, (ArrayType, ObjectType))
</span><span class="cx">
</span><span class="cx"> @staticmethod
</span><del>- def should_use_references_for_type(_type):
- return isinstance(_type, (ArrayType, ObjectType)) or (isinstance(_type, (PrimitiveType)) and _type.qualified_name() in ["any", "object"])
-
- @staticmethod
</del><span class="cx"> def should_pass_by_copy_for_return_type(_type):
</span><span class="cx"> return isinstance(_type, (ArrayType, ObjectType)) or (isinstance(_type, (PrimitiveType)) and _type.qualified_name() == "object")
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generator_templatespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -76,10 +76,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx"> """)
</span><span class="cx">
</span><span class="lines">@@ -108,11 +108,11 @@
</span><span class="cx"> BackendDispatcherHeaderDomainDispatcherDeclaration = (
</span><span class="cx"> """${classAndExportMacro} Inspector${domainName}BackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<Inspector${domainName}BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, Inspector${domainName}BackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static PassRefPtr<Inspector${domainName}BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, Inspector${domainName}BackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, PassRefPtr<Inspector::InspectorObject> message) override;
</ins><span class="cx"> ${commandDeclarations}
</span><span class="cx"> private:
</span><del>- Inspector${domainName}BackendDispatcher(Inspector::InspectorBackendDispatcher&, Inspector${domainName}BackendDispatcherHandler*);
</del><ins>+ Inspector${domainName}BackendDispatcher(Inspector::InspectorBackendDispatcher*, Inspector${domainName}BackendDispatcherHandler*);
</ins><span class="cx"> Inspector${domainName}BackendDispatcherHandler* m_agent;
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="lines">@@ -125,13 +125,13 @@
</span><span class="cx"> BackendDispatcherHeaderAsyncCommandDeclaration = (
</span><span class="cx"> """ ${classAndExportMacro} ${callbackName} : public Inspector::InspectorBackendDispatcher::CallbackBase {
</span><span class="cx"> public:
</span><del>- ${callbackName}(Ref<Inspector::InspectorBackendDispatcher>&&, int id);
</del><ins>+ ${callbackName}(PassRefPtr<Inspector::InspectorBackendDispatcher>, int id);
</ins><span class="cx"> void sendSuccess(${outParameters});
</span><span class="cx"> };
</span><span class="cx"> virtual void ${commandName}(${inParameters}) = 0;""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherImplementationSmallSwitch = (
</span><del>- """void Inspector${domainName}BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+ """void Inspector${domainName}BackendDispatcher::dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message)
</ins><span class="cx"> {
</span><span class="cx"> Ref<Inspector${domainName}BackendDispatcher> protect(*this);
</span><span class="cx">
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> }""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherImplementationLargeSwitch = (
</span><del>-"""void Inspector${domainName}BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+"""void Inspector${domainName}BackendDispatcher::dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message)
</ins><span class="cx"> {
</span><span class="cx"> Ref<Inspector${domainName}BackendDispatcher> protect(*this);
</span><span class="cx">
</span><span class="lines">@@ -166,16 +166,16 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ((*this).*it->value)(callId, message.get());
</del><ins>+ ((*this).*it->value)(callId, *message.get());
</ins><span class="cx"> }""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherImplementationDomainConstructor = (
</span><del>- """Ref<Inspector${domainName}BackendDispatcher> Inspector${domainName}BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, Inspector${domainName}BackendDispatcherHandler* agent)
</del><ins>+ """PassRefPtr<Inspector${domainName}BackendDispatcher> Inspector${domainName}BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, Inspector${domainName}BackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new Inspector${domainName}BackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(new Inspector${domainName}BackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Inspector${domainName}BackendDispatcher::Inspector${domainName}BackendDispatcher(InspectorBackendDispatcher& backendDispatcher, Inspector${domainName}BackendDispatcherHandler* agent)
</del><ins>+Inspector${domainName}BackendDispatcher::Inspector${domainName}BackendDispatcher(InspectorBackendDispatcher* backendDispatcher, Inspector${domainName}BackendDispatcherHandler* agent)
</ins><span class="cx"> : InspectorSupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="lines">@@ -186,25 +186,26 @@
</span><span class="cx"> }""")
</span><span class="cx">
</span><span class="cx"> BackendDispatcherImplementationPrepareCommandArguments = (
</span><del>-""" auto protocolErrors = Inspector::Protocol::Array<String>::create();
- RefPtr<InspectorObject> paramsContainer;
- message.getObject(ASCIILiteral("params"), paramsContainer);
</del><ins>+""" RefPtr<InspectorArray> protocolErrors = InspectorArray::create();
+ RefPtr<InspectorObject> paramsContainer = message.getObject(ASCIILiteral("params"));
+ InspectorObject* paramsContainerPtr = paramsContainer.get();
+ InspectorArray* protocolErrorsPtr = protocolErrors.get();
</ins><span class="cx"> ${inParameterDeclarations}
</span><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method \'%s\' can't be processed", "${domainName}.${commandName}");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, protocolErrors.release());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> """)
</span><span class="cx">
</span><span class="cx"> BackendDispatcherImplementationAsyncCommand = (
</span><del>-"""Inspector${domainName}BackendDispatcherHandler::${callbackName}::${callbackName}(Ref<InspectorBackendDispatcher>&& backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(WTF::move(backendDispatcher), id) { }
</del><ins>+"""Inspector${domainName}BackendDispatcherHandler::${callbackName}::${callbackName}(PassRefPtr<InspectorBackendDispatcher> backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(backendDispatcher, id) { }
</ins><span class="cx">
</span><span class="cx"> void Inspector${domainName}BackendDispatcherHandler::${callbackName}::sendSuccess(${formalParameters})
</span><span class="cx"> {
</span><del>- Ref<InspectorObject> jsonMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</ins><span class="cx"> ${outParameterAssignments}
</span><del>- sendIfActive(WTF::move(jsonMessage), ErrorString());
</del><ins>+ sendIfActive(jsonMessage, ErrorString());
</ins><span class="cx"> }""")
</span><span class="cx">
</span><span class="cx"> FrontendDispatcherDomainDispatcherDeclaration = (
</span><span class="lines">@@ -227,23 +228,26 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*${objectType}*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*${objectType}*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class ${objectType};
</span><span class="cx"> public:""")
</span><span class="cx">
</span><span class="cx"> ProtocolObjectBuilderDeclarationPostlude = (
</span><span class="cx"> """
</span><del>- Ref<${objectType}> release()
</del><ins>+ operator RefPtr<${objectType}>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(${objectType}) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<${objectType}>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<${objectType}>*>(&result));
</del><ins>+ PassRefPtr<${objectType}> release()
+ {
+ return RefPtr<${objectType}>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -254,10 +258,11 @@
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><del>- }""")
</del><ins>+ }
+ typedef Inspector::Protocol::StructItemTraits ItemTraits;""")
</ins><span class="cx">
</span><span class="cx"> ProtocolObjectRuntimeCast = (
</span><del>-"""RefPtr<${objectType}> BindingTraits<${objectType}>::runtimeCast(RefPtr<Inspector::InspectorValue>&& value)
</del><ins>+"""PassRefPtr<${objectType}> BindingTraits<${objectType}>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Inspector::InspectorObject> result;
</span><span class="cx"> bool castSucceeded = value->asObject(result);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_backend_dispatcher_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> headers = [
</span><span class="cx"> '"InspectorProtocolObjects.h"',
</span><span class="cx"> '<inspector/InspectorBackendDispatcher.h>',
</span><ins>+ '<wtf/PassRefPtr.h>',
</ins><span class="cx"> '<wtf/text/WTFString.h>']
</span><span class="cx">
</span><span class="cx"> typedefs = [('String', 'ErrorString')]
</span><span class="lines">@@ -156,7 +157,7 @@
</span><span class="cx"> in_parameters = ['ErrorString&']
</span><span class="cx"> for _parameter in command.call_parameters:
</span><span class="cx"> in_parameters.append("%s in_%s" % (CppGenerator.cpp_type_for_unchecked_formal_in_parameter(_parameter), _parameter.parameter_name))
</span><del>- in_parameters.append("Ref<%s>&& callback" % callbackName)
</del><ins>+ in_parameters.append("PassRefPtr<%s> callback" % callbackName)
</ins><span class="cx">
</span><span class="cx"> out_parameters = []
</span><span class="cx"> for _parameter in command.return_parameters:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_backend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -104,10 +104,10 @@
</span><span class="cx"> def _generate_small_dispatcher_switch_implementation_for_domain(self, domain):
</span><span class="cx"> cases = []
</span><span class="cx"> cases.append(' if (method == "%s")' % domain.commands[0].command_name)
</span><del>- cases.append(' %s(callId, message);' % domain.commands[0].command_name)
</del><ins>+ cases.append(' %s(callId, *message.get());' % domain.commands[0].command_name)
</ins><span class="cx"> for command in domain.commands[1:]:
</span><span class="cx"> cases.append(' else if (method == "%s")' % command.command_name)
</span><del>- cases.append(' %s(callId, message);' % command.command_name)
</del><ins>+ cases.append(' %s(callId, *message.get());' % command.command_name)
</ins><span class="cx">
</span><span class="cx"> switch_args = {
</span><span class="cx"> 'domainName': domain.domain_name,
</span><span class="lines">@@ -178,29 +178,22 @@
</span><span class="cx"> out_success_argument = '&%s_valueFound' % parameter.parameter_name
</span><span class="cx"> in_parameter_declarations.append(' bool %s_valueFound = false;' % parameter.parameter_name)
</span><span class="cx">
</span><del>- parameter_expression = 'in_' + parameter.parameter_name
- if CppGenerator.should_use_references_for_type(parameter.type):
- parameter_expression = '%s.copyRef()' % parameter_expression
- elif parameter.is_optional:
- parameter_expression = '&%s' % parameter_expression
-
</del><span class="cx"> param_args = {
</span><span class="cx"> 'parameterType': CppGenerator.cpp_type_for_stack_in_parameter(parameter),
</span><span class="cx"> 'parameterName': parameter.parameter_name,
</span><del>- 'parameterExpression': parameter_expression,
</del><span class="cx"> 'keyedGetMethod': CppGenerator.cpp_getter_method_for_type(parameter.type),
</span><span class="cx"> 'successOutParam': out_success_argument
</span><span class="cx"> }
</span><span class="cx">
</span><del>- in_parameter_declarations.append(' %(parameterType)s in_%(parameterName)s = InspectorBackendDispatcher::%(keyedGetMethod)s(paramsContainer.get(), ASCIILiteral("%(parameterName)s"), %(successOutParam)s, protocolErrors.get());' % param_args)
</del><ins>+ in_parameter_declarations.append(' %(parameterType)s in_%(parameterName)s = InspectorBackendDispatcher::%(keyedGetMethod)s(paramsContainerPtr, ASCIILiteral("%(parameterName)s"), %(successOutParam)s, protocolErrorsPtr);' % param_args)
</ins><span class="cx">
</span><span class="cx"> if parameter.is_optional:
</span><del>- optional_in_parameter_string = '%(parameterName)s_valueFound ? %(parameterExpression)s : nullptr' % param_args
</del><ins>+ optional_in_parameter_string = '%(parameterName)s_valueFound ? &in_%(parameterName)s : nullptr' % param_args
</ins><span class="cx"> alternate_dispatcher_method_parameters.append(optional_in_parameter_string)
</span><span class="cx"> method_parameters.append(optional_in_parameter_string)
</span><span class="cx"> else:
</span><del>- alternate_dispatcher_method_parameters.append(parameter_expression)
- method_parameters.append(parameter_expression)
</del><ins>+ alternate_dispatcher_method_parameters.append('in_' + parameter.parameter_name)
+ method_parameters.append('in_' + parameter.parameter_name)
</ins><span class="cx">
</span><span class="cx"> if command.is_async:
</span><span class="cx"> async_args = {
</span><span class="lines">@@ -211,7 +204,7 @@
</span><span class="cx"> out_parameter_assignments.append(' callback->disable();')
</span><span class="cx"> out_parameter_assignments.append(' m_backendDispatcher->reportProtocolError(&callId, Inspector::InspectorBackendDispatcher::ServerError, error);')
</span><span class="cx"> out_parameter_assignments.append(' return;')
</span><del>- method_parameters.append('callback.copyRef()')
</del><ins>+ method_parameters.append('callback')
</ins><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> for parameter in command.return_parameters:
</span><span class="lines">@@ -268,9 +261,9 @@
</span><span class="cx"> lines.append('')
</span><span class="cx">
</span><span class="cx"> lines.append(' ErrorString error;')
</span><del>- lines.append(' Ref<InspectorObject> result = InspectorObject::create();')
</del><ins>+ lines.append(' RefPtr<InspectorObject> result = InspectorObject::create();')
</ins><span class="cx"> if command.is_async:
</span><del>- lines.append(' Ref<Inspector%(domainName)sBackendDispatcherHandler::%(callbackName)s> callback = adoptRef(*new Inspector%(domainName)sBackendDispatcherHandler::%(callbackName)s(m_backendDispatcher.copyRef(), callId));' % command_args)
</del><ins>+ lines.append(' RefPtr<Inspector%(domainName)sBackendDispatcherHandler::%(callbackName)s> callback = adoptRef(new Inspector%(domainName)sBackendDispatcherHandler::%(callbackName)s(m_backendDispatcher,callId));' % command_args)
</ins><span class="cx"> if len(command.return_parameters) > 0:
</span><span class="cx"> lines.extend(out_parameter_declarations)
</span><span class="cx"> lines.append(' m_agent->%(commandName)s(%(invocationParameters)s);' % command_args)
</span><span class="lines">@@ -289,6 +282,6 @@
</span><span class="cx"> lines.append('')
</span><span class="cx">
</span><span class="cx"> if not command.is_async:
</span><del>- lines.append(' m_backendDispatcher->sendResponse(callId, WTF::move(result), error);')
</del><ins>+ lines.append(' m_backendDispatcher->sendResponse(callId, result.release(), error);')
</ins><span class="cx"> lines.append('}')
</span><span class="cx"> return "\n".join(lines)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_frontend_dispatcher_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> '"InspectorProtocolObjects.h"',
</span><span class="cx"> '<inspector/InspectorFrontendChannel.h>',
</span><span class="cx"> '<inspector/InspectorValues.h>',
</span><ins>+ '<wtf/PassRefPtr.h>',
</ins><span class="cx"> '<wtf/text/WTFString.h>']
</span><span class="cx">
</span><span class="cx"> header_args = {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_frontend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -107,13 +107,13 @@
</span><span class="cx">
</span><span class="cx"> lines.append('void Inspector%(domainName)sFrontendDispatcher::%(eventName)s(%(formalParameters)s)' % event_args)
</span><span class="cx"> lines.append('{')
</span><del>- lines.append(' Ref<InspectorObject> jsonMessage = InspectorObject::create();')
</del><ins>+ lines.append(' RefPtr<InspectorObject> jsonMessage = InspectorObject::create();')
</ins><span class="cx"> lines.append(' jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("%(domainName)s.%(eventName)s"));' % event_args)
</span><span class="cx">
</span><span class="cx"> if len(parameter_assignments) > 0:
</span><del>- lines.append(' Ref<InspectorObject> paramsObject = InspectorObject::create();')
</del><ins>+ lines.append(' RefPtr<InspectorObject> paramsObject = InspectorObject::create();')
</ins><span class="cx"> lines.extend(parameter_assignments)
</span><del>- lines.append(' jsonMessage->setObject(ASCIILiteral("params"), paramsObject.copyRef());')
</del><ins>+ lines.append(' jsonMessage->setObject(ASCIILiteral("params"), paramsObject);')
</ins><span class="cx">
</span><span class="cx"> lines.append('')
</span><span class="cx"> lines.append(' m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());')
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> headers = set([
</span><span class="cx"> '<inspector/InspectorProtocolTypes.h>',
</span><span class="cx"> '<wtf/Assertions.h>',
</span><ins>+ '<wtf/PassRefPtr.h>'
</ins><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> export_macro = self.model().framework.setting('export_macro', None)
</span><span class="lines">@@ -194,10 +195,9 @@
</span><span class="cx"> lines.append(self._generate_builder_state_enum(type_declaration))
</span><span class="cx">
</span><span class="cx"> constructor_example = []
</span><del>- constructor_example.append(' * Ref<%s> result = %s::create()' % (object_name, object_name))
</del><ins>+ constructor_example.append(' * RefPtr<%s> result = %s::create()' % (object_name, object_name))
</ins><span class="cx"> for member in required_members:
</span><span class="cx"> constructor_example.append(' * .set%s(...)' % ucfirst(member.member_name))
</span><del>- constructor_example.append(' * .release()')
</del><span class="cx">
</span><span class="cx"> builder_args = {
</span><span class="cx"> 'objectType': object_name,
</span><span class="lines">@@ -302,8 +302,6 @@
</span><span class="cx"> lines.append(' {')
</span><span class="cx"> if isinstance(type_member.type, EnumType):
</span><span class="cx"> lines.append(' InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::Protocol::getEnumConstantValue(static_cast<int>(value)));' % setter_args)
</span><del>- elif CppGenerator.should_use_references_for_type(type_member.type):
- lines.append(' InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), WTF::move(value));' % setter_args)
</del><span class="cx"> else:
</span><span class="cx"> lines.append(' InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), value);' % setter_args)
</span><span class="cx"> lines.append(' }')
</span><span class="lines">@@ -335,7 +333,7 @@
</span><span class="cx"> for argument in type_arguments:
</span><span class="cx"> lines.append('template<> %s BindingTraits<%s> {' % (' '.join(struct_keywords), argument[0]))
</span><span class="cx"> if argument[1]:
</span><del>- lines.append('static RefPtr<%s> runtimeCast(RefPtr<Inspector::InspectorValue>&& value);' % argument[0])
</del><ins>+ lines.append('static PassRefPtr<%s> runtimeCast(PassRefPtr<Inspector::InspectorValue> value);' % argument[0])
</ins><span class="cx"> lines.append('#if !ASSERT_DISABLED')
</span><span class="cx"> lines.append('%s assertValueHasExpectedType(Inspector::InspectorValue*);' % ' '.join(function_keywords))
</span><span class="cx"> lines.append('#endif // !ASSERT_DISABLED')
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -122,7 +122,6 @@
</span><span class="cx"> lines.append('#if !ASSERT_DISABLED')
</span><span class="cx"> lines.append('void BindingTraits<%s>::assertValueHasExpectedType(Inspector::InspectorValue* value)' % (CppGenerator.cpp_protocol_type_for_type(object_declaration.type)))
</span><span class="cx"> lines.append("""{
</span><del>- ASSERT_ARG(value, value);
</del><span class="cx"> RefPtr<InspectorObject> object;
</span><span class="cx"> bool castSucceeded = value->asObject(object);
</span><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);""")
</span><span class="lines">@@ -170,7 +169,6 @@
</span><span class="cx"> lines.append('#if !ASSERT_DISABLED')
</span><span class="cx"> lines.append('void %s(Inspector::InspectorValue* value)' % CppGenerator.cpp_assertion_method_for_type_member(enum_member, object_declaration))
</span><span class="cx"> lines.append('{')
</span><del>- lines.append(' ASSERT_ARG(value, value);')
</del><span class="cx"> lines.append(' String result;')
</span><span class="cx"> lines.append(' bool castSucceeded = value->asString(result);')
</span><span class="cx"> lines.append(' ASSERT(castSucceeded);')
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_backend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> lines.append(' id successCallback = ^{')
</span><span class="cx">
</span><span class="cx"> if command.return_parameters:
</span><del>- lines.append(' Ref<InspectorObject> resultObject = InspectorObject::create();')
</del><ins>+ lines.append(' RefPtr<InspectorObject> resultObject = InspectorObject::create();')
</ins><span class="cx">
</span><span class="cx"> required_pointer_parameters = filter(lambda parameter: not parameter.is_optional and ObjCGenerator.is_type_objc_pointer_type(parameter.type), command.return_parameters)
</span><span class="cx"> for parameter in required_pointer_parameters:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_frontend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> if required_pointer_parameters or optional_pointer_parameters:
</span><span class="cx"> lines.append('')
</span><span class="cx">
</span><del>- lines.append(' Ref<InspectorObject> jsonMessage = InspectorObject::create();')
</del><ins>+ lines.append(' RefPtr<InspectorObject> jsonMessage = InspectorObject::create();')
</ins><span class="cx"> lines.append(' jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("%s.%s"));' % (domain.domain_name, event.event_name))
</span><span class="cx"> if event.event_parameters:
</span><span class="cx"> lines.extend(self._generate_event_out_parameters(domain, event))
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">
</span><span class="cx"> def _generate_event_out_parameters(self, domain, event):
</span><span class="cx"> lines = []
</span><del>- lines.append(' Ref<InspectorObject> paramsObject = InspectorObject::create();')
</del><ins>+ lines.append(' RefPtr<InspectorObject> paramsObject = InspectorObject::create();')
</ins><span class="cx"> for parameter in event.event_parameters:
</span><span class="cx"> keyed_set_method = CppGenerator.cpp_setter_method_for_type(parameter.type)
</span><span class="cx"> var_name = parameter.parameter_name
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_protocol_types_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> '"%sEnumConversionHelpers.h"' % ObjCGenerator.OBJC_PREFIX,
</span><span class="cx"> '<JavaScriptCore/InspectorValues.h>',
</span><span class="cx"> '<wtf/Assertions.h>',
</span><ins>+ '<wtf/PassRefPtr.h>',
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> header_args = {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -143,6 +143,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -171,32 +172,32 @@
</span><span class="cx"> 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;
</span><span class="cx"> class ExecuteSQLAsyncOptionalReturnValuesCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
</span><span class="cx"> public:
</span><del>- ExecuteSQLAsyncOptionalReturnValuesCallback(Ref<Inspector::InspectorBackendDispatcher>&&, int id);
- void sendSuccess(RefPtr<Inspector::Protocol::Array<String>>&& columnNames, Inspector::Protocol::OptOutput<String>* notes, Inspector::Protocol::OptOutput<double>* timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* payload, Inspector::Protocol::OptOutput<int>* databaseId, RefPtr<Inspector::Protocol::Database::Error>&& sqlError, Inspector::Protocol::OptOutput<String>* screenColor, Inspector::Protocol::OptOutput<String>* printColor);
</del><ins>+ ExecuteSQLAsyncOptionalReturnValuesCallback(PassRefPtr<Inspector::InspectorBackendDispatcher>, int id);
+ void sendSuccess(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, Inspector::Protocol::OptOutput<String>* notes, Inspector::Protocol::OptOutput<double>* timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* payload, Inspector::Protocol::OptOutput<int>* databaseId, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, Inspector::Protocol::OptOutput<String>* screenColor, Inspector::Protocol::OptOutput<String>* printColor);
</ins><span class="cx"> };
</span><del>- virtual void executeSQLAsyncOptionalReturnValues(ErrorString&, int in_databaseId, const String& in_query, Ref<ExecuteSQLAsyncOptionalReturnValuesCallback>&& callback) = 0;
</del><ins>+ virtual void executeSQLAsyncOptionalReturnValues(ErrorString&, int in_databaseId, const String& in_query, PassRefPtr<ExecuteSQLAsyncOptionalReturnValuesCallback> callback) = 0;
</ins><span class="cx"> 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;
</span><span class="cx"> class ExecuteSQLAsyncCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
</span><span class="cx"> public:
</span><del>- ExecuteSQLAsyncCallback(Ref<Inspector::InspectorBackendDispatcher>&&, int id);
- void sendSuccess(RefPtr<Inspector::Protocol::Array<String>>&& columnNames, const String& notes, double timestamp, Inspector::InspectorObject values, Inspector::InspectorValue payload, int databaseId, RefPtr<Inspector::Protocol::Database::Error>&& sqlError, const String& screenColor, const String& printColor);
</del><ins>+ ExecuteSQLAsyncCallback(PassRefPtr<Inspector::InspectorBackendDispatcher>, int id);
+ void sendSuccess(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, Inspector::InspectorObject values, Inspector::InspectorValue payload, int databaseId, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const String& screenColor, const String& printColor);
</ins><span class="cx"> };
</span><del>- virtual void executeSQLAsync(ErrorString&, int in_databaseId, const String& in_query, Ref<ExecuteSQLAsyncCallback>&& callback) = 0;
</del><ins>+ virtual void executeSQLAsync(ErrorString&, int in_databaseId, const String& in_query, PassRefPtr<ExecuteSQLAsyncCallback> callback) = 0;
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~InspectorDatabaseBackendDispatcherHandler();
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class InspectorDatabaseBackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorDatabaseBackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static PassRefPtr<InspectorDatabaseBackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, PassRefPtr<Inspector::InspectorObject> message) override;
</ins><span class="cx"> private:
</span><span class="cx"> void executeSQLSyncOptionalReturnValues(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> void executeSQLAsyncOptionalReturnValues(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> void executeSQLSync(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> void executeSQLAsync(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> private:
</span><del>- InspectorDatabaseBackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorDatabaseBackendDispatcherHandler*);
</del><ins>+ InspectorDatabaseBackendDispatcher(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);
</ins><span class="cx"> InspectorDatabaseBackendDispatcherHandler* m_agent;
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="lines">@@ -261,12 +262,12 @@
</span><span class="cx">
</span><span class="cx"> InspectorDatabaseBackendDispatcherHandler::~InspectorDatabaseBackendDispatcherHandler() { }
</span><span class="cx">
</span><del>-Ref<InspectorDatabaseBackendDispatcher> InspectorDatabaseBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
</del><ins>+PassRefPtr<InspectorDatabaseBackendDispatcher> InspectorDatabaseBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorDatabaseBackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(new InspectorDatabaseBackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDatabaseBackendDispatcher::InspectorDatabaseBackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
</del><ins>+InspectorDatabaseBackendDispatcher::InspectorDatabaseBackendDispatcher(InspectorBackendDispatcher* backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
</ins><span class="cx"> : InspectorSupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="lines">@@ -276,32 +277,33 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Database"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void InspectorDatabaseBackendDispatcher::dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message)
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorDatabaseBackendDispatcher> protect(*this);
</span><span class="cx">
</span><span class="cx"> if (method == "executeSQLSyncOptionalReturnValues")
</span><del>- executeSQLSyncOptionalReturnValues(callId, message);
</del><ins>+ executeSQLSyncOptionalReturnValues(callId, *message.get());
</ins><span class="cx"> else if (method == "executeSQLAsyncOptionalReturnValues")
</span><del>- executeSQLAsyncOptionalReturnValues(callId, message);
</del><ins>+ executeSQLAsyncOptionalReturnValues(callId, *message.get());
</ins><span class="cx"> else if (method == "executeSQLSync")
</span><del>- executeSQLSync(callId, message);
</del><ins>+ executeSQLSync(callId, *message.get());
</ins><span class="cx"> else if (method == "executeSQLAsync")
</span><del>- executeSQLAsync(callId, message);
</del><ins>+ executeSQLAsync(callId, *message.get());
</ins><span class="cx"> else
</span><span class="cx"> m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\'', "Database", '.', method, "' was not found"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDatabaseBackendDispatcher::executeSQLSyncOptionalReturnValues(long callId, const InspectorObject& message)
</span><span class="cx"> {
</span><del>- auto protocolErrors = Inspector::Protocol::Array<String>::create();
- RefPtr<InspectorObject> paramsContainer;
- message.getObject(ASCIILiteral("params"), paramsContainer);
- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
- String in_query = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</del><ins>+ RefPtr<InspectorArray> protocolErrors = InspectorArray::create();
+ RefPtr<InspectorObject> paramsContainer = message.getObject(ASCIILiteral("params"));
+ InspectorObject* paramsContainerPtr = paramsContainer.get();
+ InspectorArray* protocolErrorsPtr = protocolErrors.get();
+ int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainerPtr, ASCIILiteral("databaseId"), nullptr, protocolErrorsPtr);
+ String in_query = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("query"), nullptr, protocolErrorsPtr);
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeSQLSyncOptionalReturnValues");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, protocolErrors.release());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -313,7 +315,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
</span><span class="cx"> Inspector::Protocol::OptOutput<String> out_notes;
</span><span class="cx"> Inspector::Protocol::OptOutput<double> out_timestamp;
</span><span class="lines">@@ -345,14 +347,14 @@
</span><span class="cx"> if (out_printColor.isAssigned())
</span><span class="cx"> result->setString(ASCIILiteral("printColor"), out_printColor.getValue());
</span><span class="cx"> }
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::ExecuteSQLAsyncOptionalReturnValuesCallback(Ref<InspectorBackendDispatcher>&& backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(WTF::move(backendDispatcher), id) { }
</del><ins>+InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::ExecuteSQLAsyncOptionalReturnValuesCallback(PassRefPtr<InspectorBackendDispatcher> backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(backendDispatcher, id) { }
</ins><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::sendSuccess(RefPtr<Inspector::Protocol::Array<String>>&& columnNames, Inspector::Protocol::OptOutput<String>* notes, Inspector::Protocol::OptOutput<double>* timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* payload, Inspector::Protocol::OptOutput<int>* databaseId, RefPtr<Inspector::Protocol::Database::Error>&& sqlError, Inspector::Protocol::OptOutput<String>* screenColor, Inspector::Protocol::OptOutput<String>* printColor)
</del><ins>+void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback::sendSuccess(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, Inspector::Protocol::OptOutput<String>* notes, Inspector::Protocol::OptOutput<double>* timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* payload, Inspector::Protocol::OptOutput<int>* databaseId, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, Inspector::Protocol::OptOutput<String>* screenColor, Inspector::Protocol::OptOutput<String>* printColor)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> jsonMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</ins><span class="cx"> if (columnNames)
</span><span class="cx"> jsonMessage->setArray(ASCIILiteral("columnNames"), columnNames);
</span><span class="cx"> if (notes.isAssigned())
</span><span class="lines">@@ -371,19 +373,20 @@
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("screenColor"), screenColor.getValue());
</span><span class="cx"> if (printColor.isAssigned())
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("printColor"), printColor.getValue());
</span><del>- sendIfActive(WTF::move(jsonMessage), ErrorString());
</del><ins>+ sendIfActive(jsonMessage, ErrorString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDatabaseBackendDispatcher::executeSQLAsyncOptionalReturnValues(long callId, const InspectorObject& message)
</span><span class="cx"> {
</span><del>- auto protocolErrors = Inspector::Protocol::Array<String>::create();
- RefPtr<InspectorObject> paramsContainer;
- message.getObject(ASCIILiteral("params"), paramsContainer);
- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
- String in_query = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</del><ins>+ RefPtr<InspectorArray> protocolErrors = InspectorArray::create();
+ RefPtr<InspectorObject> paramsContainer = message.getObject(ASCIILiteral("params"));
+ InspectorObject* paramsContainerPtr = paramsContainer.get();
+ InspectorArray* protocolErrorsPtr = protocolErrors.get();
+ int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainerPtr, ASCIILiteral("databaseId"), nullptr, protocolErrorsPtr);
+ String in_query = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("query"), nullptr, protocolErrorsPtr);
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeSQLAsyncOptionalReturnValues");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, protocolErrors.release());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -395,9 +398,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
- Ref<InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback> callback = adoptRef(*new InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback(m_backendDispatcher.copyRef(), callId));
- m_agent->executeSQLAsyncOptionalReturnValues(error, in_databaseId, in_query, callback.copyRef());
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
+ RefPtr<InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback> callback = adoptRef(new InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback(m_backendDispatcher,callId));
+ m_agent->executeSQLAsyncOptionalReturnValues(error, in_databaseId, in_query, callback);
</ins><span class="cx">
</span><span class="cx"> if (error.length()) {
</span><span class="cx"> callback->disable();
</span><span class="lines">@@ -408,14 +411,15 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDatabaseBackendDispatcher::executeSQLSync(long callId, const InspectorObject& message)
</span><span class="cx"> {
</span><del>- auto protocolErrors = Inspector::Protocol::Array<String>::create();
- RefPtr<InspectorObject> paramsContainer;
- message.getObject(ASCIILiteral("params"), paramsContainer);
- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
- String in_query = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</del><ins>+ RefPtr<InspectorArray> protocolErrors = InspectorArray::create();
+ RefPtr<InspectorObject> paramsContainer = message.getObject(ASCIILiteral("params"));
+ InspectorObject* paramsContainerPtr = paramsContainer.get();
+ InspectorArray* protocolErrorsPtr = protocolErrors.get();
+ int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainerPtr, ASCIILiteral("databaseId"), nullptr, protocolErrorsPtr);
+ String in_query = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("query"), nullptr, protocolErrorsPtr);
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeSQLSync");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, protocolErrors.release());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -427,7 +431,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
</span><span class="cx"> String out_notes;
</span><span class="cx"> double out_timestamp;
</span><span class="lines">@@ -450,14 +454,14 @@
</span><span class="cx"> result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getEnumConstantValue(out_screenColor));
</span><span class="cx"> result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getEnumConstantValue(out_printColor));
</span><span class="cx"> }
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::ExecuteSQLAsyncCallback(Ref<InspectorBackendDispatcher>&& backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(WTF::move(backendDispatcher), id) { }
</del><ins>+InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::ExecuteSQLAsyncCallback(PassRefPtr<InspectorBackendDispatcher> backendDispatcher, int id) : Inspector::InspectorBackendDispatcher::CallbackBase(backendDispatcher, id) { }
</ins><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::sendSuccess(RefPtr<Inspector::Protocol::Array<String>>&& columnNames, const String& notes, double timestamp, Inspector::InspectorObject values, Inspector::InspectorValue payload, int databaseId, RefPtr<Inspector::Protocol::Database::Error>&& sqlError, const String& screenColor, const String& printColor)
</del><ins>+void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::sendSuccess(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, Inspector::InspectorObject values, Inspector::InspectorValue payload, int databaseId, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const String& screenColor, const String& printColor)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> jsonMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</ins><span class="cx"> jsonMessage->setArray(ASCIILiteral("columnNames"), columnNames);
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("notes"), notes);
</span><span class="cx"> jsonMessage->setDouble(ASCIILiteral("timestamp"), timestamp);
</span><span class="lines">@@ -467,19 +471,20 @@
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("sqlError"), sqlError);
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getEnumConstantValue(screenColor));
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("printColor"), Inspector::Protocol::getEnumConstantValue(printColor));
</span><del>- sendIfActive(WTF::move(jsonMessage), ErrorString());
</del><ins>+ sendIfActive(jsonMessage, ErrorString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDatabaseBackendDispatcher::executeSQLAsync(long callId, const InspectorObject& message)
</span><span class="cx"> {
</span><del>- auto protocolErrors = Inspector::Protocol::Array<String>::create();
- RefPtr<InspectorObject> paramsContainer;
- message.getObject(ASCIILiteral("params"), paramsContainer);
- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
- String in_query = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("query"), nullptr, protocolErrors.get());
</del><ins>+ RefPtr<InspectorArray> protocolErrors = InspectorArray::create();
+ RefPtr<InspectorObject> paramsContainer = message.getObject(ASCIILiteral("params"));
+ InspectorObject* paramsContainerPtr = paramsContainer.get();
+ InspectorArray* protocolErrorsPtr = protocolErrors.get();
+ int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainerPtr, ASCIILiteral("databaseId"), nullptr, protocolErrorsPtr);
+ String in_query = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("query"), nullptr, protocolErrorsPtr);
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeSQLAsync");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, protocolErrors.release());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -491,9 +496,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
- Ref<InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback> callback = adoptRef(*new InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback(m_backendDispatcher.copyRef(), callId));
- m_agent->executeSQLAsync(error, in_databaseId, in_query, callback.copyRef());
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
+ RefPtr<InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback> callback = adoptRef(new InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback(m_backendDispatcher,callId));
+ m_agent->executeSQLAsync(error, in_databaseId, in_query, callback);
</ins><span class="cx">
</span><span class="cx"> if (error.length()) {
</span><span class="cx"> callback->disable();
</span><span class="lines">@@ -547,6 +552,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -644,6 +650,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -700,10 +707,10 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*Error*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*Error*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class Error;
</span><span class="cx"> public:
</span><span class="lines">@@ -722,27 +729,30 @@
</span><span class="cx"> return castState<CodeSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<Error> release()
</del><ins>+ operator RefPtr<Error>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(Error) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<Error>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<Error>*>(&result));
</del><ins>+ PassRefPtr<Error> release()
+ {
+ return RefPtr<Error>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<Error> result = Error::create()
</del><ins>+ * RefPtr<Error> result = Error::create()
</ins><span class="cx"> * .setMessage(...)
</span><del>- * .setCode(...)
- * .release();
</del><ins>+ * .setCode(...);
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // Database
</span><span class="lines">@@ -1055,7 +1065,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLSyncOptionalReturnValuesPrintColor *printColor) {
</span><del>- Ref<InspectorObject> resultObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> resultObject = InspectorObject::create();
</ins><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(values, @"values");
</span><span class="lines">@@ -1095,7 +1105,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteSQLAsyncOptionalReturnValuesPrintColor *printColor) {
</span><del>- Ref<InspectorObject> resultObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> resultObject = InspectorObject::create();
</ins><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(values, @"values");
</span><span class="lines">@@ -1135,7 +1145,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLSyncPrintColor printColor) {
</span><del>- Ref<InspectorObject> resultObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> resultObject = InspectorObject::create();
</ins><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(values, @"values");
</span><span class="lines">@@ -1166,7 +1176,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteSQLAsyncPrintColor printColor) {
</span><del>- Ref<InspectorObject> resultObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> resultObject = InspectorObject::create();
</ins><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(values, @"values");
</span><span class="lines">@@ -1555,6 +1565,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,18 +41,18 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorDatabaseBackendDispatcher : public AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~AlternateInspectorDatabaseBackendDispatcher() { }
</span><del>- virtual void executeAllOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String* in_screenColor, const String* in_printColor) = 0;
- virtual void executeNoOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String& in_screenColor, const String& in_printColor) = 0;
</del><ins>+ virtual void executeAllOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>* in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>* in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>* in_sqlError, const String* in_screenColor, const String* in_printColor) = 0;
+ virtual void executeNoOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>& in_sqlError, const String& in_screenColor, const String& in_printColor) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -163,21 +164,21 @@
</span><span class="cx"> Yellow = 5,
</span><span class="cx"> Black = 6,
</span><span class="cx"> }; // enum class PrintColor
</span><del>- virtual void executeAllOptionalParameters(ErrorString&, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String* in_screenColor, const String* in_printColor, RefPtr<Inspector::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::Pr
otocol::Database::PrimaryColors* opt_out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
- virtual void executeNoOptionalParameters(ErrorString&, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String& in_screenColor, const String& in_printColor, RefPtr<Inspector::Protocol::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& out_sqlError, Inspector::Protocol::Database::PrimaryColors* out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* out_printColor) = 0;
</del><ins>+ virtual void executeAllOptionalParameters(ErrorString&, const RefPtr<Inspector::InspectorArray>* in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>* in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>* in_sqlError, const String* in_screenColor, const String* in_printColor, RefPtr<Inspector::Protocol::Array<String>>& opt_out_columnNames, Inspector::Protocol::OptOutput<String>* opt_out_notes, Inspector::Protocol::OptOutput<double>* opt_out_timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::Protocol::OptOutput<int>* opt_out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& opt_out_sqlError, Inspector::Protocol::Database::PrimaryCol
ors* opt_out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
+ virtual void executeNoOptionalParameters(ErrorString&, const RefPtr<Inspector::InspectorArray>& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>& in_sqlError, const String& in_screenColor, const String& in_printColor, RefPtr<Inspector::Protocol::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& out_sqlError, Inspector::Protocol::Database::PrimaryColors* out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* out_printColor) = 0;
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~InspectorDatabaseBackendDispatcherHandler();
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class InspectorDatabaseBackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorDatabaseBackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static PassRefPtr<InspectorDatabaseBackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, PassRefPtr<Inspector::InspectorObject> message) override;
</ins><span class="cx"> private:
</span><span class="cx"> void executeAllOptionalParameters(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> void executeNoOptionalParameters(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> private:
</span><del>- InspectorDatabaseBackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorDatabaseBackendDispatcherHandler*);
</del><ins>+ InspectorDatabaseBackendDispatcher(Inspector::InspectorBackendDispatcher*, InspectorDatabaseBackendDispatcherHandler*);
</ins><span class="cx"> InspectorDatabaseBackendDispatcherHandler* m_agent;
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="lines">@@ -242,12 +243,12 @@
</span><span class="cx">
</span><span class="cx"> InspectorDatabaseBackendDispatcherHandler::~InspectorDatabaseBackendDispatcherHandler() { }
</span><span class="cx">
</span><del>-Ref<InspectorDatabaseBackendDispatcher> InspectorDatabaseBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
</del><ins>+PassRefPtr<InspectorDatabaseBackendDispatcher> InspectorDatabaseBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorDatabaseBackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(new InspectorDatabaseBackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDatabaseBackendDispatcher::InspectorDatabaseBackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
</del><ins>+InspectorDatabaseBackendDispatcher::InspectorDatabaseBackendDispatcher(InspectorBackendDispatcher* backendDispatcher, InspectorDatabaseBackendDispatcherHandler* agent)
</ins><span class="cx"> : InspectorSupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="lines">@@ -257,56 +258,57 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Database"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseBackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void InspectorDatabaseBackendDispatcher::dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message)
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorDatabaseBackendDispatcher> protect(*this);
</span><span class="cx">
</span><span class="cx"> if (method == "executeAllOptionalParameters")
</span><del>- executeAllOptionalParameters(callId, message);
</del><ins>+ executeAllOptionalParameters(callId, *message.get());
</ins><span class="cx"> else if (method == "executeNoOptionalParameters")
</span><del>- executeNoOptionalParameters(callId, message);
</del><ins>+ executeNoOptionalParameters(callId, *message.get());
</ins><span class="cx"> else
</span><span class="cx"> m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\'', "Database", '.', method, "' was not found"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDatabaseBackendDispatcher::executeAllOptionalParameters(long callId, const InspectorObject& message)
</span><span class="cx"> {
</span><del>- auto protocolErrors = Inspector::Protocol::Array<String>::create();
- RefPtr<InspectorObject> paramsContainer;
- message.getObject(ASCIILiteral("params"), paramsContainer);
</del><ins>+ RefPtr<InspectorArray> protocolErrors = InspectorArray::create();
+ RefPtr<InspectorObject> paramsContainer = message.getObject(ASCIILiteral("params"));
+ InspectorObject* paramsContainerPtr = paramsContainer.get();
+ InspectorArray* protocolErrorsPtr = protocolErrors.get();
</ins><span class="cx"> bool columnNames_valueFound = false;
</span><del>- RefPtr<Inspector::InspectorArray> in_columnNames = InspectorBackendDispatcher::getArray(paramsContainer.get(), ASCIILiteral("columnNames"), &columnNames_valueFound, protocolErrors.get());
</del><ins>+ RefPtr<Inspector::InspectorArray> in_columnNames = InspectorBackendDispatcher::getArray(paramsContainerPtr, ASCIILiteral("columnNames"), &columnNames_valueFound, protocolErrorsPtr);
</ins><span class="cx"> bool notes_valueFound = false;
</span><del>- String in_notes = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("notes"), &notes_valueFound, protocolErrors.get());
</del><ins>+ String in_notes = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("notes"), &notes_valueFound, protocolErrorsPtr);
</ins><span class="cx"> bool timestamp_valueFound = false;
</span><del>- Inspector::Protocol::OptOutput<double> in_timestamp = InspectorBackendDispatcher::getDouble(paramsContainer.get(), ASCIILiteral("timestamp"), &timestamp_valueFound, protocolErrors.get());
</del><ins>+ Inspector::Protocol::OptOutput<double> in_timestamp = InspectorBackendDispatcher::getDouble(paramsContainerPtr, ASCIILiteral("timestamp"), &timestamp_valueFound, protocolErrorsPtr);
</ins><span class="cx"> bool values_valueFound = false;
</span><del>- RefPtr<Inspector::InspectorObject> in_values = InspectorBackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("values"), &values_valueFound, protocolErrors.get());
</del><ins>+ RefPtr<Inspector::InspectorObject> in_values = InspectorBackendDispatcher::getObject(paramsContainerPtr, ASCIILiteral("values"), &values_valueFound, protocolErrorsPtr);
</ins><span class="cx"> bool payload_valueFound = false;
</span><del>- RefPtr<Inspector::InspectorValue> in_payload = InspectorBackendDispatcher::getValue(paramsContainer.get(), ASCIILiteral("payload"), &payload_valueFound, protocolErrors.get());
</del><ins>+ RefPtr<Inspector::InspectorValue> in_payload = InspectorBackendDispatcher::getValue(paramsContainerPtr, ASCIILiteral("payload"), &payload_valueFound, protocolErrorsPtr);
</ins><span class="cx"> bool databaseId_valueFound = false;
</span><del>- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), &databaseId_valueFound, protocolErrors.get());
</del><ins>+ int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainerPtr, ASCIILiteral("databaseId"), &databaseId_valueFound, protocolErrorsPtr);
</ins><span class="cx"> bool sqlError_valueFound = false;
</span><del>- RefPtr<Inspector::InspectorObject> in_sqlError = InspectorBackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("sqlError"), &sqlError_valueFound, protocolErrors.get());
</del><ins>+ RefPtr<Inspector::InspectorObject> in_sqlError = InspectorBackendDispatcher::getObject(paramsContainerPtr, ASCIILiteral("sqlError"), &sqlError_valueFound, protocolErrorsPtr);
</ins><span class="cx"> bool screenColor_valueFound = false;
</span><del>- String in_screenColor = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("screenColor"), &screenColor_valueFound, protocolErrors.get());
</del><ins>+ String in_screenColor = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("screenColor"), &screenColor_valueFound, protocolErrorsPtr);
</ins><span class="cx"> bool printColor_valueFound = false;
</span><del>- String in_printColor = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("printColor"), &printColor_valueFound, protocolErrors.get());
</del><ins>+ String in_printColor = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("printColor"), &printColor_valueFound, protocolErrorsPtr);
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeAllOptionalParameters");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, protocolErrors.release());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><del>- m_alternateDispatcher->executeAllOptionalParameters(callId, columnNames_valueFound ? in_columnNames.copyRef() : nullptr, notes_valueFound ? &in_notes : nullptr, timestamp_valueFound ? &in_timestamp : nullptr, values_valueFound ? in_values.copyRef() : nullptr, payload_valueFound ? in_payload.copyRef() : nullptr, databaseId_valueFound ? &in_databaseId : nullptr, sqlError_valueFound ? in_sqlError.copyRef() : nullptr, screenColor_valueFound ? &in_screenColor : nullptr, printColor_valueFound ? &in_printColor : nullptr);
</del><ins>+ m_alternateDispatcher->executeAllOptionalParameters(callId, 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);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
</span><span class="cx"> Inspector::Protocol::OptOutput<String> out_notes;
</span><span class="cx"> Inspector::Protocol::OptOutput<double> out_timestamp;
</span><span class="lines">@@ -316,7 +318,7 @@
</span><span class="cx"> RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
</span><span class="cx"> Inspector::Protocol::Database::PrimaryColors out_screenColor;
</span><span class="cx"> InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
</span><del>- m_agent->executeAllOptionalParameters(error, columnNames_valueFound ? in_columnNames.copyRef() : nullptr, notes_valueFound ? &in_notes : nullptr, timestamp_valueFound ? &in_timestamp : nullptr, values_valueFound ? in_values.copyRef() : nullptr, payload_valueFound ? in_payload.copyRef() : nullptr, databaseId_valueFound ? &in_databaseId : nullptr, sqlError_valueFound ? in_sqlError.copyRef() : nullptr, screenColor_valueFound ? &in_screenColor : nullptr, printColor_valueFound ? &in_printColor : nullptr, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, &out_screenColor, &out_printColor);
</del><ins>+ 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);
</ins><span class="cx">
</span><span class="cx"> if (!error.length()) {
</span><span class="cx"> if (out_columnNames)
</span><span class="lines">@@ -338,38 +340,39 @@
</span><span class="cx"> if (out_printColor.isAssigned())
</span><span class="cx"> result->setString(ASCIILiteral("printColor"), out_printColor.getValue());
</span><span class="cx"> }
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDatabaseBackendDispatcher::executeNoOptionalParameters(long callId, const InspectorObject& message)
</span><span class="cx"> {
</span><del>- auto protocolErrors = Inspector::Protocol::Array<String>::create();
- RefPtr<InspectorObject> paramsContainer;
- message.getObject(ASCIILiteral("params"), paramsContainer);
- RefPtr<Inspector::InspectorArray> in_columnNames = InspectorBackendDispatcher::getArray(paramsContainer.get(), ASCIILiteral("columnNames"), nullptr, protocolErrors.get());
- String in_notes = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("notes"), nullptr, protocolErrors.get());
- double in_timestamp = InspectorBackendDispatcher::getDouble(paramsContainer.get(), ASCIILiteral("timestamp"), nullptr, protocolErrors.get());
- RefPtr<Inspector::InspectorObject> in_values = InspectorBackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("values"), nullptr, protocolErrors.get());
- RefPtr<Inspector::InspectorValue> in_payload = InspectorBackendDispatcher::getValue(paramsContainer.get(), ASCIILiteral("payload"), nullptr, protocolErrors.get());
- int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainer.get(), ASCIILiteral("databaseId"), nullptr, protocolErrors.get());
- RefPtr<Inspector::InspectorObject> in_sqlError = InspectorBackendDispatcher::getObject(paramsContainer.get(), ASCIILiteral("sqlError"), nullptr, protocolErrors.get());
- String in_screenColor = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("screenColor"), nullptr, protocolErrors.get());
- String in_printColor = InspectorBackendDispatcher::getString(paramsContainer.get(), ASCIILiteral("printColor"), nullptr, protocolErrors.get());
</del><ins>+ RefPtr<InspectorArray> protocolErrors = InspectorArray::create();
+ RefPtr<InspectorObject> paramsContainer = message.getObject(ASCIILiteral("params"));
+ InspectorObject* paramsContainerPtr = paramsContainer.get();
+ InspectorArray* protocolErrorsPtr = protocolErrors.get();
+ RefPtr<Inspector::InspectorArray> in_columnNames = InspectorBackendDispatcher::getArray(paramsContainerPtr, ASCIILiteral("columnNames"), nullptr, protocolErrorsPtr);
+ String in_notes = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("notes"), nullptr, protocolErrorsPtr);
+ double in_timestamp = InspectorBackendDispatcher::getDouble(paramsContainerPtr, ASCIILiteral("timestamp"), nullptr, protocolErrorsPtr);
+ RefPtr<Inspector::InspectorObject> in_values = InspectorBackendDispatcher::getObject(paramsContainerPtr, ASCIILiteral("values"), nullptr, protocolErrorsPtr);
+ RefPtr<Inspector::InspectorValue> in_payload = InspectorBackendDispatcher::getValue(paramsContainerPtr, ASCIILiteral("payload"), nullptr, protocolErrorsPtr);
+ int in_databaseId = InspectorBackendDispatcher::getInteger(paramsContainerPtr, ASCIILiteral("databaseId"), nullptr, protocolErrorsPtr);
+ RefPtr<Inspector::InspectorObject> in_sqlError = InspectorBackendDispatcher::getObject(paramsContainerPtr, ASCIILiteral("sqlError"), nullptr, protocolErrorsPtr);
+ String in_screenColor = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("screenColor"), nullptr, protocolErrorsPtr);
+ String in_printColor = InspectorBackendDispatcher::getString(paramsContainerPtr, ASCIILiteral("printColor"), nullptr, protocolErrorsPtr);
</ins><span class="cx"> if (protocolErrors->length()) {
</span><span class="cx"> String errorMessage = String::format("Some arguments of method '%s' can't be processed", "Database.executeNoOptionalParameters");
</span><del>- m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, WTF::move(protocolErrors));
</del><ins>+ m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::InvalidParams, errorMessage, protocolErrors.release());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> if (m_alternateDispatcher) {
</span><del>- m_alternateDispatcher->executeNoOptionalParameters(callId, in_columnNames.copyRef(), in_notes, in_timestamp, in_values.copyRef(), in_payload.copyRef(), in_databaseId, in_sqlError.copyRef(), in_screenColor, in_printColor);
</del><ins>+ m_alternateDispatcher->executeNoOptionalParameters(callId, in_columnNames, in_notes, in_timestamp, in_values, in_payload, in_databaseId, in_sqlError, in_screenColor, in_printColor);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> RefPtr<Inspector::Protocol::Array<String>> out_columnNames;
</span><span class="cx"> String out_notes;
</span><span class="cx"> double out_timestamp;
</span><span class="lines">@@ -379,7 +382,7 @@
</span><span class="cx"> RefPtr<Inspector::Protocol::Database::Error> out_sqlError;
</span><span class="cx"> Inspector::Protocol::Database::PrimaryColors out_screenColor;
</span><span class="cx"> InspectorDatabaseBackendDispatcherHandler::PrintColor out_printColor;
</span><del>- m_agent->executeNoOptionalParameters(error, in_columnNames.copyRef(), in_notes, in_timestamp, in_values.copyRef(), in_payload.copyRef(), in_databaseId, in_sqlError.copyRef(), in_screenColor, in_printColor, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, &out_screenColor, &out_printColor);
</del><ins>+ 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);
</ins><span class="cx">
</span><span class="cx"> if (!error.length()) {
</span><span class="cx"> result->setArray(ASCIILiteral("columnNames"), out_columnNames);
</span><span class="lines">@@ -392,7 +395,7 @@
</span><span class="cx"> result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getEnumConstantValue(out_screenColor));
</span><span class="cx"> result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getEnumConstantValue(out_printColor));
</span><span class="cx"> }
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -440,6 +443,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -537,6 +541,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -593,10 +598,10 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*Error*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*Error*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class Error;
</span><span class="cx"> public:
</span><span class="lines">@@ -615,27 +620,30 @@
</span><span class="cx"> return castState<CodeSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<Error> release()
</del><ins>+ operator RefPtr<Error>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(Error) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<Error>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<Error>*>(&result));
</del><ins>+ PassRefPtr<Error> release()
+ {
+ return RefPtr<Error>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<Error> result = Error::create()
</del><ins>+ * RefPtr<Error> result = Error::create()
</ins><span class="cx"> * .setMessage(...)
</span><del>- * .setCode(...)
- * .release();
</del><ins>+ * .setCode(...);
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // Database
</span><span class="lines">@@ -759,8 +767,8 @@
</span><span class="cx"> class ObjCInspectorDatabaseBackendDispatcher final : public AlternateInspectorDatabaseBackendDispatcher {
</span><span class="cx"> public:
</span><span class="cx"> ObjCInspectorDatabaseBackendDispatcher(id<RWIProtocolDatabaseDomainHandler> handler) { m_delegate = handler; }
</span><del>- virtual void executeAllOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String* in_screenColor, const String* in_printColor) override;
- virtual void executeNoOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String& in_screenColor, const String& in_printColor) override;
</del><ins>+ virtual void executeAllOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>* in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>* in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>* in_sqlError, const String* in_screenColor, const String* in_printColor) override;
+ virtual void executeNoOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>& in_sqlError, const String& in_screenColor, const String& in_printColor) override;
</ins><span class="cx"> private:
</span><span class="cx"> RetainPtr<id<RWIProtocolDatabaseDomainHandler>> m_delegate;
</span><span class="cx"> };
</span><span class="lines">@@ -939,14 +947,14 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-void ObjCInspectorDatabaseBackendDispatcher::executeAllOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String* in_screenColor, const String* in_printColor)
</del><ins>+void ObjCInspectorDatabaseBackendDispatcher::executeAllOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>* in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>* in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>* in_sqlError, const String* in_screenColor, const String* in_printColor)
</ins><span class="cx"> {
</span><span class="cx"> id errorCallback = ^(NSString *error) {
</span><span class="cx"> backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> id successCallback = ^(NSArray/*<NSString>*/ **columnNames, NSString **notes, double *timestamp, RWIProtocolJSONObject **values, RWIProtocolJSONObject **payload, int *databaseId, RWIProtocolDatabaseError **sqlError, RWIProtocolDatabasePrimaryColors *screenColor, RWIProtocolDatabaseExecuteAllOptionalParametersPrintColor *printColor) {
</span><del>- Ref<InspectorObject> resultObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> resultObject = InspectorObject::create();
</ins><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(values, @"values");
</span><span class="lines">@@ -1004,14 +1012,14 @@
</span><span class="cx"> [m_delegate executeAllOptionalParametersWithErrorCallback:errorCallback successCallback:successCallback columnNames:(in_columnNames ? &o_in_columnNames : nil) notes:(in_notes ? &o_in_notes : nil) timestamp:(in_timestamp ? &o_in_timestamp : nil) values:(in_values ? &o_in_values : nil) payload:(in_payload ? &o_in_payload : nil) databaseId:(in_databaseId ? &o_in_databaseId : nil) sqlError:(in_sqlError ? &o_in_sqlError : nil) screenColor:(in_screenColor ? &o_in_screenColor : nil) printColor:(in_printColor ? &o_in_printColor : nil)];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ObjCInspectorDatabaseBackendDispatcher::executeNoOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>&& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>&& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>&& in_sqlError, const String& in_screenColor, const String& in_printColor)
</del><ins>+void ObjCInspectorDatabaseBackendDispatcher::executeNoOptionalParameters(long callId, const RefPtr<Inspector::InspectorArray>& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>& in_sqlError, const String& in_screenColor, const String& in_printColor)
</ins><span class="cx"> {
</span><span class="cx"> id errorCallback = ^(NSString *error) {
</span><span class="cx"> backendDispatcher()->sendResponse(callId, InspectorObject::create(), error);
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> id successCallback = ^(NSArray/*<NSString>*/ *columnNames, NSString *notes, double timestamp, RWIProtocolJSONObject *values, RWIProtocolJSONObject *payload, int databaseId, RWIProtocolDatabaseError *sqlError, RWIProtocolDatabasePrimaryColors screenColor, RWIProtocolDatabaseExecuteNoOptionalParametersPrintColor printColor) {
</span><del>- Ref<InspectorObject> resultObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> resultObject = InspectorObject::create();
</ins><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(values, @"values");
</span><span class="lines">@@ -1405,6 +1413,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpecteddomainswithvaryingcommandsizesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -156,6 +156,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -189,12 +190,12 @@
</span><span class="cx">
</span><span class="cx"> class InspectorNetwork1BackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorNetwork1BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorNetwork1BackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static PassRefPtr<InspectorNetwork1BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorNetwork1BackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, PassRefPtr<Inspector::InspectorObject> message) override;
</ins><span class="cx"> private:
</span><span class="cx"> void loadResource1(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> private:
</span><del>- InspectorNetwork1BackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorNetwork1BackendDispatcherHandler*);
</del><ins>+ InspectorNetwork1BackendDispatcher(Inspector::InspectorBackendDispatcher*, InspectorNetwork1BackendDispatcherHandler*);
</ins><span class="cx"> InspectorNetwork1BackendDispatcherHandler* m_agent;
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="lines">@@ -206,8 +207,8 @@
</span><span class="cx">
</span><span class="cx"> class InspectorNetwork3BackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorNetwork3BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorNetwork3BackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static PassRefPtr<InspectorNetwork3BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorNetwork3BackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, PassRefPtr<Inspector::InspectorObject> message) override;
</ins><span class="cx"> private:
</span><span class="cx"> void loadResource1(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> void loadResource2(long callId, const Inspector::InspectorObject& message);
</span><span class="lines">@@ -217,7 +218,7 @@
</span><span class="cx"> void loadResource6(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> void loadResource7(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> private:
</span><del>- InspectorNetwork3BackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorNetwork3BackendDispatcherHandler*);
</del><ins>+ InspectorNetwork3BackendDispatcher(Inspector::InspectorBackendDispatcher*, InspectorNetwork3BackendDispatcherHandler*);
</ins><span class="cx"> InspectorNetwork3BackendDispatcherHandler* m_agent;
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="lines">@@ -283,12 +284,12 @@
</span><span class="cx"> InspectorNetwork1BackendDispatcherHandler::~InspectorNetwork1BackendDispatcherHandler() { }
</span><span class="cx"> InspectorNetwork3BackendDispatcherHandler::~InspectorNetwork3BackendDispatcherHandler() { }
</span><span class="cx">
</span><del>-Ref<InspectorNetwork1BackendDispatcher> InspectorNetwork1BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
</del><ins>+PassRefPtr<InspectorNetwork1BackendDispatcher> InspectorNetwork1BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorNetwork1BackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(new InspectorNetwork1BackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorNetwork1BackendDispatcher::InspectorNetwork1BackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
</del><ins>+InspectorNetwork1BackendDispatcher::InspectorNetwork1BackendDispatcher(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
</ins><span class="cx"> : InspectorSupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="lines">@@ -298,12 +299,12 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Network1"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork1BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void InspectorNetwork1BackendDispatcher::dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message)
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorNetwork1BackendDispatcher> protect(*this);
</span><span class="cx">
</span><span class="cx"> if (method == "loadResource1")
</span><del>- loadResource1(callId, message);
</del><ins>+ loadResource1(callId, *message.get());
</ins><span class="cx"> else
</span><span class="cx"> m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\'', "Network1", '.', method, "' was not found"));
</span><span class="cx"> }
</span><span class="lines">@@ -318,18 +319,18 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> m_agent->loadResource1(error);
</span><span class="cx">
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorNetwork3BackendDispatcher> InspectorNetwork3BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork3BackendDispatcherHandler* agent)
</del><ins>+PassRefPtr<InspectorNetwork3BackendDispatcher> InspectorNetwork3BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork3BackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorNetwork3BackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(new InspectorNetwork3BackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorNetwork3BackendDispatcher::InspectorNetwork3BackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorNetwork3BackendDispatcherHandler* agent)
</del><ins>+InspectorNetwork3BackendDispatcher::InspectorNetwork3BackendDispatcher(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork3BackendDispatcherHandler* agent)
</ins><span class="cx"> : InspectorSupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="lines">@@ -339,7 +340,7 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Network3"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork3BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void InspectorNetwork3BackendDispatcher::dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message)
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorNetwork3BackendDispatcher> protect(*this);
</span><span class="cx">
</span><span class="lines">@@ -370,7 +371,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ((*this).*it->value)(callId, message.get());
</del><ins>+ ((*this).*it->value)(callId, *message.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorNetwork3BackendDispatcher::loadResource1(long callId, const InspectorObject&)
</span><span class="lines">@@ -383,10 +384,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> m_agent->loadResource1(error);
</span><span class="cx">
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorNetwork3BackendDispatcher::loadResource2(long callId, const InspectorObject&)
</span><span class="lines">@@ -399,10 +400,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> m_agent->loadResource2(error);
</span><span class="cx">
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorNetwork3BackendDispatcher::loadResource3(long callId, const InspectorObject&)
</span><span class="lines">@@ -415,10 +416,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> m_agent->loadResource3(error);
</span><span class="cx">
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorNetwork3BackendDispatcher::loadResource4(long callId, const InspectorObject&)
</span><span class="lines">@@ -431,10 +432,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> m_agent->loadResource4(error);
</span><span class="cx">
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorNetwork3BackendDispatcher::loadResource5(long callId, const InspectorObject&)
</span><span class="lines">@@ -447,10 +448,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> m_agent->loadResource5(error);
</span><span class="cx">
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorNetwork3BackendDispatcher::loadResource6(long callId, const InspectorObject&)
</span><span class="lines">@@ -463,10 +464,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> m_agent->loadResource6(error);
</span><span class="cx">
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorNetwork3BackendDispatcher::loadResource7(long callId, const InspectorObject&)
</span><span class="lines">@@ -479,10 +480,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> m_agent->loadResource7(error);
</span><span class="cx">
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -530,6 +531,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -627,6 +629,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -1289,6 +1292,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -144,6 +144,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -170,12 +171,12 @@
</span><span class="cx">
</span><span class="cx"> class InspectorCommandDomainBackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorCommandDomainBackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorCommandDomainBackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static PassRefPtr<InspectorCommandDomainBackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorCommandDomainBackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, PassRefPtr<Inspector::InspectorObject> message) override;
</ins><span class="cx"> private:
</span><span class="cx"> void commandWithEnumReturnValue(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> private:
</span><del>- InspectorCommandDomainBackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorCommandDomainBackendDispatcherHandler*);
</del><ins>+ InspectorCommandDomainBackendDispatcher(Inspector::InspectorBackendDispatcher*, InspectorCommandDomainBackendDispatcherHandler*);
</ins><span class="cx"> InspectorCommandDomainBackendDispatcherHandler* m_agent;
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="lines">@@ -240,12 +241,12 @@
</span><span class="cx">
</span><span class="cx"> InspectorCommandDomainBackendDispatcherHandler::~InspectorCommandDomainBackendDispatcherHandler() { }
</span><span class="cx">
</span><del>-Ref<InspectorCommandDomainBackendDispatcher> InspectorCommandDomainBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorCommandDomainBackendDispatcherHandler* agent)
</del><ins>+PassRefPtr<InspectorCommandDomainBackendDispatcher> InspectorCommandDomainBackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorCommandDomainBackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorCommandDomainBackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(new InspectorCommandDomainBackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorCommandDomainBackendDispatcher::InspectorCommandDomainBackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorCommandDomainBackendDispatcherHandler* agent)
</del><ins>+InspectorCommandDomainBackendDispatcher::InspectorCommandDomainBackendDispatcher(InspectorBackendDispatcher* backendDispatcher, InspectorCommandDomainBackendDispatcherHandler* agent)
</ins><span class="cx"> : InspectorSupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="lines">@@ -255,12 +256,12 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("CommandDomain"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCommandDomainBackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void InspectorCommandDomainBackendDispatcher::dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message)
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorCommandDomainBackendDispatcher> protect(*this);
</span><span class="cx">
</span><span class="cx"> if (method == "commandWithEnumReturnValue")
</span><del>- commandWithEnumReturnValue(callId, message);
</del><ins>+ commandWithEnumReturnValue(callId, *message.get());
</ins><span class="cx"> else
</span><span class="cx"> m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\'', "CommandDomain", '.', method, "' was not found"));
</span><span class="cx"> }
</span><span class="lines">@@ -275,14 +276,14 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> InspectorCommandDomainBackendDispatcherHandler::ReturnValue out_returnValue;
</span><span class="cx"> m_agent->commandWithEnumReturnValue(error, &out_returnValue);
</span><span class="cx">
</span><span class="cx"> if (!error.length())
</span><span class="cx"> result->setString(ASCIILiteral("returnValue"), Inspector::Protocol::getEnumConstantValue(out_returnValue));
</span><span class="cx">
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -330,6 +331,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -399,11 +401,11 @@
</span><span class="cx">
</span><span class="cx"> void InspectorEventDomainFrontendDispatcher::eventWithEnumParameter(Parameter parameter)
</span><span class="cx"> {
</span><del>- Ref<InspectorObject> jsonMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</ins><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("EventDomain.eventWithEnumParameter"));
</span><del>- Ref<InspectorObject> paramsObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> paramsObject = InspectorObject::create();
</ins><span class="cx"> paramsObject->setString(ASCIILiteral("parameter"), Inspector::Protocol::getEnumConstantValue(parameter));
</span><del>- jsonMessage->setObject(ASCIILiteral("params"), paramsObject.copyRef());
</del><ins>+ jsonMessage->setObject(ASCIILiteral("params"), paramsObject);
</ins><span class="cx">
</span><span class="cx"> m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</span><span class="cx"> }
</span><span class="lines">@@ -452,6 +454,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -810,7 +813,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> id successCallback = ^(RWIProtocolCommandDomainCommandWithEnumReturnValueReturnValue returnValue) {
</span><del>- Ref<InspectorObject> resultObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> resultObject = InspectorObject::create();
</ins><span class="cx"> resultObject->setString(ASCIILiteral("returnValue"), toProtocolString(returnValue));
</span><span class="cx"> backendDispatcher()->sendResponse(callId, resultObject.release(), String());
</span><span class="cx"> };
</span><span class="lines">@@ -1018,9 +1021,9 @@
</span><span class="cx"> if (!frontendChannel)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Ref<InspectorObject> jsonMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</ins><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("EventDomain.eventWithEnumParameter"));
</span><del>- Ref<InspectorObject> paramsObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> paramsObject = InspectorObject::create();
</ins><span class="cx"> paramsObject->setString(ASCIILiteral("parameter"), toProtocolString(parameter));
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("params"), paramsObject);
</span><span class="cx"> frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</span><span class="lines">@@ -1142,6 +1145,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -133,6 +133,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -241,6 +242,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -250,8 +252,8 @@
</span><span class="cx"> class InspectorDatabaseFrontendDispatcher {
</span><span class="cx"> public:
</span><span class="cx"> InspectorDatabaseFrontendDispatcher(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
</span><del>- void didExecuteOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String* const notes, const double* const timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors* const screenColor, const String* const printColor);
- void didExecuteNoOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors& screenColor, const String& printColor);
</del><ins>+ void didExecuteOptionalParameters(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String* const notes, const double* const timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors* const screenColor, const String* const printColor);
+ void didExecuteNoOptionalParameters(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors& screenColor, const String& printColor);
</ins><span class="cx"> private:
</span><span class="cx"> InspectorFrontendChannel* m_inspectorFrontendChannel;
</span><span class="cx"> };
</span><span class="lines">@@ -303,11 +305,11 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-void InspectorDatabaseFrontendDispatcher::didExecuteOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String* const notes, const double* const timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors* const screenColor, const String* const printColor)
</del><ins>+void InspectorDatabaseFrontendDispatcher::didExecuteOptionalParameters(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String* const notes, const double* const timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors* const screenColor, const String* const printColor)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> jsonMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</ins><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Database.didExecuteOptionalParameters"));
</span><del>- Ref<InspectorObject> paramsObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> paramsObject = InspectorObject::create();
</ins><span class="cx"> if (columnNames)
</span><span class="cx"> paramsObject->setArray(ASCIILiteral("columnNames"), columnNames);
</span><span class="cx"> if (notes)
</span><span class="lines">@@ -324,16 +326,16 @@
</span><span class="cx"> paramsObject->setString(ASCIILiteral("screenColor"), *screenColor);
</span><span class="cx"> if (printColor)
</span><span class="cx"> paramsObject->setString(ASCIILiteral("printColor"), *printColor);
</span><del>- jsonMessage->setObject(ASCIILiteral("params"), paramsObject.copyRef());
</del><ins>+ jsonMessage->setObject(ASCIILiteral("params"), paramsObject);
</ins><span class="cx">
</span><span class="cx"> m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseFrontendDispatcher::didExecuteNoOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors& screenColor, const String& printColor)
</del><ins>+void InspectorDatabaseFrontendDispatcher::didExecuteNoOptionalParameters(PassRefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, PassRefPtr<Inspector::InspectorObject> values, PassRefPtr<Inspector::InspectorValue> payload, PassRefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors& screenColor, const String& printColor)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> jsonMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</ins><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Database.didExecuteNoOptionalParameters"));
</span><del>- Ref<InspectorObject> paramsObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> paramsObject = InspectorObject::create();
</ins><span class="cx"> paramsObject->setArray(ASCIILiteral("columnNames"), columnNames);
</span><span class="cx"> paramsObject->setString(ASCIILiteral("notes"), notes);
</span><span class="cx"> paramsObject->setDouble(ASCIILiteral("timestamp"), timestamp);
</span><span class="lines">@@ -342,7 +344,7 @@
</span><span class="cx"> paramsObject->setObject(ASCIILiteral("sqlError"), sqlError);
</span><span class="cx"> paramsObject->setString(ASCIILiteral("screenColor"), screenColor);
</span><span class="cx"> paramsObject->setString(ASCIILiteral("printColor"), printColor);
</span><del>- jsonMessage->setObject(ASCIILiteral("params"), paramsObject.copyRef());
</del><ins>+ jsonMessage->setObject(ASCIILiteral("params"), paramsObject);
</ins><span class="cx">
</span><span class="cx"> m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</span><span class="cx"> }
</span><span class="lines">@@ -391,6 +393,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -442,10 +445,10 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*Error*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*Error*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class Error;
</span><span class="cx"> public:
</span><span class="lines">@@ -464,27 +467,30 @@
</span><span class="cx"> return castState<CodeSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<Error> release()
</del><ins>+ operator RefPtr<Error>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(Error) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<Error>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<Error>*>(&result));
</del><ins>+ PassRefPtr<Error> release()
+ {
+ return RefPtr<Error>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<Error> result = Error::create()
</del><ins>+ * RefPtr<Error> result = Error::create()
</ins><span class="cx"> * .setMessage(...)
</span><del>- * .setCode(...)
- * .release();
</del><ins>+ * .setCode(...);
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // Database
</span><span class="lines">@@ -882,9 +888,9 @@
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(screenColor, @"screenColor");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(printColor, @"printColor");
</span><span class="cx">
</span><del>- Ref<InspectorObject> jsonMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</ins><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Database.didExecuteOptionalParameters"));
</span><del>- Ref<InspectorObject> paramsObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> paramsObject = InspectorObject::create();
</ins><span class="cx"> if (columnNames)
</span><span class="cx"> paramsObject->setArray(ASCIILiteral("columnNames"), inspectorStringArray((*columnNames)));
</span><span class="cx"> if (notes)
</span><span class="lines">@@ -919,9 +925,9 @@
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(screenColor, @"screenColor");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(printColor, @"printColor");
</span><span class="cx">
</span><del>- Ref<InspectorObject> jsonMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</ins><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Database.didExecuteNoOptionalParameters"));
</span><del>- Ref<InspectorObject> paramsObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> paramsObject = InspectorObject::create();
</ins><span class="cx"> paramsObject->setArray(ASCIILiteral("columnNames"), inspectorStringArray(columnNames));
</span><span class="cx"> paramsObject->setString(ASCIILiteral("notes"), notes);
</span><span class="cx"> paramsObject->setDouble(ASCIILiteral("timestamp"), timestamp);
</span><span class="lines">@@ -1035,6 +1041,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -142,6 +142,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -166,12 +167,12 @@
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><span class="cx"> class InspectorNetwork1BackendDispatcher final : public Inspector::InspectorSupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorNetwork1BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorNetwork1BackendDispatcherHandler*);
- virtual void dispatch(long callId, const String& method, Ref<Inspector::InspectorObject>&& message) override;
</del><ins>+ static PassRefPtr<InspectorNetwork1BackendDispatcher> create(Inspector::InspectorBackendDispatcher*, InspectorNetwork1BackendDispatcherHandler*);
+ virtual void dispatch(long callId, const String& method, PassRefPtr<Inspector::InspectorObject> message) override;
</ins><span class="cx"> private:
</span><span class="cx"> void loadResource(long callId, const Inspector::InspectorObject& message);
</span><span class="cx"> private:
</span><del>- InspectorNetwork1BackendDispatcher(Inspector::InspectorBackendDispatcher&, InspectorNetwork1BackendDispatcherHandler*);
</del><ins>+ InspectorNetwork1BackendDispatcher(Inspector::InspectorBackendDispatcher*, InspectorNetwork1BackendDispatcherHandler*);
</ins><span class="cx"> InspectorNetwork1BackendDispatcherHandler* m_agent;
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="lines">@@ -240,12 +241,12 @@
</span><span class="cx"> #endif // PLATFORM(WEB_COMMANDS)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><del>-Ref<InspectorNetwork1BackendDispatcher> InspectorNetwork1BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
</del><ins>+PassRefPtr<InspectorNetwork1BackendDispatcher> InspectorNetwork1BackendDispatcher::create(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorNetwork1BackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(new InspectorNetwork1BackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorNetwork1BackendDispatcher::InspectorNetwork1BackendDispatcher(InspectorBackendDispatcher& backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
</del><ins>+InspectorNetwork1BackendDispatcher::InspectorNetwork1BackendDispatcher(InspectorBackendDispatcher* backendDispatcher, InspectorNetwork1BackendDispatcherHandler* agent)
</ins><span class="cx"> : InspectorSupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="lines">@@ -255,12 +256,12 @@
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Network1"), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetwork1BackendDispatcher::dispatch(long callId, const String& method, Ref<InspectorObject>&& message)
</del><ins>+void InspectorNetwork1BackendDispatcher::dispatch(long callId, const String& method, PassRefPtr<InspectorObject> message)
</ins><span class="cx"> {
</span><span class="cx"> Ref<InspectorNetwork1BackendDispatcher> protect(*this);
</span><span class="cx">
</span><span class="cx"> if (method == "loadResource")
</span><del>- loadResource(callId, message);
</del><ins>+ loadResource(callId, *message.get());
</ins><span class="cx"> else
</span><span class="cx"> m_backendDispatcher->reportProtocolError(&callId, InspectorBackendDispatcher::MethodNotFound, makeString('\'', "Network1", '.', method, "' was not found"));
</span><span class="cx"> }
</span><span class="lines">@@ -275,10 +276,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ErrorString error;
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> m_agent->loadResource(error);
</span><span class="cx">
</span><del>- m_backendDispatcher->sendResponse(callId, WTF::move(result), error);
</del><ins>+ m_backendDispatcher->sendResponse(callId, result.release(), error);
</ins><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(WEB_COMMANDS)
</span><span class="cx">
</span><span class="lines">@@ -327,6 +328,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -393,7 +395,7 @@
</span><span class="cx"> #if PLATFORM(WEB_EVENTS)
</span><span class="cx"> void InspectorNetwork3FrontendDispatcher::resourceLoaded()
</span><span class="cx"> {
</span><del>- Ref<InspectorObject> jsonMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</ins><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Network3.resourceLoaded"));
</span><span class="cx">
</span><span class="cx"> m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</span><span class="lines">@@ -444,6 +446,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -490,10 +493,10 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*NetworkError*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*NetworkError*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class NetworkError;
</span><span class="cx"> public:
</span><span class="lines">@@ -512,27 +515,30 @@
</span><span class="cx"> return castState<CodeSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<NetworkError> release()
</del><ins>+ operator RefPtr<NetworkError>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(NetworkError) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<NetworkError>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<NetworkError>*>(&result));
</del><ins>+ PassRefPtr<NetworkError> release()
+ {
+ return RefPtr<NetworkError>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<NetworkError> result = NetworkError::create()
</del><ins>+ * RefPtr<NetworkError> result = NetworkError::create()
</ins><span class="cx"> * .setMessage(...)
</span><del>- * .setCode(...)
- * .release();
</del><ins>+ * .setCode(...);
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // Network2
</span><span class="lines">@@ -984,7 +990,7 @@
</span><span class="cx"> if (!frontendChannel)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Ref<InspectorObject> jsonMessage = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</ins><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Network3.resourceLoaded"));
</span><span class="cx"> frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</span><span class="cx"> }
</span><span class="lines">@@ -1092,6 +1098,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedsametypeiddifferentdomainjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -235,6 +236,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -332,6 +334,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -814,6 +817,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedshadowedoptionaltypesettersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -235,6 +236,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -332,6 +334,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -381,10 +384,10 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*KeyPath*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*KeyPath*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class KeyPath;
</span><span class="cx"> public:
</span><span class="lines">@@ -396,35 +399,38 @@
</span><span class="cx"> return castState<TypeSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<KeyPath> release()
</del><ins>+ operator RefPtr<KeyPath>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(KeyPath) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<KeyPath>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<KeyPath>*>(&result));
</del><ins>+ PassRefPtr<KeyPath> release()
+ {
+ return RefPtr<KeyPath>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<KeyPath> result = KeyPath::create()
- * .setType(...)
- * .release();
</del><ins>+ * RefPtr<KeyPath> result = KeyPath::create()
+ * .setType(...);
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx">
</span><span class="cx"> void setString(const String& value)
</span><span class="cx"> {
</span><span class="cx"> InspectorObjectBase::setString(ASCIILiteral("string"), value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setArray(RefPtr<Inspector::Protocol::Array<String>> value)
</del><ins>+ void setArray(PassRefPtr<Inspector::Protocol::Array<String>> value)
</ins><span class="cx"> {
</span><del>- InspectorObjectBase::setArray(ASCIILiteral("array"), WTF::move(value));
</del><ins>+ InspectorObjectBase::setArray(ASCIILiteral("array"), value);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -914,6 +920,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationaliasedprimitivetypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -235,6 +236,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -332,6 +334,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -800,6 +803,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationarraytypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -238,6 +239,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -335,6 +337,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -861,6 +864,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationenumtypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -131,6 +131,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -239,6 +240,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -336,6 +338,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -899,6 +902,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -235,6 +236,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -332,6 +334,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -384,10 +387,10 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*Error*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*Error*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class Error;
</span><span class="cx"> public:
</span><span class="lines">@@ -406,27 +409,30 @@
</span><span class="cx"> return castState<CodeSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<Error> release()
</del><ins>+ operator RefPtr<Error>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(Error) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<Error>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<Error>*>(&result));
</del><ins>+ PassRefPtr<Error> release()
+ {
+ return RefPtr<Error>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<Error> result = Error::create()
</del><ins>+ * RefPtr<Error> result = Error::create()
</ins><span class="cx"> * .setMessage(...)
</span><del>- * .setCode(...)
- * .release();
</del><ins>+ * .setCode(...);
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class OptionalParameterBundle : public Inspector::InspectorObjectBase {
</span><span class="lines">@@ -446,37 +452,40 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*OptionalParameterBundle*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*OptionalParameterBundle*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class OptionalParameterBundle;
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- Ref<OptionalParameterBundle> release()
</del><ins>+ operator RefPtr<OptionalParameterBundle>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(OptionalParameterBundle) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<OptionalParameterBundle>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<OptionalParameterBundle>*>(&result));
</del><ins>+ PassRefPtr<OptionalParameterBundle> release()
+ {
+ return RefPtr<OptionalParameterBundle>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<OptionalParameterBundle> result = OptionalParameterBundle::create()
- * .release();
</del><ins>+ * RefPtr<OptionalParameterBundle> result = OptionalParameterBundle::create();
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx">
</span><del>- void setColumnNames(RefPtr<Inspector::Protocol::Array<String>> value)
</del><ins>+ void setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
</ins><span class="cx"> {
</span><del>- InspectorObjectBase::setArray(ASCIILiteral("columnNames"), WTF::move(value));
</del><ins>+ InspectorObjectBase::setArray(ASCIILiteral("columnNames"), value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setNotes(const String& value)
</span><span class="lines">@@ -489,19 +498,19 @@
</span><span class="cx"> InspectorObjectBase::setDouble(ASCIILiteral("timestamp"), value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setValues(RefPtr<Inspector::InspectorObject> value)
</del><ins>+ void setValues(PassRefPtr<Inspector::InspectorObject> value)
</ins><span class="cx"> {
</span><del>- InspectorObjectBase::setObject(ASCIILiteral("values"), WTF::move(value));
</del><ins>+ InspectorObjectBase::setObject(ASCIILiteral("values"), value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void setPayload(RefPtr<Inspector::InspectorValue> value)
</del><ins>+ void setPayload(PassRefPtr<Inspector::InspectorValue> value)
</ins><span class="cx"> {
</span><del>- InspectorObjectBase::setValue(ASCIILiteral("payload"), WTF::move(value));
</del><ins>+ InspectorObjectBase::setValue(ASCIILiteral("payload"), value);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void setError(RefPtr<Inspector::Protocol::Database::Error> value)
</del><ins>+ void setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
</ins><span class="cx"> {
</span><del>- InspectorObjectBase::setObject(ASCIILiteral("error"), WTF::move(value));
</del><ins>+ InspectorObjectBase::setObject(ASCIILiteral("error"), value);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -528,15 +537,15 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*ParameterBundle*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*ParameterBundle*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class ParameterBundle;
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- Builder<STATE | ColumnNamesSet>& setColumnNames(RefPtr<Inspector::Protocol::Array<String>> value)
</del><ins>+ Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & ColumnNamesSet), property_columnNames_already_set);
</span><span class="cx"> m_result->setArray(ASCIILiteral("columnNames"), value);
</span><span class="lines">@@ -557,52 +566,55 @@
</span><span class="cx"> return castState<TimestampSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder<STATE | ValuesSet>& setValues(RefPtr<Inspector::InspectorObject> value)
</del><ins>+ Builder<STATE | ValuesSet>& setValues(PassRefPtr<Inspector::InspectorObject> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & ValuesSet), property_values_already_set);
</span><span class="cx"> m_result->setObject(ASCIILiteral("values"), value);
</span><span class="cx"> return castState<ValuesSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder<STATE | PayloadSet>& setPayload(RefPtr<Inspector::InspectorValue> value)
</del><ins>+ Builder<STATE | PayloadSet>& setPayload(PassRefPtr<Inspector::InspectorValue> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & PayloadSet), property_payload_already_set);
</span><span class="cx"> m_result->setValue(ASCIILiteral("payload"), value);
</span><span class="cx"> return castState<PayloadSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder<STATE | ErrorSet>& setError(RefPtr<Inspector::Protocol::Database::Error> value)
</del><ins>+ Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & ErrorSet), property_error_already_set);
</span><span class="cx"> m_result->setObject(ASCIILiteral("error"), value);
</span><span class="cx"> return castState<ErrorSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<ParameterBundle> release()
</del><ins>+ operator RefPtr<ParameterBundle>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(ParameterBundle) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<ParameterBundle>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<ParameterBundle>*>(&result));
</del><ins>+ PassRefPtr<ParameterBundle> release()
+ {
+ return RefPtr<ParameterBundle>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<ParameterBundle> result = ParameterBundle::create()
</del><ins>+ * RefPtr<ParameterBundle> result = ParameterBundle::create()
</ins><span class="cx"> * .setColumnNames(...)
</span><span class="cx"> * .setNotes(...)
</span><span class="cx"> * .setTimestamp(...)
</span><span class="cx"> * .setValues(...)
</span><span class="cx"> * .setPayload(...)
</span><del>- * .setError(...)
- * .release();
</del><ins>+ * .setError(...);
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* Conflicted names may cause generated getters/setters to clash with built-in InspectorObject methods. */
</span><span class="lines">@@ -628,10 +640,10 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*ObjectWithPropertyNameConflicts*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*ObjectWithPropertyNameConflicts*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class ObjectWithPropertyNameConflicts;
</span><span class="cx"> public:
</span><span class="lines">@@ -671,30 +683,33 @@
</span><span class="cx"> return castState<ObjectSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<ObjectWithPropertyNameConflicts> release()
</del><ins>+ operator RefPtr<ObjectWithPropertyNameConflicts>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(ObjectWithPropertyNameConflicts) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<ObjectWithPropertyNameConflicts>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<ObjectWithPropertyNameConflicts>*>(&result));
</del><ins>+ PassRefPtr<ObjectWithPropertyNameConflicts> release()
+ {
+ return RefPtr<ObjectWithPropertyNameConflicts>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<ObjectWithPropertyNameConflicts> result = ObjectWithPropertyNameConflicts::create()
</del><ins>+ * RefPtr<ObjectWithPropertyNameConflicts> result = ObjectWithPropertyNameConflicts::create()
</ins><span class="cx"> * .setInteger(...)
</span><span class="cx"> * .setArray(...)
</span><span class="cx"> * .setString(...)
</span><span class="cx"> * .setValue(...)
</span><del>- * .setObject(...)
- * .release();
</del><ins>+ * .setObject(...);
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // Database
</span><span class="lines">@@ -723,15 +738,15 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*ParameterBundle*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*ParameterBundle*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class ParameterBundle;
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- Builder<STATE | ColumnNamesSet>& setColumnNames(RefPtr<Inspector::Protocol::Array<String>> value)
</del><ins>+ Builder<STATE | ColumnNamesSet>& setColumnNames(PassRefPtr<Inspector::Protocol::Array<String>> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & ColumnNamesSet), property_columnNames_already_set);
</span><span class="cx"> m_result->setArray(ASCIILiteral("columnNames"), value);
</span><span class="lines">@@ -752,52 +767,55 @@
</span><span class="cx"> return castState<TimestampSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder<STATE | ValuesSet>& setValues(RefPtr<Inspector::InspectorObject> value)
</del><ins>+ Builder<STATE | ValuesSet>& setValues(PassRefPtr<Inspector::InspectorObject> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & ValuesSet), property_values_already_set);
</span><span class="cx"> m_result->setObject(ASCIILiteral("values"), value);
</span><span class="cx"> return castState<ValuesSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder<STATE | PayloadSet>& setPayload(RefPtr<Inspector::InspectorValue> value)
</del><ins>+ Builder<STATE | PayloadSet>& setPayload(PassRefPtr<Inspector::InspectorValue> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & PayloadSet), property_payload_already_set);
</span><span class="cx"> m_result->setValue(ASCIILiteral("payload"), value);
</span><span class="cx"> return castState<PayloadSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder<STATE | ErrorSet>& setError(RefPtr<Inspector::Protocol::Database::Error> value)
</del><ins>+ Builder<STATE | ErrorSet>& setError(PassRefPtr<Inspector::Protocol::Database::Error> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & ErrorSet), property_error_already_set);
</span><span class="cx"> m_result->setObject(ASCIILiteral("error"), value);
</span><span class="cx"> return castState<ErrorSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<ParameterBundle> release()
</del><ins>+ operator RefPtr<ParameterBundle>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(ParameterBundle) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<ParameterBundle>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<ParameterBundle>*>(&result));
</del><ins>+ PassRefPtr<ParameterBundle> release()
+ {
+ return RefPtr<ParameterBundle>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<ParameterBundle> result = ParameterBundle::create()
</del><ins>+ * RefPtr<ParameterBundle> result = ParameterBundle::create()
</ins><span class="cx"> * .setColumnNames(...)
</span><span class="cx"> * .setNotes(...)
</span><span class="cx"> * .setTimestamp(...)
</span><span class="cx"> * .setValues(...)
</span><span class="cx"> * .setPayload(...)
</span><del>- * .setError(...)
- * .release();
</del><ins>+ * .setError(...);
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // Test
</span><span class="lines">@@ -1313,6 +1331,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx">
</span><span class="cx"> class AlternateInspectorBackendDispatcher {
</span><span class="cx"> public:
</span><del>- void setBackendDispatcher(Ref<InspectorBackendDispatcher>&& dispatcher) { m_backendDispatcher = WTF::move(dispatcher); }
- const InspectorBackendDispatcher& backendDispatcher() const { return m_backendDispatcher.get(); }
</del><ins>+ void setBackendDispatcher(PassRefPtr<InspectorBackendDispatcher> dispatcher) { m_backendDispatcher = dispatcher; }
+ InspectorBackendDispatcher* backendDispatcher() const { return m_backendDispatcher.get(); }
</ins><span class="cx"> private:
</span><del>- Ref<InspectorBackendDispatcher> m_backendDispatcher;
</del><ins>+ RefPtr<InspectorBackendDispatcher> m_backendDispatcher;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -131,6 +131,7 @@
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorBackendDispatcher.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -239,6 +240,7 @@
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><span class="cx"> #include <inspector/InspectorFrontendChannel.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -336,6 +338,7 @@
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorProtocolTypes.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="lines">@@ -393,10 +396,10 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*TypeNeedingCast*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*TypeNeedingCast*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class TypeNeedingCast;
</span><span class="cx"> public:
</span><span class="lines">@@ -429,37 +432,40 @@
</span><span class="cx"> return castState<IdSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder<STATE | TreeSet>& setTree(RefPtr<Inspector::Protocol::Test::RecursiveObject1> value)
</del><ins>+ Builder<STATE | TreeSet>& setTree(PassRefPtr<Inspector::Protocol::Test::RecursiveObject1> value)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & TreeSet), property_tree_already_set);
</span><span class="cx"> m_result->setObject(ASCIILiteral("tree"), value);
</span><span class="cx"> return castState<TreeSet>();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<TypeNeedingCast> release()
</del><ins>+ operator RefPtr<TypeNeedingCast>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(TypeNeedingCast) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<TypeNeedingCast>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<TypeNeedingCast>*>(&result));
</del><ins>+ PassRefPtr<TypeNeedingCast> release()
+ {
+ return RefPtr<TypeNeedingCast>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<TypeNeedingCast> result = TypeNeedingCast::create()
</del><ins>+ * RefPtr<TypeNeedingCast> result = TypeNeedingCast::create()
</ins><span class="cx"> * .setString(...)
</span><span class="cx"> * .setNumber(...)
</span><span class="cx"> * .setAnimals(...)
</span><span class="cx"> * .setId(...)
</span><del>- * .setTree(...)
- * .release();
</del><ins>+ * .setTree(...);
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* */
</span><span class="lines">@@ -493,37 +499,40 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*RecursiveObject1*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*RecursiveObject1*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class RecursiveObject1;
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- Ref<RecursiveObject1> release()
</del><ins>+ operator RefPtr<RecursiveObject1>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(RecursiveObject1) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<RecursiveObject1>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<RecursiveObject1>*>(&result));
</del><ins>+ PassRefPtr<RecursiveObject1> release()
+ {
+ return RefPtr<RecursiveObject1>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<RecursiveObject1> result = RecursiveObject1::create()
- * .release();
</del><ins>+ * RefPtr<RecursiveObject1> result = RecursiveObject1::create();
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx">
</span><del>- void setObj(RefPtr<Inspector::Protocol::Test::RecursiveObject2> value)
</del><ins>+ void setObj(PassRefPtr<Inspector::Protocol::Test::RecursiveObject2> value)
</ins><span class="cx"> {
</span><del>- InspectorObjectBase::setObject(ASCIILiteral("obj"), WTF::move(value));
</del><ins>+ InspectorObjectBase::setObject(ASCIILiteral("obj"), value);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -544,37 +553,40 @@
</span><span class="cx"> return *reinterpret_cast<Builder<STATE | STEP>*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Builder(Ref</*RecursiveObject2*/Inspector::InspectorObject>&& object)
- : m_result(WTF::move(object))
</del><ins>+ Builder(PassRefPtr</*RecursiveObject2*/Inspector::InspectorObject> ptr)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == NoFieldsSet, builder_created_in_non_init_state);
</span><ins>+ m_result = ptr;
</ins><span class="cx"> }
</span><span class="cx"> friend class RecursiveObject2;
</span><span class="cx"> public:
</span><span class="cx">
</span><del>- Ref<RecursiveObject2> release()
</del><ins>+ operator RefPtr<RecursiveObject2>& ()
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(STATE == AllFieldsSet, result_is_not_ready);
</span><span class="cx"> COMPILE_ASSERT(sizeof(RecursiveObject2) == sizeof(Inspector::InspectorObject), cannot_cast);
</span><ins>+ return *reinterpret_cast<RefPtr<RecursiveObject2>*>(&m_result);
+ }
</ins><span class="cx">
</span><del>- Ref<Inspector::InspectorObject> result = m_result.releaseNonNull();
- return WTF::move(*reinterpret_cast<Ref<RecursiveObject2>*>(&result));
</del><ins>+ PassRefPtr<RecursiveObject2> release()
+ {
+ return RefPtr<RecursiveObject2>(*this).release();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Synthetic constructor:
</span><del>- * Ref<RecursiveObject2> result = RecursiveObject2::create()
- * .release();
</del><ins>+ * RefPtr<RecursiveObject2> result = RecursiveObject2::create();
</ins><span class="cx"> */
</span><span class="cx"> static Builder<NoFieldsSet> create()
</span><span class="cx"> {
</span><span class="cx"> return Builder<NoFieldsSet>(Inspector::InspectorObject::create());
</span><span class="cx"> }
</span><ins>+ typedef Inspector::Protocol::StructItemTraits ItemTraits;
</ins><span class="cx">
</span><del>- void setObj(RefPtr<Inspector::Protocol::Test::RecursiveObject1> value)
</del><ins>+ void setObj(PassRefPtr<Inspector::Protocol::Test::RecursiveObject1> value)
</ins><span class="cx"> {
</span><del>- InspectorObjectBase::setObject(ASCIILiteral("obj"), WTF::move(value));
</del><ins>+ InspectorObjectBase::setObject(ASCIILiteral("obj"), value);
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -586,7 +598,7 @@
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx"> };
</span><span class="cx"> template<> struct BindingTraits<Inspector::Protocol::Test::TypeNeedingCast> {
</span><del>-static RefPtr<Inspector::Protocol::Test::TypeNeedingCast> runtimeCast(RefPtr<Inspector::InspectorValue>&& value);
</del><ins>+static PassRefPtr<Inspector::Protocol::Test::TypeNeedingCast> runtimeCast(PassRefPtr<Inspector::InspectorValue> value);
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> static void assertValueHasExpectedType(Inspector::InspectorValue*);
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="lines">@@ -672,7 +684,6 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> void BindingTraits<Inspector::Protocol::Test::CastedAnimals>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</span><span class="cx"> {
</span><del>- ASSERT_ARG(value, value);
</del><span class="cx"> String result;
</span><span class="cx"> bool castSucceeded = value->asString(result);
</span><span class="cx"> ASSERT(castSucceeded);
</span><span class="lines">@@ -683,7 +694,6 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> void BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</span><span class="cx"> {
</span><del>- ASSERT_ARG(value, value);
</del><span class="cx"> RefPtr<InspectorObject> object;
</span><span class="cx"> bool castSucceeded = value->asObject(object);
</span><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="lines">@@ -719,7 +729,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::Test::TypeNeedingCast> BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::runtimeCast(RefPtr<Inspector::InspectorValue>&& value)
</del><ins>+PassRefPtr<Inspector::Protocol::Test::TypeNeedingCast> BindingTraits<Inspector::Protocol::Test::TypeNeedingCast>::runtimeCast(PassRefPtr<Inspector::InspectorValue> value)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Inspector::InspectorObject> result;
</span><span class="cx"> bool castSucceeded = value->asObject(result);
</span><span class="lines">@@ -735,7 +745,6 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> void BindingTraits<Inspector::Protocol::Test::RecursiveObject1>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</span><span class="cx"> {
</span><del>- ASSERT_ARG(value, value);
</del><span class="cx"> RefPtr<InspectorObject> object;
</span><span class="cx"> bool castSucceeded = value->asObject(object);
</span><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="lines">@@ -756,7 +765,6 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> void BindingTraits<Inspector::Protocol::Test::RecursiveObject2>::assertValueHasExpectedType(Inspector::InspectorValue* value)
</span><span class="cx"> {
</span><del>- ASSERT_ARG(value, value);
</del><span class="cx"> RefPtr<InspectorObject> object;
</span><span class="cx"> bool castSucceeded = value->asObject(object);
</span><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="lines">@@ -1248,6 +1256,7 @@
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayEncodedValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/EncodedValue.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/EncodedValue.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/replay/EncodedValue.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -37,22 +37,22 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-RefPtr<InspectorObject> EncodedValue::asObject()
</del><ins>+PassRefPtr<InspectorObject> EncodedValue::asObject()
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> result;
</span><span class="cx"> bool castSucceeded = m_value->asObject(result);
</span><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><del>- return result;
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorArray> EncodedValue::asArray()
</del><ins>+PassRefPtr<InspectorArray> EncodedValue::asArray()
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorArray> result;
</span><span class="cx"> bool castSucceeded = m_value->asArray(result);
</span><span class="cx"> ASSERT_UNUSED(castSucceeded, castSucceeded);
</span><span class="cx">
</span><del>- return result;
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedValue EncodingTraits<Vector<char>>::encodeValue(const Vector<char>& buffer)
</span><span class="lines">@@ -175,23 +175,23 @@
</span><span class="cx"> template<>
</span><span class="cx"> void EncodedValue::put<EncodedValue>(const String& key, const typename EncodingTraits<EncodedValue>::DecodedType& value)
</span><span class="cx"> {
</span><del>- asObject()->setValue(key, value.m_value.copyRef());
</del><ins>+ asObject()->setValue(key, value.m_value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<>
</span><span class="cx"> void EncodedValue::append<EncodedValue>(const typename EncodingTraits<EncodedValue>::DecodedType& value)
</span><span class="cx"> {
</span><del>- asArray()->pushValue(value.m_value.copyRef());
</del><ins>+ asArray()->pushValue(value.m_value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<>
</span><span class="cx"> bool EncodedValue::get<EncodedValue>(const String& key, typename EncodingTraits<EncodedValue>::DecodedType& decodedValue)
</span><span class="cx"> {
</span><del>- RefPtr<Inspector::InspectorValue> value;
- if (!asObject()->getValue(key, value))
</del><ins>+ RefPtr<Inspector::InspectorValue> inspectorValue(asObject()->get(key));
+ if (!inspectorValue)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- decodedValue = EncodedValue(WTF::move(value));
</del><ins>+ decodedValue = EncodedValue(inspectorValue);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayEncodedValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/EncodedValue.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/EncodedValue.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/replay/EncodedValue.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> class EncodedValue final {
</span><span class="cx"> public:
</span><del>- explicit EncodedValue(RefPtr<Inspector::InspectorValue>&& value)
</del><ins>+ explicit EncodedValue(PassRefPtr<Inspector::InspectorValue> value)
</ins><span class="cx"> : m_value(value) { }
</span><span class="cx">
</span><span class="cx"> EncodedValue()
</span><span class="lines">@@ -78,8 +78,8 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> T convertTo();
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE RefPtr<Inspector::InspectorObject> asObject();
- JS_EXPORT_PRIVATE RefPtr<Inspector::InspectorArray> asArray();
</del><ins>+ JS_EXPORT_PRIVATE PassRefPtr<Inspector::InspectorObject> asObject();
+ JS_EXPORT_PRIVATE PassRefPtr<Inspector::InspectorArray> asArray();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<Inspector::InspectorValue> m_value;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayscriptsCodeGeneratorReplayInputspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -341,13 +341,13 @@
</span><span class="cx"> if self.mode == TypeModes.SCALAR:
</span><span class="cx"> return self.type_name(qualified)
</span><span class="cx"> elif self.mode == TypeModes.SHARED:
</span><del>- return "RefPtr<%s>" % self.type_name(qualified)
</del><ins>+ return "PassRefPtr<%s>" % self.type_name(qualified)
</ins><span class="cx"> else:
</span><span class="cx"> return "const %s&" % self.type_name(qualified)
</span><span class="cx">
</span><span class="cx"> def argument_type(self, qualified=False):
</span><span class="cx"> if self.mode == TypeModes.SHARED:
</span><del>- return "RefPtr<%s>&&" % self.type_name(qualified)
</del><ins>+ return "PassRefPtr<%s>" % self.type_name(qualified)
</ins><span class="cx"> else:
</span><span class="cx"> return self.storage_type()
</span><span class="cx">
</span><span class="lines">@@ -939,7 +939,7 @@
</span><span class="cx">
</span><span class="cx"> def generate_member_move_expression(self, _member):
</span><span class="cx"> _type = self._model.get_type_for_member(_member)
</span><del>- if _type.mode in [TypeModes.OWNED, TypeModes.SHARED]:
</del><ins>+ if _type.mode == TypeModes.OWNED:
</ins><span class="cx"> return "WTF::move(%s)" % _member.memberName
</span><span class="cx"> else:
</span><span class="cx"> return _member.memberName
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> WTFLogAlways("%s", builder.toString().utf8().data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::printConsoleMessageWithArguments(MessageSource source, MessageType type, MessageLevel level, JSC::ExecState* exec, RefPtr<ScriptArguments>&& prpArguments)
</del><ins>+void ConsoleClient::printConsoleMessageWithArguments(MessageSource source, MessageType type, MessageLevel level, JSC::ExecState* exec, PassRefPtr<ScriptArguments> prpArguments)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ScriptArguments> arguments = prpArguments;
</span><span class="cx">
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::internalMessageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, RefPtr<ScriptArguments>&& prpArguments, ArgumentRequirement argumentRequirement)
</del><ins>+void ConsoleClient::internalMessageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, PassRefPtr<ScriptArguments> prpArguments, ArgumentRequirement argumentRequirement)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ScriptArguments> arguments = prpArguments;
</span><span class="cx"> if (argumentRequirement == ArgumentRequired && !arguments->argumentCount())
</span><span class="lines">@@ -195,57 +195,57 @@
</span><span class="cx"> messageWithTypeAndLevel(type, level, exec, arguments.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::logWithLevel(ExecState* exec, RefPtr<ScriptArguments>&& arguments, MessageLevel level)
</del><ins>+void ConsoleClient::logWithLevel(ExecState* exec, PassRefPtr<ScriptArguments> arguments, MessageLevel level)
</ins><span class="cx"> {
</span><del>- internalMessageWithTypeAndLevel(MessageType::Log, level, exec, WTF::move(arguments), ArgumentRequired);
</del><ins>+ internalMessageWithTypeAndLevel(MessageType::Log, level, exec, arguments, ArgumentRequired);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::clear(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::clear(ExecState* exec, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><del>- internalMessageWithTypeAndLevel(MessageType::Clear, MessageLevel::Log, exec, WTF::move(arguments), ArgumentNotRequired);
</del><ins>+ internalMessageWithTypeAndLevel(MessageType::Clear, MessageLevel::Log, exec, arguments, ArgumentNotRequired);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::dir(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::dir(ExecState* exec, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><del>- internalMessageWithTypeAndLevel(MessageType::Dir, MessageLevel::Log, exec, WTF::move(arguments), ArgumentRequired);
</del><ins>+ internalMessageWithTypeAndLevel(MessageType::Dir, MessageLevel::Log, exec, arguments, ArgumentRequired);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::dirXML(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::dirXML(ExecState* exec, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><del>- internalMessageWithTypeAndLevel(MessageType::DirXML, MessageLevel::Log, exec, WTF::move(arguments), ArgumentRequired);
</del><ins>+ internalMessageWithTypeAndLevel(MessageType::DirXML, MessageLevel::Log, exec, arguments, ArgumentRequired);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::table(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::table(ExecState* exec, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><del>- internalMessageWithTypeAndLevel(MessageType::Table, MessageLevel::Log, exec, WTF::move(arguments), ArgumentRequired);
</del><ins>+ internalMessageWithTypeAndLevel(MessageType::Table, MessageLevel::Log, exec, arguments, ArgumentRequired);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::trace(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::trace(ExecState* exec, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><del>- internalMessageWithTypeAndLevel(MessageType::Trace, MessageLevel::Log, exec, WTF::move(arguments), ArgumentNotRequired);
</del><ins>+ internalMessageWithTypeAndLevel(MessageType::Trace, MessageLevel::Log, exec, arguments, ArgumentNotRequired);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::assertCondition(ExecState* exec, RefPtr<ScriptArguments>&& arguments, bool condition)
</del><ins>+void ConsoleClient::assertCondition(ExecState* exec, PassRefPtr<ScriptArguments> arguments, bool condition)
</ins><span class="cx"> {
</span><span class="cx"> if (condition)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- internalMessageWithTypeAndLevel(MessageType::Assert, MessageLevel::Error, exec, WTF::move(arguments), ArgumentNotRequired);
</del><ins>+ internalMessageWithTypeAndLevel(MessageType::Assert, MessageLevel::Error, exec, arguments, ArgumentNotRequired);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::group(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::group(ExecState* exec, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><del>- internalMessageWithTypeAndLevel(MessageType::StartGroup, MessageLevel::Log, exec, WTF::move(arguments), ArgumentNotRequired);
</del><ins>+ internalMessageWithTypeAndLevel(MessageType::StartGroup, MessageLevel::Log, exec, arguments, ArgumentNotRequired);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::groupCollapsed(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::groupCollapsed(ExecState* exec, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><del>- internalMessageWithTypeAndLevel(MessageType::StartGroupCollapsed, MessageLevel::Log, exec, WTF::move(arguments), ArgumentNotRequired);
</del><ins>+ internalMessageWithTypeAndLevel(MessageType::StartGroupCollapsed, MessageLevel::Log, exec, arguments, ArgumentNotRequired);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::groupEnd(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::groupEnd(ExecState* exec, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><del>- internalMessageWithTypeAndLevel(MessageType::EndGroup, MessageLevel::Log, exec, WTF::move(arguments), ArgumentNotRequired);
</del><ins>+ internalMessageWithTypeAndLevel(MessageType::EndGroup, MessageLevel::Log, exec, arguments, ArgumentNotRequired);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConsoleClient.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConsoleClient.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/runtime/ConsoleClient.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -42,30 +42,30 @@
</span><span class="cx"> virtual ~ConsoleClient() { }
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static void printConsoleMessage(MessageSource, MessageType, MessageLevel, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber);
</span><del>- JS_EXPORT_PRIVATE static void printConsoleMessageWithArguments(MessageSource, MessageType, MessageLevel, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ JS_EXPORT_PRIVATE static void printConsoleMessageWithArguments(MessageSource, MessageType, MessageLevel, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx">
</span><del>- void logWithLevel(ExecState*, RefPtr<Inspector::ScriptArguments>&&, MessageLevel);
- void clear(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void dir(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void dirXML(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void table(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void trace(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void assertCondition(ExecState*, RefPtr<Inspector::ScriptArguments>&&, bool condition);
- void group(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void groupCollapsed(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void groupEnd(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ void logWithLevel(ExecState*, PassRefPtr<Inspector::ScriptArguments>, MessageLevel);
+ void clear(ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void dir(ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void dirXML(ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void table(ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void trace(ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void assertCondition(ExecState*, PassRefPtr<Inspector::ScriptArguments>, bool condition);
+ void group(ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void groupCollapsed(ExecState*, PassRefPtr<Inspector::ScriptArguments>);
+ void groupEnd(ExecState*, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx">
</span><del>- virtual void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) = 0;
- virtual void count(ExecState*, RefPtr<Inspector::ScriptArguments>&&) = 0;
</del><ins>+ virtual void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>) = 0;
+ virtual void count(ExecState*, PassRefPtr<Inspector::ScriptArguments>) = 0;
</ins><span class="cx"> virtual void profile(ExecState*, const String& title) = 0;
</span><span class="cx"> virtual void profileEnd(ExecState*, const String& title) = 0;
</span><span class="cx"> virtual void time(ExecState*, const String& title) = 0;
</span><span class="cx"> virtual void timeEnd(ExecState*, const String& title) = 0;
</span><del>- virtual void timeStamp(ExecState*, RefPtr<Inspector::ScriptArguments>&&) = 0;
</del><ins>+ virtual void timeStamp(ExecState*, PassRefPtr<Inspector::ScriptArguments>) = 0;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> enum ArgumentRequirement { ArgumentRequired, ArgumentNotRequired };
</span><del>- void internalMessageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&, ArgumentRequirement);
</del><ins>+ void internalMessageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>, ArgumentRequirement);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTypeSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TypeSet.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TypeSet.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/runtime/TypeSet.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -237,17 +237,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-Ref<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> TypeSet::allStructureRepresentations() const
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> TypeSet::allStructureRepresentations() const
</ins><span class="cx"> {
</span><del>- auto description = Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> description = Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>::create();
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < m_structureHistory.size(); i++)
</span><span class="cx"> description->addItem(m_structureHistory.at(i)->inspectorRepresentation());
</span><span class="cx">
</span><del>- return WTF::move(description);
</del><ins>+ return description.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::Runtime::TypeSet> TypeSet::inspectorTypeSet() const
</del><ins>+PassRefPtr<Inspector::Protocol::Runtime::TypeSet> TypeSet::inspectorTypeSet() const
</ins><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::Runtime::TypeSet::create()
</span><span class="cx"> .setIsFunction((m_seenTypes & TypeFunction) != TypeNothing)
</span><span class="lines">@@ -511,11 +511,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>-Ref<Inspector::Protocol::Runtime::StructureDescription> StructureShape::inspectorRepresentation()
</del><ins>+PassRefPtr<Inspector::Protocol::Runtime::StructureDescription> StructureShape::inspectorRepresentation()
</ins><span class="cx"> {
</span><del>- auto base = Inspector::Protocol::Runtime::StructureDescription::create().release();
- Ref<Inspector::Protocol::Runtime::StructureDescription> currentObject = base.copyRef();
- RefPtr<StructureShape> currentShape(this);
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::StructureDescription> base = Inspector::Protocol::Runtime::StructureDescription::create();
+ RefPtr<Inspector::Protocol::Runtime::StructureDescription> currentObject = base;
+ RefPtr<StructureShape> currentShape = this;
</ins><span class="cx">
</span><span class="cx"> while (currentShape) {
</span><span class="cx"> auto fields = Inspector::Protocol::Array<String>::create();
</span><span class="lines">@@ -525,21 +525,21 @@
</span><span class="cx"> for (auto field : currentShape->m_optionalFields)
</span><span class="cx"> optionalFields->addItem(field.get());
</span><span class="cx">
</span><del>- currentObject->setFields(&fields.get());
- currentObject->setOptionalFields(&optionalFields.get());
</del><ins>+ currentObject->setFields(fields);
+ currentObject->setOptionalFields(optionalFields);
</ins><span class="cx"> currentObject->setConstructorName(currentShape->m_constructorName);
</span><span class="cx"> currentObject->setIsImprecise(currentShape->m_isInDictionaryMode);
</span><span class="cx">
</span><span class="cx"> if (currentShape->m_proto) {
</span><del>- auto nextObject = Inspector::Protocol::Runtime::StructureDescription::create().release();
- currentObject->setPrototypeStructure(&nextObject.get());
- currentObject = WTF::move(nextObject);
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::StructureDescription> nextObject = Inspector::Protocol::Runtime::StructureDescription::create();
+ currentObject->setPrototypeStructure(nextObject);
+ currentObject = nextObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> currentShape = currentShape->m_proto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(base);
</del><ins>+ return base.release();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTypeSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TypeSet.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TypeSet.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/JavaScriptCore/runtime/TypeSet.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> void addProperty(RefPtr<StringImpl>);
</span><span class="cx"> String stringRepresentation();
</span><span class="cx"> String toJSONString() const;
</span><del>- Ref<Inspector::Protocol::Runtime::StructureDescription> inspectorRepresentation();
</del><ins>+ PassRefPtr<Inspector::Protocol::Runtime::StructureDescription> inspectorRepresentation();
</ins><span class="cx"> void setConstructorName(String name) { m_constructorName = (name.isEmpty() ? "Object" : name); }
</span><span class="cx"> String constructorName() { return m_constructorName; }
</span><span class="cx"> void setProto(PassRefPtr<StructureShape> shape) { m_proto = shape; }
</span><span class="lines">@@ -102,11 +102,11 @@
</span><span class="cx"> void invalidateCache();
</span><span class="cx"> String dumpTypes() const;
</span><span class="cx"> String displayName() const;
</span><del>- Ref<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> allStructureRepresentations() const;
</del><ins>+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::StructureDescription>> allStructureRepresentations() const;
</ins><span class="cx"> String toJSONString() const;
</span><span class="cx"> bool isOverflown() const { return m_isOverflown; }
</span><span class="cx"> String leastCommonAncestor() const;
</span><del>- Ref<Inspector::Protocol::Runtime::TypeSet> inspectorTypeSet() const;
</del><ins>+ PassRefPtr<Inspector::Protocol::Runtime::TypeSet> inspectorTypeSet() const;
</ins><span class="cx"> bool isEmpty() const { return m_seenTypes == TypeNothing; }
</span><span class="cx"> bool doesTypeConformTo(uint32_t test) const;
</span><span class="cx"> uint32_t seenTypes() const { return m_seenTypes; }
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WTF/ChangeLog 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-07 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r178039.
+ https://bugs.webkit.org/show_bug.cgi?id=140187
+
+ Breaks ObjC Inspector Protocol (Requested by JoePeck on
+ #webkit).
+
+ Reverted changeset:
+
+ "Web Inspector: purge PassRefPtr from Inspector code and use
+ Ref for typed and untyped protocol objects"
+ https://bugs.webkit.org/show_bug.cgi?id=140053
+ http://trac.webkit.org/changeset/178039
+
</ins><span class="cx"> 2015-01-06 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: purge PassRefPtr from Inspector code and use Ref for typed and untyped protocol objects
</span></span></pre></div>
<a id="trunkSourceWTFwtfStopwatchh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Stopwatch.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Stopwatch.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WTF/wtf/Stopwatch.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx">
</span><span class="cx"> class Stopwatch : public RefCounted<Stopwatch> {
</span><span class="cx"> public:
</span><del>- static Ref<Stopwatch> create()
</del><ins>+ static PassRefPtr<Stopwatch> create()
</ins><span class="cx"> {
</span><del>- return adoptRef(*new Stopwatch());
</del><ins>+ return adoptRef(new Stopwatch());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void reset();
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/ChangeLog 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -1,4 +1,18 @@
</span><ins>+2015-01-07 Commit Queue <commit-queue@webkit.org>
</ins><span class="cx">
</span><ins>+ Unreviewed, rolling out r178039.
+ https://bugs.webkit.org/show_bug.cgi?id=140187
+
+ Breaks ObjC Inspector Protocol (Requested by JoePeck on
+ #webkit).
+
+ Reverted changeset:
+
+ "Web Inspector: purge PassRefPtr from Inspector code and use
+ Ref for typed and untyped protocol objects"
+ https://bugs.webkit.org/show_bug.cgi?id=140053
+ http://trac.webkit.org/changeset/178039
+
</ins><span class="cx"> 2015-01-06 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: purge PassRefPtr from Inspector code and use Ref for typed and untyped protocol objects
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<DatabaseContext> databaseContext = databaseContextFor(context);
</span><span class="cx"> databaseContext->setHasOpenDatabases();
</span><del>- InspectorInstrumentation::didOpenDatabase(context, database.copyRef(), context->securityOrigin()->host(), name, expectedVersion);
</del><ins>+ InspectorInstrumentation::didOpenDatabase(context, database, context->securityOrigin()->host(), name, expectedVersion);
</ins><span class="cx">
</span><span class="cx"> if (backend->isNew() && creationCallback.get()) {
</span><span class="cx"> LOG(StorageAPI, "Scheduling DatabaseCreationCallbackTask for database %p\n", database.get());
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -2614,9 +2614,9 @@
</span><span class="cx"> return m_domWindow.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<Inspector::ScriptCallStack>&& callStack)
</del><ins>+void Document::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack> callStack)
</ins><span class="cx"> {
</span><del>- addMessage(MessageSource::JS, MessageLevel::Error, errorMessage, sourceURL, lineNumber, columnNumber, WTF::move(callStack));
</del><ins>+ addMessage(MessageSource::JS, MessageLevel::Error, errorMessage, sourceURL, lineNumber, columnNumber, callStack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::setURL(const URL& url)
</span><span class="lines">@@ -4975,7 +4975,7 @@
</span><span class="cx"> page->console().addMessage(source, level, message, requestIdentifier, this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&& callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</del><ins>+void Document::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack> callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><span class="cx"> postTask(AddConsoleMessageTask(source, level, StringCapture(message)));
</span><span class="lines">@@ -4983,7 +4983,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Page* page = this->page())
</span><del>- page->console().addMessage(source, level, message, sourceURL, lineNumber, columnNumber, WTF::move(callStack), state, requestIdentifier);
</del><ins>+ page->console().addMessage(source, level, message, sourceURL, lineNumber, columnNumber, callStack, state, requestIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SecurityOrigin* Document::topOrigin() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/dom/Document.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -1179,7 +1179,7 @@
</span><span class="cx"> void sendWillRevealEdgeEventsIfNeeded(const IntPoint& oldPosition, const IntPoint& newPosition, const IntRect& visibleRect, const IntSize& contentsSize, Element* target = nullptr);
</span><span class="cx">
</span><span class="cx"> virtual EventTarget* errorEventTarget() override final;
</span><del>- virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<Inspector::ScriptCallStack>&&) override final;
</del><ins>+ virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack>) override final;
</ins><span class="cx">
</span><span class="cx"> void initDNSPrefetch();
</span><span class="cx">
</span><span class="lines">@@ -1317,7 +1317,7 @@
</span><span class="cx"> virtual void refScriptExecutionContext() override final { ref(); }
</span><span class="cx"> virtual void derefScriptExecutionContext() override final { deref(); }
</span><span class="cx">
</span><del>- virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override final;
</del><ins>+ virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack>, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override final;
</ins><span class="cx">
</span><span class="cx"> virtual double minimumTimerInterval() const override final;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -350,25 +350,25 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScriptExecutionContext::reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, RefPtr<ScriptCallStack>&& callStack, CachedScript* cachedScript)
</del><ins>+void ScriptExecutionContext::reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, PassRefPtr<ScriptCallStack> callStack, CachedScript* cachedScript)
</ins><span class="cx"> {
</span><span class="cx"> if (m_inDispatchErrorEvent) {
</span><span class="cx"> if (!m_pendingExceptions)
</span><span class="cx"> m_pendingExceptions = std::make_unique<Vector<std::unique_ptr<PendingException>>>();
</span><del>- m_pendingExceptions->append(std::make_unique<PendingException>(errorMessage, lineNumber, columnNumber, sourceURL, callStack.copyRef()));
</del><ins>+ m_pendingExceptions->append(std::make_unique<PendingException>(errorMessage, lineNumber, columnNumber, sourceURL, callStack));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // First report the original exception and only then all the nested ones.
</span><span class="cx"> if (!dispatchErrorEvent(errorMessage, lineNumber, columnNumber, sourceURL, cachedScript))
</span><del>- logExceptionToConsole(errorMessage, sourceURL, lineNumber, columnNumber, callStack.copyRef());
</del><ins>+ logExceptionToConsole(errorMessage, sourceURL, lineNumber, columnNumber, callStack);
</ins><span class="cx">
</span><span class="cx"> if (!m_pendingExceptions)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Vector<std::unique_ptr<PendingException>>> pendingExceptions = WTF::move(m_pendingExceptions);
</span><span class="cx"> for (auto& exception : *pendingExceptions)
</span><del>- logExceptionToConsole(exception->m_errorMessage, exception->m_sourceURL, exception->m_lineNumber, exception->m_columnNumber, exception->m_callStack.copyRef());
</del><ins>+ logExceptionToConsole(exception->m_errorMessage, exception->m_sourceURL, exception->m_lineNumber, exception->m_columnNumber, exception->m_callStack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScriptExecutionContext::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* state, unsigned long requestIdentifier)
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> virtual void disableEval(const String& errorMessage) = 0;
</span><span class="cx">
</span><span class="cx"> bool sanitizeScriptError(String& errorMessage, int& lineNumber, int& columnNumber, String& sourceURL, CachedScript* = nullptr);
</span><del>- void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, RefPtr<Inspector::ScriptCallStack>&&, CachedScript* = nullptr);
</del><ins>+ void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, PassRefPtr<Inspector::ScriptCallStack>, CachedScript* = nullptr);
</ins><span class="cx">
</span><span class="cx"> void addConsoleMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
</span><span class="cx"> virtual void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0) = 0;
</span><span class="lines">@@ -198,9 +198,9 @@
</span><span class="cx"> bool hasPendingActivity() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0) = 0;
</del><ins>+ virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack>, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0) = 0;
</ins><span class="cx"> virtual EventTarget* errorEventTarget() = 0;
</span><del>- virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<Inspector::ScriptCallStack>&&) = 0;
</del><ins>+ virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack>) = 0;
</ins><span class="cx"> bool dispatchErrorEvent(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, CachedScript*);
</span><span class="cx">
</span><span class="cx"> virtual void refScriptExecutionContext() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserXSSAuditorDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -82,12 +82,12 @@
</span><span class="cx"> httpBody = formData->flattenToString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<InspectorObject> reportDetails = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> reportDetails = InspectorObject::create();
</ins><span class="cx"> reportDetails->setString("request-url", xssInfo.m_originalURL);
</span><span class="cx"> reportDetails->setString("request-body", httpBody);
</span><span class="cx">
</span><del>- Ref<InspectorObject> reportObject = InspectorObject::create();
- reportObject->setObject("xss-report", WTF::move(reportDetails));
</del><ins>+ RefPtr<InspectorObject> reportObject = InspectorObject::create();
+ reportObject->setObject("xss-report", reportDetails.release());
</ins><span class="cx">
</span><span class="cx"> return FormData::create(reportObject->toJSONString().utf8().data());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorCommandLineAPIHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CommandLineAPIHost::inspectImpl(RefPtr<InspectorValue>&& object, RefPtr<InspectorValue>&& hints)
</del><ins>+void CommandLineAPIHost::inspectImpl(PassRefPtr<InspectorValue> object, PassRefPtr<InspectorValue> hints)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_inspectorAgent)
</span><span class="cx"> return;
</span><span class="lines">@@ -101,8 +101,8 @@
</span><span class="cx"> if (!hints->asObject(hintsObject))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto remoteObject = BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(WTF::move(object));
- m_inspectorAgent->inspect(WTF::move(remoteObject), WTF::move(hintsObject));
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::RemoteObject> remoteObject = BindingTraits<Inspector::Protocol::Runtime::RemoteObject>::runtimeCast(object);
+ m_inspectorAgent->inspect(remoteObject.release(), hintsObject.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CommandLineAPIHost::getEventListenersImpl(Node* node, Vector<EventListenerInfo>& listenersArray)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorCommandLineAPIHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/CommandLineAPIHost.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/CommandLineAPIHost.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/CommandLineAPIHost.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> void addInspectedObject(std::unique_ptr<InspectableObject>);
</span><span class="cx"> void clearInspectedObjects();
</span><span class="cx"> InspectableObject* inspectedObject(unsigned index);
</span><del>- void inspectImpl(RefPtr<Inspector::InspectorValue>&& objectToInspect, RefPtr<Inspector::InspectorValue>&& hints);
</del><ins>+ void inspectImpl(PassRefPtr<Inspector::InspectorValue> objectToInspect, PassRefPtr<Inspector::InspectorValue> hints);
</ins><span class="cx">
</span><span class="cx"> void getEventListenersImpl(Node*, Vector<EventListenerInfo>& listenersArray);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -108,12 +108,11 @@
</span><span class="cx"> ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
</span><span class="cx"> String manifestURL = info.m_manifest.string();
</span><span class="cx"> if (!manifestURL.isEmpty()) {
</span><del>- Ref<Inspector::Protocol::ApplicationCache::FrameWithManifest> value = Inspector::Protocol::ApplicationCache::FrameWithManifest::create()
</del><ins>+ RefPtr<Inspector::Protocol::ApplicationCache::FrameWithManifest> value = Inspector::Protocol::ApplicationCache::FrameWithManifest::create()
</ins><span class="cx"> .setFrameId(m_pageAgent->frameId(frame))
</span><span class="cx"> .setManifestURL(manifestURL)
</span><del>- .setStatus(static_cast<int>(host->status()))
- .release();
- result->addItem(WTF::move(value));
</del><ins>+ .setStatus(static_cast<int>(host->status()));
+ result->addItem(value);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -152,7 +151,7 @@
</span><span class="cx"> applicationCache = buildObjectForApplicationCache(resources, info);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
</del><ins>+PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
</ins><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::ApplicationCache::ApplicationCache::create()
</span><span class="cx"> .setManifestURL(applicationCacheInfo.m_manifest.string())
</span><span class="lines">@@ -163,17 +162,17 @@
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
</ins><span class="cx"> {
</span><del>- auto resources = Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> resources = Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>::create();
</ins><span class="cx">
</span><span class="cx"> for (const auto& resourceInfo : applicationCacheResources)
</span><span class="cx"> resources->addItem(buildObjectForApplicationCacheResource(resourceInfo));
</span><span class="cx">
</span><del>- return WTF::move(resources);
</del><ins>+ return resources;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
</del><ins>+PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder types;
</span><span class="cx">
</span><span class="lines">@@ -192,11 +191,11 @@
</span><span class="cx"> if (resourceInfo.m_isExplicit)
</span><span class="cx"> types.appendLiteral("Explicit ");
</span><span class="cx">
</span><del>- return Inspector::Protocol::ApplicationCache::ApplicationCacheResource::create()
</del><ins>+ RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> value = Inspector::Protocol::ApplicationCache::ApplicationCacheResource::create()
</ins><span class="cx"> .setUrl(resourceInfo.m_resource.string())
</span><span class="cx"> .setSize(static_cast<int>(resourceInfo.m_size))
</span><del>- .setType(types.toString())
- .release();
</del><ins>+ .setType(types.toString());
+ return value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -67,9 +67,9 @@
</span><span class="cx"> virtual void getApplicationCacheForFrame(ErrorString&, const String& frameId, RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache>&) override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Ref<Inspector::Protocol::ApplicationCache::ApplicationCache> buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
- Ref<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList&);
- Ref<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
</del><ins>+ PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache> buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList&);
+ PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
</ins><span class="cx">
</span><span class="cx"> DocumentLoader* assertFrameWithDocumentLoader(ErrorString&, String frameId);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -612,42 +612,40 @@
</span><span class="cx">
</span><span class="cx"> // Pseudo elements.
</span><span class="cx"> if (!includePseudo || *includePseudo) {
</span><del>- auto pseudoElements = Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>> pseudoElements = Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>::create();
</ins><span class="cx"> for (PseudoId pseudoId = FIRST_PUBLIC_PSEUDOID; pseudoId < AFTER_LAST_INTERNAL_PSEUDOID; pseudoId = static_cast<PseudoId>(pseudoId + 1)) {
</span><span class="cx"> auto matchedRules = styleResolver.pseudoStyleRulesForElement(element, pseudoId, StyleResolver::AllCSSRules);
</span><span class="cx"> if (!matchedRules.isEmpty()) {
</span><del>- auto matches = Inspector::Protocol::CSS::PseudoIdMatches::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::PseudoIdMatches> matches = Inspector::Protocol::CSS::PseudoIdMatches::create()
</ins><span class="cx"> .setPseudoId(static_cast<int>(pseudoId))
</span><del>- .setMatches(buildArrayForMatchedRuleList(matchedRules, styleResolver, element))
- .release();
- pseudoElements->addItem(WTF::move(matches));
</del><ins>+ .setMatches(buildArrayForMatchedRuleList(matchedRules, styleResolver, element));
+ pseudoElements->addItem(matches.release());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- pseudoIdMatches = WTF::move(pseudoElements);
</del><ins>+ pseudoIdMatches = pseudoElements.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Inherited styles.
</span><span class="cx"> if (!includeInherited || *includeInherited) {
</span><del>- auto entries = Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>> entries = Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>::create();
</ins><span class="cx"> Element* parentElement = element->parentElement();
</span><span class="cx"> while (parentElement) {
</span><span class="cx"> StyleResolver& parentStyleResolver = parentElement->document().ensureStyleResolver();
</span><span class="cx"> auto parentMatchedRules = parentStyleResolver.styleRulesForElement(parentElement, StyleResolver::AllCSSRules);
</span><del>- auto entry = Inspector::Protocol::CSS::InheritedStyleEntry::create()
- .setMatchedCSSRules(buildArrayForMatchedRuleList(parentMatchedRules, styleResolver, parentElement))
- .release();
</del><ins>+ RefPtr<Inspector::Protocol::CSS::InheritedStyleEntry> entry = Inspector::Protocol::CSS::InheritedStyleEntry::create()
+ .setMatchedCSSRules(buildArrayForMatchedRuleList(parentMatchedRules, styleResolver, parentElement));
</ins><span class="cx"> if (parentElement->style() && parentElement->style()->length()) {
</span><span class="cx"> InspectorStyleSheetForInlineStyle* styleSheet = asInspectorStyleSheet(parentElement);
</span><span class="cx"> if (styleSheet)
</span><span class="cx"> entry->setInlineStyle(styleSheet->buildObjectForStyle(styleSheet->styleForId(InspectorCSSId(styleSheet->id(), 0))));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- entries->addItem(WTF::move(entry));
</del><ins>+ entries->addItem(entry.release());
</ins><span class="cx"> parentElement = parentElement->parentElement();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inheritedEntries = WTF::move(entries);
</del><ins>+ inheritedEntries = entries.release();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -673,7 +671,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSComputedStyleDeclaration> computedStyleInfo = CSSComputedStyleDeclaration::create(element, true);
</span><del>- Ref<InspectorStyle> inspectorStyle = InspectorStyle::create(InspectorCSSId(), computedStyleInfo, nullptr);
</del><ins>+ RefPtr<InspectorStyle> inspectorStyle = InspectorStyle::create(InspectorCSSId(), computedStyleInfo, nullptr);
</ins><span class="cx"> style = inspectorStyle->buildArrayForComputedStyle();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -720,9 +718,9 @@
</span><span class="cx"> errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::setStyleText(ErrorString& errorString, const RefPtr<InspectorObject>&& fullStyleId, const String& text, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
</del><ins>+void InspectorCSSAgent::setStyleText(ErrorString& errorString, const RefPtr<InspectorObject>& fullStyleId, const String& text, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
</ins><span class="cx"> {
</span><del>- InspectorCSSId compoundId(fullStyleId.copyRef());
</del><ins>+ InspectorCSSId compoundId(fullStyleId);
</ins><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="cx">
</span><span class="cx"> InspectorStyleSheet* inspectorStyleSheet = assertStyleSheetForId(errorString, compoundId.styleSheetId());
</span><span class="lines">@@ -736,9 +734,9 @@
</span><span class="cx"> errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::setPropertyText(ErrorString& errorString, const RefPtr<InspectorObject>&& fullStyleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
</del><ins>+void InspectorCSSAgent::setPropertyText(ErrorString& errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
</ins><span class="cx"> {
</span><del>- InspectorCSSId compoundId(fullStyleId.copyRef());
</del><ins>+ InspectorCSSId compoundId(fullStyleId);
</ins><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="cx">
</span><span class="cx"> InspectorStyleSheet* inspectorStyleSheet = assertStyleSheetForId(errorString, compoundId.styleSheetId());
</span><span class="lines">@@ -752,9 +750,9 @@
</span><span class="cx"> errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::toggleProperty(ErrorString& errorString, const RefPtr<InspectorObject>&& fullStyleId, int propertyIndex, bool disable, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
</del><ins>+void InspectorCSSAgent::toggleProperty(ErrorString& errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, bool disable, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result)
</ins><span class="cx"> {
</span><del>- InspectorCSSId compoundId(fullStyleId.copyRef());
</del><ins>+ InspectorCSSId compoundId(fullStyleId);
</ins><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="cx">
</span><span class="cx"> InspectorStyleSheet* inspectorStyleSheet = assertStyleSheetForId(errorString, compoundId.styleSheetId());
</span><span class="lines">@@ -768,9 +766,9 @@
</span><span class="cx"> errorString = InspectorDOMAgent::toErrorString(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::setRuleSelector(ErrorString& errorString, const RefPtr<InspectorObject>&& fullRuleId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result)
</del><ins>+void InspectorCSSAgent::setRuleSelector(ErrorString& errorString, const RefPtr<InspectorObject>& fullRuleId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result)
</ins><span class="cx"> {
</span><del>- InspectorCSSId compoundId(fullRuleId.copyRef());
</del><ins>+ InspectorCSSId compoundId(fullRuleId);
</ins><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="cx">
</span><span class="cx"> InspectorStyleSheet* inspectorStyleSheet = assertStyleSheetForId(errorString, compoundId.styleSheetId());
</span><span class="lines">@@ -813,30 +811,29 @@
</span><span class="cx">
</span><span class="cx"> void InspectorCSSAgent::getSupportedCSSProperties(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>>& cssProperties)
</span><span class="cx"> {
</span><del>- auto properties = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>> properties = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>::create();
</ins><span class="cx"> for (int i = firstCSSProperty; i <= lastCSSProperty; ++i) {
</span><span class="cx"> CSSPropertyID id = convertToCSSPropertyID(i);
</span><del>- auto property = Inspector::Protocol::CSS::CSSPropertyInfo::create()
- .setName(getPropertyNameString(id))
- .release();
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSPropertyInfo> property = Inspector::Protocol::CSS::CSSPropertyInfo::create()
+ .setName(getPropertyNameString(id));
</ins><span class="cx">
</span><span class="cx"> const StylePropertyShorthand& shorthand = shorthandForProperty(id);
</span><span class="cx"> if (!shorthand.length()) {
</span><del>- properties->addItem(WTF::move(property));
</del><ins>+ properties->addItem(property.release());
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- auto longhands = Inspector::Protocol::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> longhands = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> for (unsigned j = 0; j < shorthand.length(); ++j) {
</span><span class="cx"> CSSPropertyID longhandID = shorthand.properties()[j];
</span><span class="cx"> longhands->addItem(getPropertyNameString(longhandID));
</span><span class="cx"> }
</span><del>- property->setLonghands(WTF::move(longhands));
- properties->addItem(WTF::move(property));
</del><ins>+ property->setLonghands(longhands.release());
+ properties->addItem(property.release());
</ins><span class="cx"> }
</span><del>- cssProperties = WTF::move(properties);
</del><ins>+ cssProperties = properties.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::forcePseudoState(ErrorString& errorString, int nodeId, const RefPtr<InspectorArray>&& forcedPseudoClasses)
</del><ins>+void InspectorCSSAgent::forcePseudoState(ErrorString& errorString, int nodeId, const RefPtr<InspectorArray>& forcedPseudoClasses)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = m_domAgent->assertElement(errorString, nodeId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -865,12 +862,12 @@
</span><span class="cx"> m_namedFlowCollectionsRequested.add(documentNodeId);
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<WebKitNamedFlow>> namedFlowsVector = document->namedFlows().namedFlows();
</span><del>- auto namedFlows = Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>> namedFlows = Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>::create();
</ins><span class="cx">
</span><span class="cx"> for (Vector<RefPtr<WebKitNamedFlow>>::iterator it = namedFlowsVector.begin(); it != namedFlowsVector.end(); ++it)
</span><span class="cx"> namedFlows->addItem(buildObjectForNamedFlow(errorString, it->get(), documentNodeId));
</span><span class="cx">
</span><del>- result = WTF::move(namedFlows);
</del><ins>+ result = namedFlows.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorStyleSheetForInlineStyle* InspectorCSSAgent::asInspectorStyleSheet(Element* element)
</span><span class="lines">@@ -1003,7 +1000,7 @@
</span><span class="cx">
</span><span class="cx"> Inspector::Protocol::CSS::StyleSheetOrigin InspectorCSSAgent::detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument)
</span><span class="cx"> {
</span><del>- auto origin = Inspector::Protocol::CSS::StyleSheetOrigin::Regular;
</del><ins>+ Inspector::Protocol::CSS::StyleSheetOrigin origin = Inspector::Protocol::CSS::StyleSheetOrigin::Regular;
</ins><span class="cx"> if (pageStyleSheet && !pageStyleSheet->ownerNode() && pageStyleSheet->href().isEmpty())
</span><span class="cx"> origin = Inspector::Protocol::CSS::StyleSheetOrigin::UserAgent;
</span><span class="cx"> else if (pageStyleSheet && pageStyleSheet->ownerNode() && pageStyleSheet->ownerNode()->nodeName() == "#document")
</span><span class="lines">@@ -1016,7 +1013,7 @@
</span><span class="cx"> return origin;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(StyleRule* styleRule, StyleResolver& styleResolver)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(StyleRule* styleRule, StyleResolver& styleResolver)
</ins><span class="cx"> {
</span><span class="cx"> if (!styleRule)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1030,7 +1027,7 @@
</span><span class="cx"> return inspectorStyleSheet ? inspectorStyleSheet->buildObjectForRule(cssomWrapper) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(CSSStyleRule* rule)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSRule> InspectorCSSAgent::buildObjectForRule(CSSStyleRule* rule)
</ins><span class="cx"> {
</span><span class="cx"> if (!rule)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1040,9 +1037,9 @@
</span><span class="cx"> return inspectorStyleSheet ? inspectorStyleSheet->buildObjectForRule(rule) : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> InspectorCSSAgent::buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>& matchedRules, StyleResolver& styleResolver, Element* element)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> InspectorCSSAgent::buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>& matchedRules, StyleResolver& styleResolver, Element* element)
</ins><span class="cx"> {
</span><del>- auto result = Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> result = Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>::create();
</ins><span class="cx">
</span><span class="cx"> SelectorChecker::CheckingContext context(SelectorChecker::Mode::CollectingRules);
</span><span class="cx"> SelectorChecker selectorChecker(element->document());
</span><span class="lines">@@ -1052,7 +1049,7 @@
</span><span class="cx"> if (!ruleObject)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- auto matchingSelectors = Inspector::Protocol::Array<int>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<int>> matchingSelectors = Inspector::Protocol::Array<int>::create();
</ins><span class="cx"> const CSSSelectorList& selectorList = matchedRule->selectorList();
</span><span class="cx"> long index = 0;
</span><span class="cx"> for (const CSSSelector* selector = selectorList.first(); selector; selector = CSSSelectorList::next(selector)) {
</span><span class="lines">@@ -1063,17 +1060,16 @@
</span><span class="cx"> ++index;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto match = Inspector::Protocol::CSS::RuleMatch::create()
- .setRule(WTF::move(ruleObject))
- .setMatchingSelectors(WTF::move(matchingSelectors))
- .release();
- result->addItem(WTF::move(match));
</del><ins>+ RefPtr<Inspector::Protocol::CSS::RuleMatch> match = Inspector::Protocol::CSS::RuleMatch::create()
+ .setRule(ruleObject.release())
+ .setMatchingSelectors(matchingSelectors.release());
+ result->addItem(match.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorCSSAgent::buildObjectForAttributesStyle(Element* element)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorCSSAgent::buildObjectForAttributesStyle(Element* element)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(element);
</span><span class="cx"> if (!is<StyledElement>(*element))
</span><span class="lines">@@ -1087,13 +1083,13 @@
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(attributeStyle->isMutable());
</span><span class="cx"> MutableStyleProperties* mutableAttributeStyle = static_cast<MutableStyleProperties*>(attributeStyle);
</span><span class="cx">
</span><del>- Ref<InspectorStyle> inspectorStyle = InspectorStyle::create(InspectorCSSId(), mutableAttributeStyle->ensureCSSStyleDeclaration(), nullptr);
</del><ins>+ RefPtr<InspectorStyle> inspectorStyle = InspectorStyle::create(InspectorCSSId(), mutableAttributeStyle->ensureCSSStyleDeclaration(), nullptr);
</ins><span class="cx"> return inspectorStyle->buildObjectForStyle();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> InspectorCSSAgent::buildArrayForRegions(ErrorString& errorString, RefPtr<NodeList>&& regionList, int documentNodeId)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> InspectorCSSAgent::buildArrayForRegions(ErrorString& errorString, PassRefPtr<NodeList> regionList, int documentNodeId)
</ins><span class="cx"> {
</span><del>- auto regions = Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> regions = Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>::create();
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < regionList->length(); ++i) {
</span><span class="cx"> Inspector::Protocol::CSS::Region::RegionOverset regionOverset;
</span><span class="lines">@@ -1115,22 +1111,21 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto region = Inspector::Protocol::CSS::Region::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::Region> region = Inspector::Protocol::CSS::Region::create()
</ins><span class="cx"> .setRegionOverset(regionOverset)
</span><span class="cx"> // documentNodeId was previously asserted
</span><del>- .setNodeId(m_domAgent->pushNodeToFrontend(errorString, documentNodeId, regionList->item(i)))
- .release();
</del><ins>+ .setNodeId(m_domAgent->pushNodeToFrontend(errorString, documentNodeId, regionList->item(i)));
</ins><span class="cx">
</span><del>- regions->addItem(WTF::move(region));
</del><ins>+ regions->addItem(region.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(regions);
</del><ins>+ return regions.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::CSS::NamedFlow> InspectorCSSAgent::buildObjectForNamedFlow(ErrorString& errorString, WebKitNamedFlow* webkitNamedFlow, int documentNodeId)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::NamedFlow> InspectorCSSAgent::buildObjectForNamedFlow(ErrorString& errorString, WebKitNamedFlow* webkitNamedFlow, int documentNodeId)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<NodeList> contentList = webkitNamedFlow->getContent();
</span><del>- auto content = Inspector::Protocol::Array<int>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<int>> content = Inspector::Protocol::Array<int>::create();
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < contentList->length(); ++i) {
</span><span class="cx"> // documentNodeId was previously asserted
</span><span class="lines">@@ -1141,7 +1136,7 @@
</span><span class="cx"> .setDocumentNodeId(documentNodeId)
</span><span class="cx"> .setName(webkitNamedFlow->name().string())
</span><span class="cx"> .setOverset(webkitNamedFlow->overset())
</span><del>- .setContent(WTF::move(content))
</del><ins>+ .setContent(content.release())
</ins><span class="cx"> .setRegions(buildArrayForRegions(errorString, webkitNamedFlow->getRegions(), documentNodeId))
</span><span class="cx"> .release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -117,13 +118,13 @@
</span><span class="cx"> virtual void getStyleSheet(ErrorString&, const String& styleSheetId, RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody>& result) override;
</span><span class="cx"> virtual void getStyleSheetText(ErrorString&, const String& styleSheetId, String* result) override;
</span><span class="cx"> virtual void setStyleSheetText(ErrorString&, const String& styleSheetId, const String& text) override;
</span><del>- virtual void setStyleText(ErrorString&, const RefPtr<Inspector::InspectorObject>&& styleId, const String& text, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
- virtual void setPropertyText(ErrorString&, const RefPtr<Inspector::InspectorObject>&& styleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
- virtual void toggleProperty(ErrorString&, const RefPtr<Inspector::InspectorObject>&& styleId, int propertyIndex, bool disable, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
- virtual void setRuleSelector(ErrorString&, const RefPtr<Inspector::InspectorObject>&& ruleId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result) override;
</del><ins>+ virtual void setStyleText(ErrorString&, const RefPtr<Inspector::InspectorObject>& styleId, const String& text, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
+ virtual void setPropertyText(ErrorString&, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
+ virtual void toggleProperty(ErrorString&, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, bool disable, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
+ virtual void setRuleSelector(ErrorString&, const RefPtr<Inspector::InspectorObject>& ruleId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result) override;
</ins><span class="cx"> virtual void addRule(ErrorString&, int contextNodeId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result) override;
</span><span class="cx"> virtual void getSupportedCSSProperties(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>>& result) override;
</span><del>- virtual void forcePseudoState(ErrorString&, int nodeId, const RefPtr<Inspector::InspectorArray>&& forcedPseudoClasses) override;
</del><ins>+ virtual void forcePseudoState(ErrorString&, int nodeId, const RefPtr<Inspector::InspectorArray>& forcedPseudoClasses) override;
</ins><span class="cx"> virtual void getNamedFlowCollection(ErrorString&, int documentNodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>>& result) override;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -152,12 +153,12 @@
</span><span class="cx"> InspectorStyleSheet* assertStyleSheetForId(ErrorString&, const String&);
</span><span class="cx"> Inspector::Protocol::CSS::StyleSheetOrigin detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument);
</span><span class="cx">
</span><del>- RefPtr<Inspector::Protocol::CSS::CSSRule> buildObjectForRule(StyleRule*, StyleResolver&);
- RefPtr<Inspector::Protocol::CSS::CSSRule> buildObjectForRule(CSSStyleRule*);
- RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>&, StyleResolver&, Element*);
- RefPtr<Inspector::Protocol::CSS::CSSStyle> buildObjectForAttributesStyle(Element*);
- RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> buildArrayForRegions(ErrorString&, RefPtr<NodeList>&&, int documentNodeId);
- RefPtr<Inspector::Protocol::CSS::NamedFlow> buildObjectForNamedFlow(ErrorString&, WebKitNamedFlow*, int documentNodeId);
</del><ins>+ PassRefPtr<Inspector::Protocol::CSS::CSSRule> buildObjectForRule(StyleRule*, StyleResolver&);
+ PassRefPtr<Inspector::Protocol::CSS::CSSRule> buildObjectForRule(CSSStyleRule*);
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>&, StyleResolver&, Element*);
+ PassRefPtr<Inspector::Protocol::CSS::CSSStyle> buildObjectForAttributesStyle(Element*);
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> buildArrayForRegions(ErrorString&, PassRefPtr<NodeList>, int documentNodeId);
+ PassRefPtr<Inspector::Protocol::CSS::NamedFlow> buildObjectForNamedFlow(ErrorString&, WebKitNamedFlow*, int documentNodeId);
</ins><span class="cx">
</span><span class="cx"> // InspectorDOMAgent::DOMListener implementation
</span><span class="cx"> virtual void didRemoveDocument(Document*) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -35,14 +35,15 @@
</span><span class="cx"> #include "ScriptProfile.h"
</span><span class="cx"> #include <inspector/ScriptArguments.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::addMessageToConsole(Page& page, MessageSource source, MessageType type, MessageLevel level, const String& message, RefPtr<Inspector::ScriptCallStack>&& callStack, unsigned long requestIdentifier)
</del><ins>+inline void InspectorInstrumentation::addMessageToConsole(Page& page, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<Inspector::ScriptCallStack> callStack, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><del>- addMessageToConsoleImpl(*instrumentingAgents, source, type, level, message, WTF::move(callStack), requestIdentifier);
</del><ins>+ addMessageToConsoleImpl(*instrumentingAgents, source, type, level, message, callStack, requestIdentifier);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> UNUSED_PARAM(source);
</span><span class="lines">@@ -54,11 +55,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::addMessageToConsole(Page& page, MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, RefPtr<Inspector::ScriptArguments>&& arguments, unsigned long requestIdentifier)
</del><ins>+inline void InspectorInstrumentation::addMessageToConsole(Page& page, MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, PassRefPtr<Inspector::ScriptArguments> arguments, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><del>- addMessageToConsoleImpl(*instrumentingAgents, source, type, level, message, state, WTF::move(arguments), requestIdentifier);
</del><ins>+ addMessageToConsoleImpl(*instrumentingAgents, source, type, level, message, state, arguments, requestIdentifier);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> UNUSED_PARAM(source);
</span><span class="lines">@@ -90,11 +91,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::addMessageToConsole(WorkerGlobalScope* workerGlobalScope, MessageSource source, MessageType type, MessageLevel level, const String& message, RefPtr<Inspector::ScriptCallStack>&& callStack, unsigned long requestIdentifier)
</del><ins>+inline void InspectorInstrumentation::addMessageToConsole(WorkerGlobalScope* workerGlobalScope, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<Inspector::ScriptCallStack> callStack, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForWorkerGlobalScope(workerGlobalScope))
</span><del>- addMessageToConsoleImpl(*instrumentingAgents, source, type, level, message, WTF::move(callStack), requestIdentifier);
</del><ins>+ addMessageToConsoleImpl(*instrumentingAgents, source, type, level, message, callStack, requestIdentifier);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(workerGlobalScope);
</span><span class="cx"> UNUSED_PARAM(source);
</span><span class="lines">@@ -125,11 +126,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::consoleCount(Page& page, JSC::ExecState* state, RefPtr<Inspector::ScriptArguments>&& arguments)
</del><ins>+inline void InspectorInstrumentation::consoleCount(Page& page, JSC::ExecState* state, PassRefPtr<Inspector::ScriptArguments> arguments)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><del>- consoleCountImpl(*instrumentingAgents, state, WTF::move(arguments));
</del><ins>+ consoleCountImpl(*instrumentingAgents, state, arguments);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="lines">@@ -148,11 +149,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::stopConsoleTiming(Frame& frame, const String& title, RefPtr<Inspector::ScriptCallStack>&& stack)
</del><ins>+inline void InspectorInstrumentation::stopConsoleTiming(Frame& frame, const String& title, PassRefPtr<Inspector::ScriptCallStack> stack)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
</span><del>- stopConsoleTimingImpl(*instrumentingAgents, frame, title, WTF::move(stack));
</del><ins>+ stopConsoleTimingImpl(*instrumentingAgents, frame, title, stack);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(frame);
</span><span class="cx"> UNUSED_PARAM(title);
</span><span class="lines">@@ -160,12 +161,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::consoleTimeStamp(Frame& frame, RefPtr<Inspector::ScriptArguments>&& arguments)
</del><ins>+inline void InspectorInstrumentation::consoleTimeStamp(Frame& frame, PassRefPtr<Inspector::ScriptArguments> arguments)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
</span><del>- consoleTimeStampImpl(*instrumentingAgents, frame, WTF::move(arguments));
</del><ins>+ consoleTimeStampImpl(*instrumentingAgents, frame, arguments);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(frame);
</span><span class="cx"> UNUSED_PARAM(arguments);
</span><span class="lines">@@ -184,7 +185,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline RefPtr<JSC::Profile> InspectorInstrumentation::stopProfiling(Page& page, JSC::ExecState* exec, const String &title)
</del><ins>+inline PassRefPtr<JSC::Profile> InspectorInstrumentation::stopProfiling(Page& page, JSC::ExecState* exec, const String &title)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> m_overlay->getHighlight(highlight, coordinateSystem);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorObject> InspectorController::buildObjectForHighlightedNode() const
</del><ins>+PassRefPtr<InspectorObject> InspectorController::buildObjectForHighlightedNode() const
</ins><span class="cx"> {
</span><span class="cx"> return m_overlay->buildObjectForHighlightedNode();
</span><span class="cx"> }
</span><span class="lines">@@ -454,9 +454,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Stopwatch> InspectorController::executionStopwatch()
</del><ins>+PassRefPtr<Stopwatch> InspectorController::executionStopwatch()
</ins><span class="cx"> {
</span><del>- return m_executionStopwatch.copyRef();
</del><ins>+ return m_executionStopwatch;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> void setIndicating(bool);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT RefPtr<Inspector::InspectorObject> buildObjectForHighlightedNode() const;
</del><ins>+ WEBCORE_EXPORT PassRefPtr<Inspector::InspectorObject> buildObjectForHighlightedNode() const;
</ins><span class="cx">
</span><span class="cx"> bool isUnderTest() const { return m_isUnderTest; }
</span><span class="cx"> void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; }
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> virtual void willCallInjectedScriptFunction(JSC::ExecState*, const String& scriptName, int scriptLine) override;
</span><span class="cx"> virtual void didCallInjectedScriptFunction(JSC::ExecState*) override;
</span><span class="cx"> virtual void frontendInitialized() override;
</span><del>- virtual Ref<WTF::Stopwatch> executionStopwatch() override;
</del><ins>+ virtual PassRefPtr<WTF::Stopwatch> executionStopwatch() override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class InspectorInstrumentation;
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Inspector::InspectorBackendDispatcher> m_inspectorBackendDispatcher;
</span><span class="cx"> Inspector::InspectorFrontendChannel* m_inspectorFrontendChannel;
</span><del>- Ref<WTF::Stopwatch> m_executionStopwatch;
</del><ins>+ RefPtr<WTF::Stopwatch> m_executionStopwatch;
</ins><span class="cx"> Page& m_page;
</span><span class="cx"> InspectorClient* m_inspectorClient;
</span><span class="cx"> InspectorFrontendClient* m_inspectorFrontendClient;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> static const size_t maxTextSize = 10000;
</span><span class="cx"> static const UChar ellipsisUChar[] = { 0x2026, 0 };
</span><span class="cx">
</span><del>-static Color parseColor(const RefPtr<InspectorObject>&& colorObject)
</del><ins>+static Color parseColor(const PassRefPtr<InspectorObject> colorObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!colorObject)
</span><span class="cx"> return Color::transparent;
</span><span class="lines">@@ -132,9 +132,8 @@
</span><span class="cx">
</span><span class="cx"> static Color parseConfigColor(const String& fieldName, InspectorObject* configObject)
</span><span class="cx"> {
</span><del>- RefPtr<InspectorObject> colorObject;
- configObject->getObject(fieldName, colorObject);
- return parseColor(WTF::move(colorObject));
</del><ins>+ const RefPtr<InspectorObject> colorObject = configObject->getObject(fieldName);
+ return parseColor(colorObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool parseQuad(const RefPtr<InspectorArray>& quadArray, FloatQuad* quad)
</span><span class="lines">@@ -580,9 +579,9 @@
</span><span class="cx"> auto newMap = std::make_unique<NodeToIdMap>();
</span><span class="cx"> danglingMap = newMap.get();
</span><span class="cx"> m_danglingNodeToIdMaps.append(newMap.release());
</span><del>- auto children = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
</ins><span class="cx"> children->addItem(buildObjectForNode(node, 0, danglingMap));
</span><del>- m_frontendDispatcher->setChildNodes(0, WTF::move(children));
</del><ins>+ m_frontendDispatcher->setChildNodes(0, children);
</ins><span class="cx"> break;
</span><span class="cx"> } else {
</span><span class="cx"> path.append(parent);
</span><span class="lines">@@ -877,14 +876,15 @@
</span><span class="cx"> axProperties = buildObjectForAccessibilityProperties(node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::performSearch(ErrorString& errorString, const String& whitespaceTrimmedQuery, const RefPtr<InspectorArray>&& nodeIds, String* searchId, int* resultCount)
</del><ins>+void InspectorDOMAgent::performSearch(ErrorString& errorString, const String& whitespaceTrimmedQuery, const RefPtr<InspectorArray>* nodeIds, String* searchId, int* resultCount)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Search works with node granularity - number of matches within node is not calculated.
</span><span class="cx"> InspectorNodeFinder finder(whitespaceTrimmedQuery);
</span><span class="cx">
</span><span class="cx"> if (nodeIds) {
</span><del>- for (unsigned i = 0; i < nodeIds->length(); ++i) {
- RefPtr<InspectorValue> nodeValue = nodeIds->get(i);
</del><ins>+ const RefPtr<InspectorArray>& nodeIdsRef = *nodeIds;
+ for (unsigned i = 0; i < nodeIdsRef->length(); ++i) {
+ RefPtr<InspectorValue> nodeValue = nodeIdsRef->get(i);
</ins><span class="cx"> if (!nodeValue) {
</span><span class="cx"> errorString = ASCIILiteral("Invalid nodeIds item.");
</span><span class="cx"> return;
</span><span class="lines">@@ -1046,37 +1046,37 @@
</span><span class="cx"> return highlightConfig;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::setInspectModeEnabled(ErrorString& errorString, bool enabled, const RefPtr<InspectorObject>&& highlightConfig)
</del><ins>+void InspectorDOMAgent::setInspectModeEnabled(ErrorString& errorString, bool enabled, const RefPtr<InspectorObject>* highlightConfig)
</ins><span class="cx"> {
</span><del>- setSearchingForNode(errorString, enabled, highlightConfig ? highlightConfig.get() : nullptr);
</del><ins>+ setSearchingForNode(errorString, enabled, highlightConfig ? highlightConfig->get() : 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::highlightRect(ErrorString&, int x, int y, int width, int height, const RefPtr<InspectorObject>&& color, const RefPtr<InspectorObject>&& outlineColor, const bool* usePageCoordinates)
</del><ins>+void InspectorDOMAgent::highlightRect(ErrorString&, int x, int y, int width, int height, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates)
</ins><span class="cx"> {
</span><span class="cx"> auto quad = std::make_unique<FloatQuad>(FloatRect(x, y, width, height));
</span><del>- innerHighlightQuad(WTF::move(quad), color.copyRef(), outlineColor.copyRef(), usePageCoordinates);
</del><ins>+ innerHighlightQuad(WTF::move(quad), color, outlineColor, usePageCoordinates);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::highlightQuad(ErrorString& errorString, const RefPtr<InspectorArray>&& quadArray, const RefPtr<InspectorObject>&& color, const RefPtr<InspectorObject>&& outlineColor, const bool* usePageCoordinates)
</del><ins>+void InspectorDOMAgent::highlightQuad(ErrorString& errorString, const RefPtr<InspectorArray>& quadArray, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates)
</ins><span class="cx"> {
</span><span class="cx"> auto quad = std::make_unique<FloatQuad>();
</span><span class="cx"> if (!parseQuad(quadArray, quad.get())) {
</span><span class="cx"> errorString = ASCIILiteral("Invalid Quad format");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- innerHighlightQuad(WTF::move(quad), color.copyRef(), outlineColor.copyRef(), usePageCoordinates);
</del><ins>+ innerHighlightQuad(WTF::move(quad), color, outlineColor, usePageCoordinates);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::innerHighlightQuad(std::unique_ptr<FloatQuad> quad, const RefPtr<InspectorObject>&& color, const RefPtr<InspectorObject>&& outlineColor, const bool* usePageCoordinates)
</del><ins>+void InspectorDOMAgent::innerHighlightQuad(std::unique_ptr<FloatQuad> quad, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates)
</ins><span class="cx"> {
</span><span class="cx"> auto highlightConfig = std::make_unique<HighlightConfig>();
</span><del>- highlightConfig->content = parseColor(color.copyRef());
- highlightConfig->contentOutline = parseColor(outlineColor.copyRef());
</del><ins>+ highlightConfig->content = parseColor(*color);
+ highlightConfig->contentOutline = parseColor(*outlineColor);
</ins><span class="cx"> highlightConfig->usePageCoordinates = usePageCoordinates ? *usePageCoordinates : false;
</span><span class="cx"> m_overlay->highlightQuad(WTF::move(quad), *highlightConfig);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::highlightNode(ErrorString& errorString, const RefPtr<InspectorObject>&& highlightInspectorObject, const int* nodeId, const String* objectId)
</del><ins>+void InspectorDOMAgent::highlightNode(ErrorString& errorString, const RefPtr<InspectorObject>& highlightInspectorObject, const int* nodeId, const String* objectId)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = 0;
</span><span class="cx"> if (nodeId) {
</span><span class="lines">@@ -1098,14 +1098,14 @@
</span><span class="cx"> m_overlay->highlightNode(node, *highlightConfig);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::highlightFrame(ErrorString&, const String& frameId, const RefPtr<InspectorObject>&& color, const RefPtr<InspectorObject>&& outlineColor)
</del><ins>+void InspectorDOMAgent::highlightFrame(ErrorString&, const String& frameId, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = m_pageAgent->frameForId(frameId);
</span><span class="cx"> if (frame && frame->ownerElement()) {
</span><span class="cx"> auto highlightConfig = std::make_unique<HighlightConfig>();
</span><span class="cx"> highlightConfig->showInfo = true; // Always show tooltips for frames.
</span><del>- highlightConfig->content = parseColor(color.copyRef());
- highlightConfig->contentOutline = parseColor(outlineColor.copyRef());
</del><ins>+ highlightConfig->content = parseColor(*color);
+ highlightConfig->contentOutline = parseColor(*outlineColor);
</ins><span class="cx"> m_overlay->highlightNode(frame->ownerElement(), *highlightConfig);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1220,7 +1220,7 @@
</span><span class="cx"> return document->completeURL("").string();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* node, int depth, NodeToIdMap* nodesMap)
</del><ins>+PassRefPtr<Inspector::Protocol::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* node, int depth, NodeToIdMap* nodesMap)
</ins><span class="cx"> {
</span><span class="cx"> int id = bind(node, nodesMap);
</span><span class="cx"> String nodeName;
</span><span class="lines">@@ -1253,20 +1253,19 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto value = Inspector::Protocol::DOM::Node::create()
</del><ins>+ RefPtr<Inspector::Protocol::DOM::Node> value = Inspector::Protocol::DOM::Node::create()
</ins><span class="cx"> .setNodeId(id)
</span><span class="cx"> .setNodeType(static_cast<int>(node->nodeType()))
</span><span class="cx"> .setNodeName(nodeName)
</span><span class="cx"> .setLocalName(localName)
</span><del>- .setNodeValue(nodeValue)
- .release();
</del><ins>+ .setNodeValue(nodeValue);
</ins><span class="cx">
</span><span class="cx"> if (node->isContainerNode()) {
</span><span class="cx"> int nodeCount = innerChildNodeCount(node);
</span><span class="cx"> value->setChildNodeCount(nodeCount);
</span><del>- Ref<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodesMap);
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodesMap);
</ins><span class="cx"> if (children->length() > 0)
</span><del>- value->setChildren(WTF::move(children));
</del><ins>+ value->setChildren(children.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (is<Element>(*node)) {
</span><span class="lines">@@ -1283,9 +1282,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (ShadowRoot* root = element.shadowRoot()) {
</span><del>- auto shadowRoots = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> shadowRoots = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
</ins><span class="cx"> shadowRoots->addItem(buildObjectForNode(root, 0, nodesMap));
</span><del>- value->setShadowRoots(WTF::move(shadowRoots));
</del><ins>+ value->setShadowRoots(shadowRoots);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEMPLATE_ELEMENT)
</span><span class="lines">@@ -1318,26 +1317,26 @@
</span><span class="cx"> value->setRole(axObject->computedRoleString());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(value);
</del><ins>+ return value.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::Array<String>> InspectorDOMAgent::buildArrayForElementAttributes(Element* element)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<String>> InspectorDOMAgent::buildArrayForElementAttributes(Element* element)
</ins><span class="cx"> {
</span><del>- auto attributesValue = Inspector::Protocol::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> attributesValue = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> // Go through all attributes and serialize them.
</span><span class="cx"> if (!element->hasAttributes())
</span><del>- return WTF::move(attributesValue);
</del><ins>+ return attributesValue.release();
</ins><span class="cx"> for (const Attribute& attribute : element->attributesIterator()) {
</span><span class="cx"> // Add attribute pair
</span><span class="cx"> attributesValue->addItem(attribute.name().toString());
</span><span class="cx"> attributesValue->addItem(attribute.value());
</span><span class="cx"> }
</span><del>- return WTF::move(attributesValue);
</del><ins>+ return attributesValue.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> InspectorDOMAgent::buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> InspectorDOMAgent::buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap)
</ins><span class="cx"> {
</span><del>- auto children = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> children = Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>::create();
</ins><span class="cx"> if (depth == 0) {
</span><span class="cx"> // Special-case the only text child - pretend that container's children have been requested.
</span><span class="cx"> Node* firstChild = container->firstChild();
</span><span class="lines">@@ -1345,7 +1344,7 @@
</span><span class="cx"> children->addItem(buildObjectForNode(firstChild, 0, nodesMap));
</span><span class="cx"> m_childrenRequested.add(bind(container, nodesMap));
</span><span class="cx"> }
</span><del>- return WTF::move(children);
</del><ins>+ return children.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* child = innerFirstChild(container);
</span><span class="lines">@@ -1356,10 +1355,10 @@
</span><span class="cx"> children->addItem(buildObjectForNode(child, depth, nodesMap));
</span><span class="cx"> child = innerNextSibling(child);
</span><span class="cx"> }
</span><del>- return WTF::move(children);
</del><ins>+ return children.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::DOM::EventListener> InspectorDOMAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, const AtomicString& eventType, Node* node, const String* objectGroupId)
</del><ins>+PassRefPtr<Inspector::Protocol::DOM::EventListener> InspectorDOMAgent::buildObjectForEventListener(const RegisteredEventListener& registeredEventListener, const AtomicString& eventType, Node* node, const String* objectGroupId)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<EventListener> eventListener = registeredEventListener.listener;
</span><span class="cx">
</span><span class="lines">@@ -1387,31 +1386,29 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto value = Inspector::Protocol::DOM::EventListener::create()
</del><ins>+ RefPtr<Inspector::Protocol::DOM::EventListener> value = Inspector::Protocol::DOM::EventListener::create()
</ins><span class="cx"> .setType(eventType)
</span><span class="cx"> .setUseCapture(registeredEventListener.useCapture)
</span><span class="cx"> .setIsAttribute(eventListener->isAttribute())
</span><span class="cx"> .setNodeId(pushNodePathToFrontend(node))
</span><del>- .setHandlerBody(body)
- .release();
</del><ins>+ .setHandlerBody(body);
</ins><span class="cx"> if (objectGroupId && handler && state) {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(state);
</span><span class="cx"> if (!injectedScript.hasNoValue())
</span><span class="cx"> value->setHandler(injectedScript.wrapObject(Deprecated::ScriptValue(state->vm(), handler), *objectGroupId));
</span><span class="cx"> }
</span><span class="cx"> if (!scriptID.isNull()) {
</span><del>- auto location = Inspector::Protocol::Debugger::Location::create()
</del><ins>+ RefPtr<Inspector::Protocol::Debugger::Location> location = Inspector::Protocol::Debugger::Location::create()
</ins><span class="cx"> .setScriptId(scriptID)
</span><del>- .setLineNumber(lineNumber)
- .release();
- value->setLocation(WTF::move(location));
</del><ins>+ .setLineNumber(lineNumber);
+ value->setLocation(location.release());
</ins><span class="cx"> if (!sourceName.isEmpty())
</span><span class="cx"> value->setSourceName(sourceName);
</span><span class="cx"> }
</span><del>- return WTF::move(value);
</del><ins>+ return value.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::processAccessibilityChildren(RefPtr<AccessibilityObject>&& axObject, RefPtr<Inspector::Protocol::Array<int>>&& childNodeIds)
</del><ins>+void InspectorDOMAgent::processAccessibilityChildren(PassRefPtr<AccessibilityObject> axObject, RefPtr<Inspector::Protocol::Array<int>>& childNodeIds)
</ins><span class="cx"> {
</span><span class="cx"> const auto& children = axObject->children();
</span><span class="cx"> if (!children.size())
</span><span class="lines">@@ -1424,11 +1421,11 @@
</span><span class="cx"> if (Node* childNode = childObject->node())
</span><span class="cx"> childNodeIds->addItem(pushNodePathToFrontend(childNode));
</span><span class="cx"> else
</span><del>- processAccessibilityChildren(childObject.copyRef(), childNodeIds.copyRef());
</del><ins>+ processAccessibilityChildren(childObject, childNodeIds);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::DOM::AccessibilityProperties> InspectorDOMAgent::buildObjectForAccessibilityProperties(Node* node)
</del><ins>+PassRefPtr<Inspector::Protocol::DOM::AccessibilityProperties> InspectorDOMAgent::buildObjectForAccessibilityProperties(Node* node)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(node);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -1439,7 +1436,7 @@
</span><span class="cx">
</span><span class="cx"> Node* activeDescendantNode = nullptr;
</span><span class="cx"> bool busy = false;
</span><del>- auto checked = Inspector::Protocol::DOM::AccessibilityProperties::Checked::False;
</del><ins>+ Inspector::Protocol::DOM::AccessibilityProperties::Checked checked = Inspector::Protocol::DOM::AccessibilityProperties::Checked::False;
</ins><span class="cx"> RefPtr<Inspector::Protocol::Array<int>> childNodeIds;
</span><span class="cx"> RefPtr<Inspector::Protocol::Array<int>> controlledNodeIds;
</span><span class="cx"> bool exists = false;
</span><span class="lines">@@ -1449,12 +1446,12 @@
</span><span class="cx"> bool focused = false;
</span><span class="cx"> bool ignored = true;
</span><span class="cx"> bool ignoredByDefault = false;
</span><del>- auto invalid = Inspector::Protocol::DOM::AccessibilityProperties::Invalid::False;
</del><ins>+ Inspector::Protocol::DOM::AccessibilityProperties::Invalid invalid = Inspector::Protocol::DOM::AccessibilityProperties::Invalid::False;
</ins><span class="cx"> bool hidden = false;
</span><span class="cx"> String label;
</span><span class="cx"> bool liveRegionAtomic = false;
</span><span class="cx"> RefPtr<Inspector::Protocol::Array<String>> liveRegionRelevant;
</span><del>- auto liveRegionStatus = Inspector::Protocol::DOM::AccessibilityProperties::LiveRegionStatus::Off;
</del><ins>+ Inspector::Protocol::DOM::AccessibilityProperties::LiveRegionStatus liveRegionStatus = Inspector::Protocol::DOM::AccessibilityProperties::LiveRegionStatus::Off;
</ins><span class="cx"> Node* mouseEventNode = nullptr;
</span><span class="cx"> RefPtr<Inspector::Protocol::Array<int>> ownedNodeIds;
</span><span class="cx"> Node* parentNode = nullptr;
</span><span class="lines">@@ -1495,7 +1492,7 @@
</span><span class="cx"> checked = Inspector::Protocol::DOM::AccessibilityProperties::Checked::True;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- processAccessibilityChildren(axObject, WTF::move(childNodeIds));
</del><ins>+ processAccessibilityChildren(axObject, childNodeIds);
</ins><span class="cx">
</span><span class="cx"> if (axObject->supportsARIAControls()) {
</span><span class="cx"> Vector<Element*> controlledElements;
</span><span class="lines">@@ -1625,12 +1622,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<Inspector::Protocol::DOM::AccessibilityProperties> value = Inspector::Protocol::DOM::AccessibilityProperties::create()
</del><ins>+ RefPtr<Inspector::Protocol::DOM::AccessibilityProperties> value = Inspector::Protocol::DOM::AccessibilityProperties::create()
</ins><span class="cx"> .setExists(exists)
</span><span class="cx"> .setLabel(label)
</span><span class="cx"> .setRole(role)
</span><del>- .setNodeId(pushNodePathToFrontend(node))
- .release();
</del><ins>+ .setNodeId(pushNodePathToFrontend(node));
</ins><span class="cx">
</span><span class="cx"> if (exists) {
</span><span class="cx"> if (activeDescendantNode)
</span><span class="lines">@@ -1683,7 +1679,7 @@
</span><span class="cx"> value->setSelectedChildNodeIds(selectedChildNodeIds);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(value);
</del><ins>+ return value.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* InspectorDOMAgent::innerFirstChild(Node* node)
</span><span class="lines">@@ -1758,10 +1754,10 @@
</span><span class="cx"> m_frontendDispatcher->childNodeRemoved(parentId, frameOwnerId);
</span><span class="cx"> unbind(frameOwner, &m_documentNodeToIdMap);
</span><span class="cx">
</span><del>- Ref<Inspector::Protocol::DOM::Node> value = buildObjectForNode(frameOwner, 0, &m_documentNodeToIdMap);
</del><ins>+ RefPtr<Inspector::Protocol::DOM::Node> value = buildObjectForNode(frameOwner, 0, &m_documentNodeToIdMap);
</ins><span class="cx"> Node* previousSibling = innerPreviousSibling(frameOwner);
</span><span class="cx"> int prevId = previousSibling ? m_documentNodeToIdMap.get(previousSibling) : 0;
</span><del>- m_frontendDispatcher->childNodeInserted(parentId, prevId, WTF::move(value));
</del><ins>+ m_frontendDispatcher->childNodeInserted(parentId, prevId, value.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::didInsertDOMNode(Node& node)
</span><span class="lines">@@ -1788,8 +1784,8 @@
</span><span class="cx"> // Children have been requested -> return value of a new child.
</span><span class="cx"> Node* prevSibling = innerPreviousSibling(&node);
</span><span class="cx"> int prevId = prevSibling ? m_documentNodeToIdMap.get(prevSibling) : 0;
</span><del>- Ref<Inspector::Protocol::DOM::Node> value = buildObjectForNode(&node, 0, &m_documentNodeToIdMap);
- m_frontendDispatcher->childNodeInserted(parentId, prevId, WTF::move(value));
</del><ins>+ RefPtr<Inspector::Protocol::DOM::Node> value = buildObjectForNode(&node, 0, &m_documentNodeToIdMap);
+ m_frontendDispatcher->childNodeInserted(parentId, prevId, value.release());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1853,7 +1849,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::styleAttributeInvalidated(const Vector<Element*>& elements)
</span><span class="cx"> {
</span><del>- auto nodeIds = Inspector::Protocol::Array<int>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<int>> nodeIds = Inspector::Protocol::Array<int>::create();
</ins><span class="cx"> for (unsigned i = 0, size = elements.size(); i < size; ++i) {
</span><span class="cx"> Element* element = elements.at(i);
</span><span class="cx"> int id = boundNodeId(element);
</span><span class="lines">@@ -1865,7 +1861,7 @@
</span><span class="cx"> m_domListener->didModifyDOMAttr(element);
</span><span class="cx"> nodeIds->addItem(id);
</span><span class="cx"> }
</span><del>- m_frontendDispatcher->inlineStyleInvalidated(WTF::move(nodeIds));
</del><ins>+ m_frontendDispatcher->inlineStyleInvalidated(nodeIds.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::characterDataModified(CharacterData& characterData)
</span><span class="lines">@@ -1988,7 +1984,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(Node* node, const String& objectGroup)
</del><ins>+PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(Node* node, const String& objectGroup)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = node->document().frame();
</span><span class="cx"> if (!frame)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -132,21 +132,21 @@
</span><span class="cx"> virtual void setNodeValue(ErrorString&, int nodeId, const String& value) override;
</span><span class="cx"> virtual void getEventListenersForNode(ErrorString&, int nodeId, const WTF::String* objectGroup, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>>& listenersArray) override;
</span><span class="cx"> virtual void getAccessibilityPropertiesForNode(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::DOM::AccessibilityProperties>& axProperties) override;
</span><del>- virtual void performSearch(ErrorString&, const String& whitespaceTrimmedQuery, const RefPtr<Inspector::InspectorArray>&& nodeIds, String* searchId, int* resultCount) override;
</del><ins>+ virtual void performSearch(ErrorString&, const String& whitespaceTrimmedQuery, const RefPtr<Inspector::InspectorArray>* nodeIds, String* searchId, int* resultCount) override;
</ins><span class="cx"> virtual void getSearchResults(ErrorString&, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::Protocol::Array<int>>&) override;
</span><span class="cx"> virtual void discardSearchResults(ErrorString&, const String& searchId) override;
</span><span class="cx"> virtual void resolveNode(ErrorString&, int nodeId, const String* objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result) override;
</span><span class="cx"> virtual void getAttributes(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::Array<String>>& result) override;
</span><del>- virtual void setInspectModeEnabled(ErrorString&, bool enabled, const RefPtr<Inspector::InspectorObject>&& highlightConfig) override;
</del><ins>+ virtual void setInspectModeEnabled(ErrorString&, bool enabled, const RefPtr<Inspector::InspectorObject>* highlightConfig) override;
</ins><span class="cx"> virtual void requestNode(ErrorString&, const String& objectId, int* nodeId) override;
</span><span class="cx"> virtual void pushNodeByPathToFrontend(ErrorString&, const String& path, int* nodeId) override;
</span><span class="cx"> virtual void pushNodeByBackendIdToFrontend(ErrorString&, BackendNodeId, int* nodeId) override;
</span><span class="cx"> virtual void releaseBackendNodeIds(ErrorString&, const String& nodeGroup) override;
</span><span class="cx"> virtual void hideHighlight(ErrorString&) override;
</span><del>- virtual void highlightRect(ErrorString&, int x, int y, int width, int height, const RefPtr<Inspector::InspectorObject>&& color, const RefPtr<Inspector::InspectorObject>&& outlineColor, const bool* usePageCoordinates) override;
- virtual void highlightQuad(ErrorString&, const RefPtr<Inspector::InspectorArray>&& quad, const RefPtr<Inspector::InspectorObject>&& color, const RefPtr<Inspector::InspectorObject>&& outlineColor, const bool* usePageCoordinates) override;
- virtual void highlightNode(ErrorString&, const RefPtr<Inspector::InspectorObject>&& highlightConfig, const int* nodeId, const String* objectId) override;
- virtual void highlightFrame(ErrorString&, const String& frameId, const RefPtr<Inspector::InspectorObject>&& color, const RefPtr<Inspector::InspectorObject>&& outlineColor) override;
</del><ins>+ virtual void highlightRect(ErrorString&, int x, int y, int width, int height, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor, const bool* usePageCoordinates) override;
+ virtual void highlightQuad(ErrorString&, const RefPtr<Inspector::InspectorArray>& quad, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor, const bool* usePageCoordinates) override;
+ virtual void highlightNode(ErrorString&, const RefPtr<Inspector::InspectorObject>& highlightConfig, const int* nodeId, const String* objectId) override;
+ virtual void highlightFrame(ErrorString&, const String& frameId, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor) override;
</ins><span class="cx">
</span><span class="cx"> virtual void moveTo(ErrorString&, int nodeId, int targetNodeId, const int* anchorNodeId, int* newNodeId) override;
</span><span class="cx"> virtual void undo(ErrorString&) override;
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx">
</span><span class="cx"> static String documentURLString(Document*);
</span><span class="cx">
</span><del>- RefPtr<Inspector::Protocol::Runtime::RemoteObject> resolveNode(Node*, const String& objectGroup);
</del><ins>+ PassRefPtr<Inspector::Protocol::Runtime::RemoteObject> resolveNode(Node*, const String& objectGroup);
</ins><span class="cx"> bool handleMousePress();
</span><span class="cx"> void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
</span><span class="cx"> void inspect(Node*);
</span><span class="lines">@@ -230,20 +230,21 @@
</span><span class="cx">
</span><span class="cx"> bool hasBreakpoint(Node*, int type);
</span><span class="cx"> void updateSubtreeBreakpoints(Node* root, uint32_t rootMask, bool value);
</span><ins>+ void descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, PassRefPtr<Inspector::InspectorObject> description);
</ins><span class="cx">
</span><del>- Ref<Inspector::Protocol::DOM::Node> buildObjectForNode(Node*, int depth, NodeToIdMap*);
- Ref<Inspector::Protocol::Array<String>> buildArrayForElementAttributes(Element*);
- Ref<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap);
- Ref<Inspector::Protocol::DOM::EventListener> buildObjectForEventListener(const RegisteredEventListener&, const AtomicString& eventType, Node*, const String* objectGroupId);
- RefPtr<Inspector::Protocol::DOM::AccessibilityProperties> buildObjectForAccessibilityProperties(Node*);
- void processAccessibilityChildren(RefPtr<AccessibilityObject>&&, RefPtr<Inspector::Protocol::Array<int>>&&);
</del><ins>+ PassRefPtr<Inspector::Protocol::DOM::Node> buildObjectForNode(Node*, int depth, NodeToIdMap*);
+ PassRefPtr<Inspector::Protocol::Array<String>> buildArrayForElementAttributes(Element*);
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::Node>> buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap);
+ PassRefPtr<Inspector::Protocol::DOM::EventListener> buildObjectForEventListener(const RegisteredEventListener&, const AtomicString& eventType, Node*, const String* objectGroupId);
+ PassRefPtr<Inspector::Protocol::DOM::AccessibilityProperties> buildObjectForAccessibilityProperties(Node*);
+ void processAccessibilityChildren(PassRefPtr<AccessibilityObject>, RefPtr<Inspector::Protocol::Array<int>>&);
</ins><span class="cx">
</span><span class="cx"> Node* nodeForPath(const String& path);
</span><span class="cx"> Node* nodeForObjectId(const String& objectId);
</span><span class="cx">
</span><span class="cx"> void discardBindings();
</span><span class="cx">
</span><del>- void innerHighlightQuad(std::unique_ptr<FloatQuad>, const RefPtr<Inspector::InspectorObject>&& color, const RefPtr<Inspector::InspectorObject>&& outlineColor, const bool* usePageCoordinates);
</del><ins>+ void innerHighlightQuad(std::unique_ptr<FloatQuad>, const RefPtr<Inspector::InspectorObject>* color, const RefPtr<Inspector::InspectorObject>* outlineColor, const bool* usePageCoordinates);
</ins><span class="cx">
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> Inspector::InjectedScriptManager* m_injectedScriptManager;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -170,9 +170,9 @@
</span><span class="cx"> void InspectorDOMDebuggerAgent::didInvalidateStyleAttr(Node& node)
</span><span class="cx"> {
</span><span class="cx"> if (hasBreakpoint(&node, AttributeModified)) {
</span><del>- Ref<InspectorObject> eventData = InspectorObject::create();
- descriptionForDOMEvent(node, AttributeModified, false, eventData.get());
- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</del><ins>+ RefPtr<InspectorObject> eventData = InspectorObject::create();
+ descriptionForDOMEvent(&node, AttributeModified, false, eventData.get());
+ m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, eventData.release());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -270,9 +270,9 @@
</span><span class="cx"> void InspectorDOMDebuggerAgent::willInsertDOMNode(Node& parent)
</span><span class="cx"> {
</span><span class="cx"> if (hasBreakpoint(&parent, SubtreeModified)) {
</span><del>- Ref<InspectorObject> eventData = InspectorObject::create();
- descriptionForDOMEvent(parent, SubtreeModified, true, eventData.get());
- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</del><ins>+ RefPtr<InspectorObject> eventData = InspectorObject::create();
+ descriptionForDOMEvent(&parent, SubtreeModified, true, eventData.get());
+ m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, eventData.release());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -280,39 +280,39 @@
</span><span class="cx"> {
</span><span class="cx"> Node* parentNode = InspectorDOMAgent::innerParentNode(&node);
</span><span class="cx"> if (hasBreakpoint(&node, NodeRemoved)) {
</span><del>- Ref<InspectorObject> eventData = InspectorObject::create();
- descriptionForDOMEvent(node, NodeRemoved, false, eventData.get());
- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</del><ins>+ RefPtr<InspectorObject> eventData = InspectorObject::create();
+ descriptionForDOMEvent(&node, NodeRemoved, false, eventData.get());
+ m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, eventData.release());
</ins><span class="cx"> } else if (parentNode && hasBreakpoint(parentNode, SubtreeModified)) {
</span><del>- Ref<InspectorObject> eventData = InspectorObject::create();
- descriptionForDOMEvent(node, SubtreeModified, false, eventData.get());
- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</del><ins>+ RefPtr<InspectorObject> eventData = InspectorObject::create();
+ descriptionForDOMEvent(&node, SubtreeModified, false, eventData.get());
+ m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, eventData.release());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMDebuggerAgent::willModifyDOMAttr(Element& element)
</span><span class="cx"> {
</span><span class="cx"> if (hasBreakpoint(&element, AttributeModified)) {
</span><del>- Ref<InspectorObject> eventData = InspectorObject::create();
- descriptionForDOMEvent(element, AttributeModified, false, eventData.get());
- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, WTF::move(eventData));
</del><ins>+ RefPtr<InspectorObject> eventData = InspectorObject::create();
+ descriptionForDOMEvent(&element, AttributeModified, false, eventData.get());
+ m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::DOM, eventData.release());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::descriptionForDOMEvent(Node& target, int breakpointType, bool insertion, InspectorObject& description)
</del><ins>+void InspectorDOMDebuggerAgent::descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, InspectorObject* description)
</ins><span class="cx"> {
</span><del>- ASSERT(hasBreakpoint(&target, breakpointType));
</del><ins>+ ASSERT(hasBreakpoint(target, breakpointType));
</ins><span class="cx">
</span><del>- Node* breakpointOwner = &target;
</del><ins>+ Node* breakpointOwner = target;
</ins><span class="cx"> if ((1 << breakpointType) & inheritableDOMBreakpointTypesMask) {
</span><span class="cx"> // For inheritable breakpoint types, target node isn't always the same as the node that owns a breakpoint.
</span><span class="cx"> // Target node may be unknown to frontend, so we need to push it first.
</span><del>- RefPtr<Inspector::Protocol::Runtime::RemoteObject> targetNodeObject = m_domAgent->resolveNode(&target, InspectorDebuggerAgent::backtraceObjectGroup);
- description.setValue("targetNode", targetNodeObject);
</del><ins>+ RefPtr<Inspector::Protocol::Runtime::RemoteObject> targetNodeObject = m_domAgent->resolveNode(target, InspectorDebuggerAgent::backtraceObjectGroup);
+ description->setValue("targetNode", targetNodeObject);
</ins><span class="cx">
</span><span class="cx"> // Find breakpoint owner node.
</span><span class="cx"> if (!insertion)
</span><del>- breakpointOwner = InspectorDOMAgent::innerParentNode(&target);
</del><ins>+ breakpointOwner = InspectorDOMAgent::innerParentNode(target);
</ins><span class="cx"> ASSERT(breakpointOwner);
</span><span class="cx"> while (!(m_domBreakpoints.get(breakpointOwner) & (1 << breakpointType))) {
</span><span class="cx"> Node* parentNode = InspectorDOMAgent::innerParentNode(breakpointOwner);
</span><span class="lines">@@ -322,13 +322,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (breakpointType == SubtreeModified)
</span><del>- description.setBoolean("insertion", insertion);
</del><ins>+ description->setBoolean("insertion", insertion);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int breakpointOwnerNodeId = m_domAgent->boundNodeId(breakpointOwner);
</span><span class="cx"> ASSERT(breakpointOwnerNodeId);
</span><del>- description.setInteger("nodeId", breakpointOwnerNodeId);
- description.setString("type", domTypeName(breakpointType));
</del><ins>+ description->setInteger("nodeId", breakpointOwnerNodeId);
+ description->setString("type", domTypeName(breakpointType));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InspectorDOMDebuggerAgent::hasBreakpoint(Node* node, int type)
</span><span class="lines">@@ -366,12 +366,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<InspectorObject> eventData = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> eventData = InspectorObject::create();
</ins><span class="cx"> eventData->setString("eventName", fullEventName);
</span><span class="cx"> if (synchronous)
</span><del>- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::EventListener, WTF::move(eventData));
</del><ins>+ m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::EventListener, eventData.release());
</ins><span class="cx"> else
</span><del>- m_debuggerAgent->schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason::EventListener, WTF::move(eventData));
</del><ins>+ m_debuggerAgent->schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason::EventListener, eventData.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMDebuggerAgent::setXHRBreakpoint(ErrorString&, const String& url)
</span><span class="lines">@@ -411,10 +411,10 @@
</span><span class="cx"> if (breakpointURL.isNull())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Ref<InspectorObject> eventData = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> eventData = InspectorObject::create();
</ins><span class="cx"> eventData->setString("breakpointURL", breakpointURL);
</span><span class="cx"> eventData->setString("url", url);
</span><del>- m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::XHR, WTF::move(eventData));
</del><ins>+ m_debuggerAgent->breakProgram(InspectorDebuggerFrontendDispatcher::Reason::XHR, eventData.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMDebuggerAgent::clear()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> virtual void didPause() override;
</span><span class="cx"> void disable();
</span><span class="cx">
</span><del>- void descriptionForDOMEvent(Node& target, int breakpointType, bool insertion, Inspector::InspectorObject& description);
</del><ins>+ void descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, Inspector::InspectorObject* description);
</ins><span class="cx"> void updateSubtreeBreakpoints(Node*, uint32_t rootMask, bool set);
</span><span class="cx"> bool hasBreakpoint(Node*, int type);
</span><span class="cx"> void discardBindings();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -94,34 +94,34 @@
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMStorageAgent::getDOMStorageItems(ErrorString& errorString, const RefPtr<InspectorObject>&& storageId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Array<String>>>& items)
</del><ins>+void InspectorDOMStorageAgent::getDOMStorageItems(ErrorString& errorString, const RefPtr<InspectorObject>& storageId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Array<String>>>& items)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame;
</span><del>- RefPtr<StorageArea> storageArea = findStorageArea(errorString, storageId.copyRef(), frame);
</del><ins>+ RefPtr<StorageArea> storageArea = findStorageArea(errorString, storageId, frame);
</ins><span class="cx"> if (!storageArea) {
</span><span class="cx"> errorString = ASCIILiteral("No StorageArea for given storageId");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto storageItems = Inspector::Protocol::Array<Inspector::Protocol::Array<String>>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Array<String>>> storageItems = Inspector::Protocol::Array<Inspector::Protocol::Array<String>>::create();
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < storageArea->length(); ++i) {
</span><span class="cx"> String key = storageArea->key(i);
</span><span class="cx"> String value = storageArea->item(key);
</span><span class="cx">
</span><del>- auto entry = Inspector::Protocol::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> entry = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> entry->addItem(key);
</span><span class="cx"> entry->addItem(value);
</span><del>- storageItems->addItem(WTF::move(entry));
</del><ins>+ storageItems->addItem(entry.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- items = WTF::move(storageItems);
</del><ins>+ items = storageItems.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMStorageAgent::setDOMStorageItem(ErrorString& errorString, const RefPtr<InspectorObject>&& storageId, const String& key, const String& value)
</del><ins>+void InspectorDOMStorageAgent::setDOMStorageItem(ErrorString& errorString, const RefPtr<InspectorObject>& storageId, const String& key, const String& value)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame;
</span><del>- RefPtr<StorageArea> storageArea = findStorageArea(errorString, storageId.copyRef(), frame);
</del><ins>+ RefPtr<StorageArea> storageArea = findStorageArea(errorString, storageId, frame);
</ins><span class="cx"> if (!storageArea) {
</span><span class="cx"> errorString = ASCIILiteral("Storage not found");
</span><span class="cx"> return;
</span><span class="lines">@@ -133,10 +133,10 @@
</span><span class="cx"> errorString = ExceptionCodeDescription(QUOTA_EXCEEDED_ERR).name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMStorageAgent::removeDOMStorageItem(ErrorString& errorString, const RefPtr<InspectorObject>&& storageId, const String& key)
</del><ins>+void InspectorDOMStorageAgent::removeDOMStorageItem(ErrorString& errorString, const RefPtr<InspectorObject>& storageId, const String& key)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame;
</span><del>- RefPtr<StorageArea> storageArea = findStorageArea(errorString, storageId.copyRef(), frame);
</del><ins>+ RefPtr<StorageArea> storageArea = findStorageArea(errorString, storageId, frame);
</ins><span class="cx"> if (!storageArea) {
</span><span class="cx"> errorString = ASCIILiteral("Storage not found");
</span><span class="cx"> return;
</span><span class="lines">@@ -157,12 +157,11 @@
</span><span class="cx"> return storageId(securityOrigin.get(), isLocalStorage)->toJSONString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::DOMStorage::StorageId> InspectorDOMStorageAgent::storageId(SecurityOrigin* securityOrigin, bool isLocalStorage)
</del><ins>+PassRefPtr<Inspector::Protocol::DOMStorage::StorageId> InspectorDOMStorageAgent::storageId(SecurityOrigin* securityOrigin, bool isLocalStorage)
</ins><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::DOMStorage::StorageId::create()
</span><span class="cx"> .setSecurityOrigin(securityOrigin->toRawString())
</span><del>- .setIsLocalStorage(isLocalStorage)
- .release();
</del><ins>+ .setIsLocalStorage(isLocalStorage).release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMStorageAgent::didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType storageType, SecurityOrigin* securityOrigin, Page*)
</span><span class="lines">@@ -182,7 +181,7 @@
</span><span class="cx"> m_frontendDispatcher->domStorageItemUpdated(id, key, oldValue, newValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<StorageArea> InspectorDOMStorageAgent::findStorageArea(ErrorString& errorString, const RefPtr<InspectorObject>&& storageId, Frame*& targetFrame)
</del><ins>+PassRefPtr<StorageArea> InspectorDOMStorageAgent::findStorageArea(ErrorString& errorString, const RefPtr<InspectorObject>& storageId, Frame*& targetFrame)
</ins><span class="cx"> {
</span><span class="cx"> String securityOrigin;
</span><span class="cx"> bool isLocalStorage = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -63,19 +63,19 @@
</span><span class="cx"> // Called from the front-end.
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span><del>- virtual void getDOMStorageItems(ErrorString&, const RefPtr<Inspector::InspectorObject>&& storageId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Array<String>>>& items) override;
- virtual void setDOMStorageItem(ErrorString&, const RefPtr<Inspector::InspectorObject>&& storageId, const String& key, const String& value) override;
- virtual void removeDOMStorageItem(ErrorString&, const RefPtr<Inspector::InspectorObject>&& storageId, const String& key) override;
</del><ins>+ virtual void getDOMStorageItems(ErrorString&, const RefPtr<Inspector::InspectorObject>& storageId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Array<String>>>& items) override;
+ virtual void setDOMStorageItem(ErrorString&, const RefPtr<Inspector::InspectorObject>& storageId, const String& key, const String& value) override;
+ virtual void removeDOMStorageItem(ErrorString&, const RefPtr<Inspector::InspectorObject>& storageId, const String& key) override;
</ins><span class="cx">
</span><span class="cx"> // Called from the injected script.
</span><span class="cx"> String storageId(Storage*);
</span><del>- RefPtr<Inspector::Protocol::DOMStorage::StorageId> storageId(SecurityOrigin*, bool isLocalStorage);
</del><ins>+ PassRefPtr<Inspector::Protocol::DOMStorage::StorageId> storageId(SecurityOrigin*, bool isLocalStorage);
</ins><span class="cx">
</span><span class="cx"> // Called from InspectorInstrumentation
</span><span class="cx"> void didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RefPtr<StorageArea> findStorageArea(ErrorString&, const RefPtr<Inspector::InspectorObject>&&, Frame*&);
</del><ins>+ PassRefPtr<StorageArea> findStorageArea(ErrorString&, const RefPtr<Inspector::InspectorObject>&, Frame*&);
</ins><span class="cx">
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> std::unique_ptr<Inspector::InspectorDOMStorageFrontendDispatcher> m_frontendDispatcher;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -58,20 +58,19 @@
</span><span class="cx">
</span><span class="cx"> namespace {
</span><span class="cx">
</span><del>-void reportTransactionFailed(ExecuteSQLCallback& requestCallback, SQLError* error)
</del><ins>+void reportTransactionFailed(ExecuteSQLCallback* requestCallback, SQLError* error)
</ins><span class="cx"> {
</span><del>- auto errorObject = Inspector::Protocol::Database::Error::create()
</del><ins>+ RefPtr<Inspector::Protocol::Database::Error> errorObject = Inspector::Protocol::Database::Error::create()
</ins><span class="cx"> .setMessage(error->message())
</span><del>- .setCode(error->code())
- .release();
- requestCallback.sendSuccess(nullptr, nullptr, WTF::move(errorObject));
</del><ins>+ .setCode(error->code());
+ requestCallback->sendSuccess(nullptr, nullptr, errorObject.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class StatementCallback : public SQLStatementCallback {
</span><span class="cx"> public:
</span><del>- static Ref<StatementCallback> create(Ref<ExecuteSQLCallback>&& requestCallback)
</del><ins>+ static PassRefPtr<StatementCallback> create(PassRefPtr<ExecuteSQLCallback> requestCallback)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new StatementCallback(WTF::move(requestCallback)));
</del><ins>+ return adoptRef(new StatementCallback(requestCallback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~StatementCallback() { }
</span><span class="lines">@@ -80,60 +79,57 @@
</span><span class="cx"> {
</span><span class="cx"> SQLResultSetRowList* rowList = resultSet->rows();
</span><span class="cx">
</span><del>- auto columnNames = Inspector::Protocol::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> columnNames = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> const Vector<String>& columns = rowList->columnNames();
</span><span class="cx"> for (size_t i = 0; i < columns.size(); ++i)
</span><span class="cx"> columnNames->addItem(columns[i]);
</span><span class="cx">
</span><del>- auto values = Inspector::Protocol::Array<InspectorValue>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<InspectorValue>> values = Inspector::Protocol::Array<InspectorValue>::create();
</ins><span class="cx"> const Vector<SQLValue>& data = rowList->values();
</span><span class="cx"> for (size_t i = 0; i < data.size(); ++i) {
</span><span class="cx"> const SQLValue& value = rowList->values()[i];
</span><del>- RefPtr<InspectorValue> inspectorValue;
</del><span class="cx"> switch (value.type()) {
</span><del>- case SQLValue::StringValue: inspectorValue = InspectorString::create(value.string()); break;
- case SQLValue::NumberValue: inspectorValue = InspectorBasicValue::create(value.number()); break;
- case SQLValue::NullValue: inspectorValue = InspectorValue::null(); break;
</del><ins>+ case SQLValue::StringValue: values->addItem(InspectorString::create(value.string())); break;
+ case SQLValue::NumberValue: values->addItem(InspectorBasicValue::create(value.number())); break;
+ case SQLValue::NullValue: values->addItem(InspectorValue::null()); break;
</ins><span class="cx"> }
</span><del>-
- values->addItem(WTF::move(inspectorValue));
</del><span class="cx"> }
</span><del>- m_requestCallback->sendSuccess(WTF::move(columnNames), WTF::move(values), nullptr);
</del><ins>+ m_requestCallback->sendSuccess(columnNames.release(), values.release(), nullptr);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StatementCallback(Ref<ExecuteSQLCallback>&& requestCallback)
- : m_requestCallback(WTF::move(requestCallback)) { }
- Ref<ExecuteSQLCallback> m_requestCallback;
</del><ins>+ StatementCallback(PassRefPtr<ExecuteSQLCallback> requestCallback)
+ : m_requestCallback(requestCallback) { }
+ RefPtr<ExecuteSQLCallback> m_requestCallback;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class StatementErrorCallback : public SQLStatementErrorCallback {
</span><span class="cx"> public:
</span><del>- static Ref<StatementErrorCallback> create(Ref<ExecuteSQLCallback>&& requestCallback)
</del><ins>+ static PassRefPtr<StatementErrorCallback> create(PassRefPtr<ExecuteSQLCallback> requestCallback)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new StatementErrorCallback(WTF::move(requestCallback)));
</del><ins>+ return adoptRef(new StatementErrorCallback(requestCallback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~StatementErrorCallback() { }
</span><span class="cx">
</span><span class="cx"> virtual bool handleEvent(SQLTransaction*, SQLError* error) override
</span><span class="cx"> {
</span><del>- reportTransactionFailed(m_requestCallback.copyRef(), error);
</del><ins>+ reportTransactionFailed(m_requestCallback.get(), error);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StatementErrorCallback(Ref<ExecuteSQLCallback>&& requestCallback)
- : m_requestCallback(WTF::move(requestCallback)) { }
- Ref<ExecuteSQLCallback> m_requestCallback;
</del><ins>+ StatementErrorCallback(PassRefPtr<ExecuteSQLCallback> requestCallback)
+ : m_requestCallback(requestCallback) { }
+ RefPtr<ExecuteSQLCallback> m_requestCallback;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class TransactionCallback : public SQLTransactionCallback {
</span><span class="cx"> public:
</span><del>- static Ref<TransactionCallback> create(const String& sqlStatement, Ref<ExecuteSQLCallback>&& requestCallback)
</del><ins>+ static PassRefPtr<TransactionCallback> create(const String& sqlStatement, PassRefPtr<ExecuteSQLCallback> requestCallback)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new TransactionCallback(sqlStatement, WTF::move(requestCallback)));
</del><ins>+ return adoptRef(new TransactionCallback(sqlStatement, requestCallback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~TransactionCallback() { }
</span><span class="lines">@@ -144,24 +140,24 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> Vector<SQLValue> sqlValues;
</span><del>- Ref<SQLStatementCallback> callback(StatementCallback::create(m_requestCallback.copyRef()));
- Ref<SQLStatementErrorCallback> errorCallback(StatementErrorCallback::create(m_requestCallback.copyRef()));
- transaction->executeSQL(m_sqlStatement, sqlValues, WTF::move(callback), WTF::move(errorCallback), IGNORE_EXCEPTION);
</del><ins>+ RefPtr<SQLStatementCallback> callback(StatementCallback::create(m_requestCallback.get()));
+ RefPtr<SQLStatementErrorCallback> errorCallback(StatementErrorCallback::create(m_requestCallback.get()));
+ transaction->executeSQL(m_sqlStatement, sqlValues, callback.release(), errorCallback.release(), IGNORE_EXCEPTION);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> private:
</span><del>- TransactionCallback(const String& sqlStatement, Ref<ExecuteSQLCallback>&& requestCallback)
</del><ins>+ TransactionCallback(const String& sqlStatement, PassRefPtr<ExecuteSQLCallback> requestCallback)
</ins><span class="cx"> : m_sqlStatement(sqlStatement)
</span><del>- , m_requestCallback(WTF::move(requestCallback)) { }
</del><ins>+ , m_requestCallback(requestCallback) { }
</ins><span class="cx"> String m_sqlStatement;
</span><del>- Ref<ExecuteSQLCallback> m_requestCallback;
</del><ins>+ RefPtr<ExecuteSQLCallback> m_requestCallback;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class TransactionErrorCallback : public SQLTransactionErrorCallback {
</span><span class="cx"> public:
</span><del>- static Ref<TransactionErrorCallback> create(Ref<ExecuteSQLCallback>&& requestCallback)
</del><ins>+ static PassRefPtr<TransactionErrorCallback> create(PassRefPtr<ExecuteSQLCallback> requestCallback)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new TransactionErrorCallback(WTF::move(requestCallback)));
</del><ins>+ return adoptRef(new TransactionErrorCallback(requestCallback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~TransactionErrorCallback() { }
</span><span class="lines">@@ -172,16 +168,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> private:
</span><del>- TransactionErrorCallback(Ref<ExecuteSQLCallback>&& requestCallback)
- : m_requestCallback(WTF::move(requestCallback)) { }
- Ref<ExecuteSQLCallback> m_requestCallback;
</del><ins>+ TransactionErrorCallback(PassRefPtr<ExecuteSQLCallback> requestCallback)
+ : m_requestCallback(requestCallback) { }
+ RefPtr<ExecuteSQLCallback> m_requestCallback;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class TransactionSuccessCallback : public VoidCallback {
</span><span class="cx"> public:
</span><del>- static Ref<TransactionSuccessCallback> create()
</del><ins>+ static PassRefPtr<TransactionSuccessCallback> create()
</ins><span class="cx"> {
</span><del>- return adoptRef(*new TransactionSuccessCallback());
</del><ins>+ return adoptRef(new TransactionSuccessCallback());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~TransactionSuccessCallback() { }
</span><span class="lines">@@ -276,8 +272,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseAgent::executeSQL(ErrorString&, const String& databaseId, const String& query, Ref<ExecuteSQLCallback>&& requestCallback)
</del><ins>+void InspectorDatabaseAgent::executeSQL(ErrorString&, const String& databaseId, const String& query, PassRefPtr<ExecuteSQLCallback> prpRequestCallback)
</ins><span class="cx"> {
</span><ins>+ RefPtr<ExecuteSQLCallback> requestCallback = prpRequestCallback;
+
</ins><span class="cx"> if (!m_enabled) {
</span><span class="cx"> requestCallback->sendFailure("Database agent is not enabled");
</span><span class="cx"> return;
</span><span class="lines">@@ -289,10 +287,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<SQLTransactionCallback> callback(TransactionCallback::create(query, requestCallback.get()));
- Ref<SQLTransactionErrorCallback> errorCallback(TransactionErrorCallback::create(requestCallback.get()));
- Ref<VoidCallback> successCallback(TransactionSuccessCallback::create());
- database->transaction(WTF::move(callback), WTF::move(errorCallback), WTF::move(successCallback));
</del><ins>+ RefPtr<SQLTransactionCallback> callback(TransactionCallback::create(query, requestCallback.get()));
+ RefPtr<SQLTransactionErrorCallback> errorCallback(TransactionErrorCallback::create(requestCallback.get()));
+ RefPtr<VoidCallback> successCallback(TransactionSuccessCallback::create());
+ database->transaction(callback.release(), errorCallback.release(), successCallback.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String InspectorDatabaseAgent::databaseId(Database* database)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span><span class="cx"> virtual void getDatabaseTableNames(ErrorString&, const String& databaseId, RefPtr<Inspector::Protocol::Array<String>>& names) override;
</span><del>- virtual void executeSQL(ErrorString&, const String& databaseId, const String& query, Ref<ExecuteSQLCallback>&&) override;
</del><ins>+ virtual void executeSQL(ErrorString&, const String& databaseId, const String& query, PassRefPtr<ExecuteSQLCallback>) override;
</ins><span class="cx">
</span><span class="cx"> // Called from the injected script.
</span><span class="cx"> String databaseId(Database*);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseInstrumentation.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseInstrumentation.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseInstrumentation.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -38,11 +38,11 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>-inline void InspectorInstrumentation::didOpenDatabase(ScriptExecutionContext* context, RefPtr<Database>&& database, const String& domain, const String& name, const String& version)
</del><ins>+inline void InspectorInstrumentation::didOpenDatabase(ScriptExecutionContext* context, PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
</span><del>- didOpenDatabaseImpl(*instrumentingAgents, WTF::move(database), domain, name, version);
</del><ins>+ didOpenDatabaseImpl(*instrumentingAgents, database, domain, name, version);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(context);
</span><span class="cx"> UNUSED_PARAM(database);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -43,12 +43,12 @@
</span><span class="cx">
</span><span class="cx"> static int nextUnusedId = 1;
</span><span class="cx">
</span><del>-Ref<InspectorDatabaseResource> InspectorDatabaseResource::create(RefPtr<Database>&& database, const String& domain, const String& name, const String& version)
</del><ins>+PassRefPtr<InspectorDatabaseResource> InspectorDatabaseResource::create(PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorDatabaseResource(WTF::move(database), domain, name, version));
</del><ins>+ return adoptRef(new InspectorDatabaseResource(database, domain, name, version));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDatabaseResource::InspectorDatabaseResource(RefPtr<Database>&& database, const String& domain, const String& name, const String& version)
</del><ins>+InspectorDatabaseResource::InspectorDatabaseResource(PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
</ins><span class="cx"> : m_database(database)
</span><span class="cx"> , m_id(String::number(nextUnusedId++))
</span><span class="cx"> , m_domain(domain)
</span><span class="lines">@@ -59,13 +59,12 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDatabaseResource::bind(InspectorDatabaseFrontendDispatcher* databaseFrontendDispatcher)
</span><span class="cx"> {
</span><del>- auto jsonObject = Inspector::Protocol::Database::Database::create()
</del><ins>+ RefPtr<Inspector::Protocol::Database::Database> jsonObject = Inspector::Protocol::Database::Database::create()
</ins><span class="cx"> .setId(m_id)
</span><span class="cx"> .setDomain(m_domain)
</span><span class="cx"> .setName(m_name)
</span><del>- .setVersion(m_version)
- .release();
- databaseFrontendDispatcher->addDatabase(WTF::move(jsonObject));
</del><ins>+ .setVersion(m_version);
+ databaseFrontendDispatcher->addDatabase(jsonObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseResource.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseResource.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseResource.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #if ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #include <inspector/InspectorFrontendDispatchers.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -44,15 +45,15 @@
</span><span class="cx">
</span><span class="cx"> class InspectorDatabaseResource : public RefCounted<InspectorDatabaseResource> {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorDatabaseResource> create(RefPtr<Database>&&, const String& domain, const String& name, const String& version);
</del><ins>+ static PassRefPtr<InspectorDatabaseResource> create(PassRefPtr<Database> database, const String& domain, const String& name, const String& version);
</ins><span class="cx">
</span><span class="cx"> void bind(Inspector::InspectorDatabaseFrontendDispatcher*);
</span><span class="cx"> Database* database() { return m_database.get(); }
</span><del>- void setDatabase(RefPtr<Database>&& database) { m_database = database; }
</del><ins>+ void setDatabase(PassRefPtr<Database> database) { m_database = database; }
</ins><span class="cx"> String id() const { return m_id; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- InspectorDatabaseResource(RefPtr<Database>&&, const String& domain, const String& name, const String& version);
</del><ins>+ InspectorDatabaseResource(PassRefPtr<Database>, const String& domain, const String& name, const String& version);
</ins><span class="cx">
</span><span class="cx"> RefPtr<Database> m_database;
</span><span class="cx"> String m_id;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx">
</span><span class="cx"> class InspectorFrontendHost : public RefCounted<InspectorFrontendHost> {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorFrontendHost> create(InspectorFrontendClient* client, Page* frontendPage)
</del><ins>+ static PassRefPtr<InspectorFrontendHost> create(InspectorFrontendClient* client, Page* frontendPage)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorFrontendHost(client, frontendPage));
</del><ins>+ return adoptRef(new InspectorFrontendHost(client, frontendPage));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ~InspectorFrontendHost();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> class GetDatabaseNamesCallback : public EventListener {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(GetDatabaseNamesCallback);
</span><span class="cx"> public:
</span><del>- static Ref<GetDatabaseNamesCallback> create(Ref<RequestDatabaseNamesCallback>&& requestCallback, const String& securityOrigin)
</del><ins>+ static PassRefPtr<GetDatabaseNamesCallback> create(PassRefPtr<RequestDatabaseNamesCallback> requestCallback, const String& securityOrigin)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new GetDatabaseNamesCallback(WTF::move(requestCallback), securityOrigin));
</del><ins>+ return adoptRef(new GetDatabaseNamesCallback(requestCallback, securityOrigin));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~GetDatabaseNamesCallback() { }
</span><span class="lines">@@ -126,18 +126,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<DOMStringList> databaseNamesList = requestResult->domStringList();
</span><del>- Ref<Inspector::Protocol::Array<String>> databaseNames = Inspector::Protocol::Array<String>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<String>> databaseNames = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> for (size_t i = 0; i < databaseNamesList->length(); ++i)
</span><span class="cx"> databaseNames->addItem(databaseNamesList->item(i));
</span><del>- m_requestCallback->sendSuccess(WTF::move(databaseNames));
</del><ins>+ m_requestCallback->sendSuccess(databaseNames.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- GetDatabaseNamesCallback(Ref<RequestDatabaseNamesCallback>&& requestCallback, const String& securityOrigin)
</del><ins>+ GetDatabaseNamesCallback(PassRefPtr<RequestDatabaseNamesCallback> requestCallback, const String& securityOrigin)
</ins><span class="cx"> : EventListener(EventListener::CPPEventListenerType)
</span><del>- , m_requestCallback(WTF::move(requestCallback))
</del><ins>+ , m_requestCallback(requestCallback)
</ins><span class="cx"> , m_securityOrigin(securityOrigin) { }
</span><del>- Ref<RequestDatabaseNamesCallback> m_requestCallback;
</del><ins>+ RefPtr<RequestDatabaseNamesCallback> m_requestCallback;
</ins><span class="cx"> String m_securityOrigin;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -147,8 +147,8 @@
</span><span class="cx"> : m_context(context) { }
</span><span class="cx"> virtual ~ExecutableWithDatabase() { };
</span><span class="cx"> void start(IDBFactory*, SecurityOrigin*, const String& databaseName);
</span><del>- virtual void execute(RefPtr<IDBDatabase>&&) = 0;
- virtual RequestCallback& requestCallback() = 0;
</del><ins>+ virtual void execute(PassRefPtr<IDBDatabase>) = 0;
+ virtual RequestCallback* requestCallback() = 0;
</ins><span class="cx"> ScriptExecutionContext* context() { return m_context; };
</span><span class="cx"> private:
</span><span class="cx"> ScriptExecutionContext* m_context;
</span><span class="lines">@@ -156,9 +156,9 @@
</span><span class="cx">
</span><span class="cx"> class OpenDatabaseCallback : public EventListener {
</span><span class="cx"> public:
</span><del>- static Ref<OpenDatabaseCallback> create(ExecutableWithDatabase* executableWithDatabase)
</del><ins>+ static PassRefPtr<OpenDatabaseCallback> create(ExecutableWithDatabase* executableWithDatabase)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new OpenDatabaseCallback(executableWithDatabase));
</del><ins>+ return adoptRef(new OpenDatabaseCallback(executableWithDatabase));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~OpenDatabaseCallback() { }
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> virtual void handleEvent(ScriptExecutionContext*, Event* event) override
</span><span class="cx"> {
</span><span class="cx"> if (event->type() != eventNames().successEvent) {
</span><del>- m_executableWithDatabase->requestCallback().sendFailure("Unexpected event type.");
</del><ins>+ m_executableWithDatabase->requestCallback()->sendFailure("Unexpected event type.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -179,16 +179,16 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> RefPtr<IDBAny> requestResult = idbOpenDBRequest->result(ec);
</span><span class="cx"> if (ec) {
</span><del>- m_executableWithDatabase->requestCallback().sendFailure("Could not get result in callback.");
</del><ins>+ m_executableWithDatabase->requestCallback()->sendFailure("Could not get result in callback.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (requestResult->type() != IDBAny::IDBDatabaseType) {
</span><del>- m_executableWithDatabase->requestCallback().sendFailure("Unexpected result type.");
</del><ins>+ m_executableWithDatabase->requestCallback()->sendFailure("Unexpected result type.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBDatabase> idbDatabase = requestResult->idbDatabase();
</span><del>- m_executableWithDatabase->execute(WTF::move(idbDatabase));
</del><ins>+ m_executableWithDatabase->execute(idbDatabase);
</ins><span class="cx"> IDBPendingTransactionMonitor::deactivateNewTransactions();
</span><span class="cx"> idbDatabase->close();
</span><span class="cx"> }
</span><span class="lines">@@ -202,136 +202,127 @@
</span><span class="cx">
</span><span class="cx"> void ExecutableWithDatabase::start(IDBFactory* idbFactory, SecurityOrigin*, const String& databaseName)
</span><span class="cx"> {
</span><del>- Ref<OpenDatabaseCallback> callback = OpenDatabaseCallback::create(this);
</del><ins>+ RefPtr<OpenDatabaseCallback> callback = OpenDatabaseCallback::create(this);
</ins><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> RefPtr<IDBOpenDBRequest> idbOpenDBRequest = idbFactory->open(context(), databaseName, ec);
</span><span class="cx"> if (ec) {
</span><del>- requestCallback().sendFailure("Could not open database.");
</del><ins>+ requestCallback()->sendFailure("Could not open database.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- idbOpenDBRequest->addEventListener(eventNames().successEvent, WTF::move(callback), false);
</del><ins>+ idbOpenDBRequest->addEventListener(eventNames().successEvent, callback, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<IDBTransaction> transactionForDatabase(ScriptExecutionContext* scriptExecutionContext, IDBDatabase* idbDatabase, const String& objectStoreName, const String& mode = IDBTransaction::modeReadOnly())
</del><ins>+static PassRefPtr<IDBTransaction> transactionForDatabase(ScriptExecutionContext* scriptExecutionContext, IDBDatabase* idbDatabase, const String& objectStoreName, const String& mode = IDBTransaction::modeReadOnly())
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> RefPtr<IDBTransaction> idbTransaction = idbDatabase->transaction(scriptExecutionContext, objectStoreName, mode, ec);
</span><span class="cx"> if (ec)
</span><span class="cx"> return nullptr;
</span><del>- return WTF::move(idbTransaction);
</del><ins>+ return idbTransaction;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<IDBObjectStore> objectStoreForTransaction(IDBTransaction* idbTransaction, const String& objectStoreName)
</del><ins>+static PassRefPtr<IDBObjectStore> objectStoreForTransaction(IDBTransaction* idbTransaction, const String& objectStoreName)
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> RefPtr<IDBObjectStore> idbObjectStore = idbTransaction->objectStore(objectStoreName, ec);
</span><span class="cx"> if (ec)
</span><span class="cx"> return nullptr;
</span><del>- return WTF::move(idbObjectStore);
</del><ins>+ return idbObjectStore;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<IDBIndex> indexForObjectStore(IDBObjectStore* idbObjectStore, const String& indexName)
</del><ins>+static PassRefPtr<IDBIndex> indexForObjectStore(IDBObjectStore* idbObjectStore, const String& indexName)
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> RefPtr<IDBIndex> idbIndex = idbObjectStore->index(indexName, ec);
</span><span class="cx"> if (ec)
</span><span class="cx"> return nullptr;
</span><del>- return WTF::move(idbIndex);
</del><ins>+ return idbIndex;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<KeyPath> keyPathFromIDBKeyPath(const IDBKeyPath& idbKeyPath)
</del><ins>+static PassRefPtr<KeyPath> keyPathFromIDBKeyPath(const IDBKeyPath& idbKeyPath)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<KeyPath> keyPath;
</span><span class="cx"> switch (idbKeyPath.type()) {
</span><span class="cx"> case IDBKeyPath::NullType:
</span><del>- keyPath = KeyPath::create()
- .setType(KeyPath::Type::Null)
- .release();
</del><ins>+ keyPath = KeyPath::create().setType(KeyPath::Type::Null);
</ins><span class="cx"> break;
</span><span class="cx"> case IDBKeyPath::StringType:
</span><del>- keyPath = KeyPath::create()
- .setType(KeyPath::Type::String)
- .release();
</del><ins>+ keyPath = KeyPath::create().setType(KeyPath::Type::String);
</ins><span class="cx"> keyPath->setString(idbKeyPath.string());
</span><del>-
</del><span class="cx"> break;
</span><span class="cx"> case IDBKeyPath::ArrayType: {
</span><del>- auto array = Inspector::Protocol::Array<String>::create();
</del><ins>+ keyPath = KeyPath::create().setType(KeyPath::Type::Array);
+ RefPtr<Inspector::Protocol::Array<String>> array = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> const Vector<String>& stringArray = idbKeyPath.array();
</span><span class="cx"> for (size_t i = 0; i < stringArray.size(); ++i)
</span><span class="cx"> array->addItem(stringArray[i]);
</span><del>- keyPath = KeyPath::create()
- .setType(KeyPath::Type::Array)
- .release();
- keyPath->setArray(WTF::move(array));
</del><ins>+ keyPath->setArray(array);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(keyPath);
</del><ins>+ return keyPath.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class DatabaseLoader : public ExecutableWithDatabase {
</span><span class="cx"> public:
</span><del>- static Ref<DatabaseLoader> create(ScriptExecutionContext* context, Ref<RequestDatabaseCallback>&& requestCallback)
</del><ins>+ static PassRefPtr<DatabaseLoader> create(ScriptExecutionContext* context, PassRefPtr<RequestDatabaseCallback> requestCallback)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DatabaseLoader(context, WTF::move(requestCallback)));
</del><ins>+ return adoptRef(new DatabaseLoader(context, requestCallback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~DatabaseLoader() { }
</span><span class="cx">
</span><del>- virtual void execute(RefPtr<IDBDatabase>&& database) override
</del><ins>+ virtual void execute(PassRefPtr<IDBDatabase> prpDatabase) override
</ins><span class="cx"> {
</span><del>- if (!requestCallback().isActive())
</del><ins>+ RefPtr<IDBDatabase> idbDatabase = prpDatabase;
+ if (!requestCallback()->isActive())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- const IDBDatabaseMetadata databaseMetadata = database->metadata();
</del><ins>+ const IDBDatabaseMetadata databaseMetadata = idbDatabase->metadata();
</ins><span class="cx">
</span><del>- auto objectStores = Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStore>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStore>> objectStores = Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStore>::create();
</ins><span class="cx">
</span><span class="cx"> for (const IDBObjectStoreMetadata& objectStoreMetadata : databaseMetadata.objectStores.values()) {
</span><del>- auto indexes = Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStoreIndex>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStoreIndex>> indexes = Inspector::Protocol::Array<Inspector::Protocol::IndexedDB::ObjectStoreIndex>::create();
</ins><span class="cx">
</span><span class="cx"> for (const IDBIndexMetadata& indexMetadata : objectStoreMetadata.indexes.values()) {
</span><del>- Ref<ObjectStoreIndex> objectStoreIndex = ObjectStoreIndex::create()
</del><ins>+ RefPtr<ObjectStoreIndex> objectStoreIndex = ObjectStoreIndex::create()
</ins><span class="cx"> .setName(indexMetadata.name)
</span><span class="cx"> .setKeyPath(keyPathFromIDBKeyPath(indexMetadata.keyPath))
</span><span class="cx"> .setUnique(indexMetadata.unique)
</span><del>- .setMultiEntry(indexMetadata.multiEntry)
- .release();
- indexes->addItem(WTF::move(objectStoreIndex));
</del><ins>+ .setMultiEntry(indexMetadata.multiEntry);
+ indexes->addItem(objectStoreIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<ObjectStore> objectStore = ObjectStore::create()
</del><ins>+ RefPtr<ObjectStore> objectStore = ObjectStore::create()
</ins><span class="cx"> .setName(objectStoreMetadata.name)
</span><span class="cx"> .setKeyPath(keyPathFromIDBKeyPath(objectStoreMetadata.keyPath))
</span><span class="cx"> .setAutoIncrement(objectStoreMetadata.autoIncrement)
</span><del>- .setIndexes(WTF::move(indexes))
- .release();
</del><ins>+ .setIndexes(indexes);
</ins><span class="cx">
</span><del>- objectStores->addItem(WTF::move(objectStore));
</del><ins>+ objectStores->addItem(objectStore);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<DatabaseWithObjectStores> result = DatabaseWithObjectStores::create()
</del><ins>+ RefPtr<DatabaseWithObjectStores> result = DatabaseWithObjectStores::create()
</ins><span class="cx"> .setName(databaseMetadata.name)
</span><span class="cx"> .setVersion(databaseMetadata.version)
</span><del>- .setObjectStores(WTF::move(objectStores))
- .release();
</del><ins>+ .setObjectStores(objectStores);
</ins><span class="cx">
</span><del>- m_requestCallback->sendSuccess(WTF::move(result));
</del><ins>+ m_requestCallback->sendSuccess(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- virtual RequestCallback& requestCallback() override { return m_requestCallback.get(); }
</del><ins>+ virtual RequestCallback* requestCallback() override { return m_requestCallback.get(); }
</ins><span class="cx"> private:
</span><del>- DatabaseLoader(ScriptExecutionContext* context, Ref<RequestDatabaseCallback>&& requestCallback)
</del><ins>+ DatabaseLoader(ScriptExecutionContext* context, PassRefPtr<RequestDatabaseCallback> requestCallback)
</ins><span class="cx"> : ExecutableWithDatabase(context)
</span><del>- , m_requestCallback(WTF::move(requestCallback)) { }
- Ref<RequestDatabaseCallback> m_requestCallback;
</del><ins>+ , m_requestCallback(requestCallback) { }
+ RefPtr<RequestDatabaseCallback> m_requestCallback;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-static RefPtr<IDBKey> idbKeyFromInspectorObject(InspectorObject* key)
</del><ins>+static PassRefPtr<IDBKey> idbKeyFromInspectorObject(InspectorObject* key)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<IDBKey> idbKey;
</span><span class="cx">
</span><span class="lines">@@ -361,9 +352,7 @@
</span><span class="cx"> idbKey = IDBKey::createDate(date);
</span><span class="cx"> } else if (type == arrayType) {
</span><span class="cx"> IDBKey::KeyArray keyArray;
</span><del>- RefPtr<InspectorArray> array;
- if (!key->getArray("array", array))
- return nullptr;
</del><ins>+ RefPtr<InspectorArray> array = key->getArray("array");
</ins><span class="cx"> for (size_t i = 0; i < array->length(); ++i) {
</span><span class="cx"> RefPtr<InspectorValue> value = array->get(i);
</span><span class="cx"> RefPtr<InspectorObject> object;
</span><span class="lines">@@ -378,21 +367,17 @@
</span><span class="cx"> return idbKey.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<IDBKeyRange> idbKeyRangeFromKeyRange(InspectorObject* keyRange)
</del><ins>+static PassRefPtr<IDBKeyRange> idbKeyRangeFromKeyRange(InspectorObject* keyRange)
</ins><span class="cx"> {
</span><del>- RefPtr<InspectorObject> lower;
- if (!keyRange->getObject("lower", lower))
</del><ins>+ RefPtr<InspectorObject> lower = keyRange->getObject("lower");
+ RefPtr<IDBKey> idbLower = lower ? idbKeyFromInspectorObject(lower.get()) : nullptr;
+ if (lower && !idbLower)
</ins><span class="cx"> return nullptr;
</span><del>- RefPtr<IDBKey> idbLower = idbKeyFromInspectorObject(lower.get());
- if (!idbLower)
- return nullptr;
</del><span class="cx">
</span><del>- RefPtr<InspectorObject> upper;
- if (!keyRange->getObject("upper", upper))
</del><ins>+ RefPtr<InspectorObject> upper = keyRange->getObject("upper");
+ RefPtr<IDBKey> idbUpper = upper ? idbKeyFromInspectorObject(upper.get()) : nullptr;
+ if (upper && !idbUpper)
</ins><span class="cx"> return nullptr;
</span><del>- RefPtr<IDBKey> idbUpper = idbKeyFromInspectorObject(upper.get());
- if (!idbUpper)
- return nullptr;
</del><span class="cx">
</span><span class="cx"> bool lowerOpen;
</span><span class="cx"> if (!keyRange->getBoolean("lowerOpen", lowerOpen))
</span><span class="lines">@@ -404,16 +389,17 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> IDBKeyRange::UpperBoundType upperBoundType = upperOpen ? IDBKeyRange::UpperBoundOpen : IDBKeyRange::UpperBoundClosed;
</span><span class="cx">
</span><del>- return IDBKeyRange::create(idbLower, idbUpper, lowerBoundType, upperBoundType);
</del><ins>+ RefPtr<IDBKeyRange> idbKeyRange = IDBKeyRange::create(idbLower, idbUpper, lowerBoundType, upperBoundType);
+ return idbKeyRange.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class DataLoader;
</span><span class="cx">
</span><span class="cx"> class OpenCursorCallback : public EventListener {
</span><span class="cx"> public:
</span><del>- static Ref<OpenCursorCallback> create(InjectedScript injectedScript, Ref<RequestDataCallback>&& requestCallback, int skipCount, unsigned pageSize)
</del><ins>+ static PassRefPtr<OpenCursorCallback> create(InjectedScript injectedScript, PassRefPtr<RequestDataCallback> requestCallback, int skipCount, unsigned pageSize)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new OpenCursorCallback(injectedScript, WTF::move(requestCallback), skipCount, pageSize));
</del><ins>+ return adoptRef(new OpenCursorCallback(injectedScript, requestCallback, skipCount, pageSize));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~OpenCursorCallback() { }
</span><span class="lines">@@ -472,9 +458,8 @@
</span><span class="cx"> RefPtr<DataEntry> dataEntry = DataEntry::create()
</span><span class="cx"> .setKey(m_injectedScript.wrapObject(idbCursor->key(), String()))
</span><span class="cx"> .setPrimaryKey(m_injectedScript.wrapObject(idbCursor->primaryKey(), String()))
</span><del>- .setValue(m_injectedScript.wrapObject(idbCursor->value(), String()))
- .release();
- m_result->addItem(WTF::move(dataEntry));
</del><ins>+ .setValue(m_injectedScript.wrapObject(idbCursor->value(), String()));
+ m_result->addItem(dataEntry);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -482,40 +467,41 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_requestCallback->isActive())
</span><span class="cx"> return;
</span><del>- m_requestCallback->sendSuccess(WTF::move(m_result), hasMore);
</del><ins>+ m_requestCallback->sendSuccess(m_result.release(), hasMore);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- OpenCursorCallback(InjectedScript injectedScript, Ref<RequestDataCallback>&& requestCallback, int skipCount, unsigned pageSize)
</del><ins>+ OpenCursorCallback(InjectedScript injectedScript, PassRefPtr<RequestDataCallback> requestCallback, int skipCount, unsigned pageSize)
</ins><span class="cx"> : EventListener(EventListener::CPPEventListenerType)
</span><span class="cx"> , m_injectedScript(injectedScript)
</span><del>- , m_requestCallback(WTF::move(requestCallback))
</del><ins>+ , m_requestCallback(requestCallback)
</ins><span class="cx"> , m_skipCount(skipCount)
</span><span class="cx"> , m_pageSize(pageSize)
</span><del>- , m_result(Array<DataEntry>::create())
</del><span class="cx"> {
</span><ins>+ m_result = Array<DataEntry>::create();
</ins><span class="cx"> }
</span><span class="cx"> InjectedScript m_injectedScript;
</span><del>- Ref<RequestDataCallback> m_requestCallback;
</del><ins>+ RefPtr<RequestDataCallback> m_requestCallback;
</ins><span class="cx"> int m_skipCount;
</span><span class="cx"> unsigned m_pageSize;
</span><del>- Ref<Array<DataEntry>> m_result;
</del><ins>+ RefPtr<Array<DataEntry>> m_result;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class DataLoader : public ExecutableWithDatabase {
</span><span class="cx"> public:
</span><del>- static Ref<DataLoader> create(ScriptExecutionContext* context, Ref<RequestDataCallback>&& requestCallback, const InjectedScript& injectedScript, const String& objectStoreName, const String& indexName, RefPtr<IDBKeyRange>&& idbKeyRange, int skipCount, unsigned pageSize)
</del><ins>+ static PassRefPtr<DataLoader> create(ScriptExecutionContext* context, PassRefPtr<RequestDataCallback> requestCallback, const InjectedScript& injectedScript, const String& objectStoreName, const String& indexName, PassRefPtr<IDBKeyRange> idbKeyRange, int skipCount, unsigned pageSize)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DataLoader(context, WTF::move(requestCallback), injectedScript, objectStoreName, indexName, WTF::move(idbKeyRange), skipCount, pageSize));
</del><ins>+ return adoptRef(new DataLoader(context, requestCallback, injectedScript, objectStoreName, indexName, idbKeyRange, skipCount, pageSize));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~DataLoader() { }
</span><span class="cx">
</span><del>- virtual void execute(RefPtr<IDBDatabase>&& database) override
</del><ins>+ virtual void execute(PassRefPtr<IDBDatabase> prpDatabase) override
</ins><span class="cx"> {
</span><del>- if (!requestCallback().isActive())
</del><ins>+ RefPtr<IDBDatabase> idbDatabase = prpDatabase;
+ if (!requestCallback()->isActive())
</ins><span class="cx"> return;
</span><del>- RefPtr<IDBTransaction> idbTransaction = transactionForDatabase(context(), database.get(), m_objectStoreName);
</del><ins>+ RefPtr<IDBTransaction> idbTransaction = transactionForDatabase(context(), idbDatabase.get(), m_objectStoreName);
</ins><span class="cx"> if (!idbTransaction) {
</span><span class="cx"> m_requestCallback->sendFailure("Could not get transaction");
</span><span class="cx"> return;
</span><span class="lines">@@ -526,7 +512,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<OpenCursorCallback> openCursorCallback = OpenCursorCallback::create(m_injectedScript, m_requestCallback.copyRef(), m_skipCount, m_pageSize);
</del><ins>+ RefPtr<OpenCursorCallback> openCursorCallback = OpenCursorCallback::create(m_injectedScript, m_requestCallback, m_skipCount, m_pageSize);
</ins><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> RefPtr<IDBRequest> idbRequest;
</span><span class="lines">@@ -537,23 +523,23 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- idbRequest = idbIndex->openCursor(context(), m_idbKeyRange.copyRef(), ec);
</del><ins>+ idbRequest = idbIndex->openCursor(context(), PassRefPtr<IDBKeyRange>(m_idbKeyRange), ec);
</ins><span class="cx"> } else
</span><del>- idbRequest = idbObjectStore->openCursor(context(), m_idbKeyRange.copyRef(), ec);
- idbRequest->addEventListener(eventNames().successEvent, WTF::move(openCursorCallback), false);
</del><ins>+ idbRequest = idbObjectStore->openCursor(context(), PassRefPtr<IDBKeyRange>(m_idbKeyRange), ec);
+ idbRequest->addEventListener(eventNames().successEvent, openCursorCallback, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- virtual RequestCallback& requestCallback() override { return m_requestCallback.get(); }
- DataLoader(ScriptExecutionContext* scriptExecutionContext, Ref<RequestDataCallback>&& requestCallback, const InjectedScript& injectedScript, const String& objectStoreName, const String& indexName, RefPtr<IDBKeyRange> idbKeyRange, int skipCount, unsigned pageSize)
</del><ins>+ virtual RequestCallback* requestCallback() override { return m_requestCallback.get(); }
+ DataLoader(ScriptExecutionContext* scriptExecutionContext, PassRefPtr<RequestDataCallback> requestCallback, const InjectedScript& injectedScript, const String& objectStoreName, const String& indexName, PassRefPtr<IDBKeyRange> idbKeyRange, int skipCount, unsigned pageSize)
</ins><span class="cx"> : ExecutableWithDatabase(scriptExecutionContext)
</span><del>- , m_requestCallback(WTF::move(requestCallback))
</del><ins>+ , m_requestCallback(requestCallback)
</ins><span class="cx"> , m_injectedScript(injectedScript)
</span><span class="cx"> , m_objectStoreName(objectStoreName)
</span><span class="cx"> , m_indexName(indexName)
</span><del>- , m_idbKeyRange(WTF::move(idbKeyRange))
</del><ins>+ , m_idbKeyRange(idbKeyRange)
</ins><span class="cx"> , m_skipCount(skipCount)
</span><span class="cx"> , m_pageSize(pageSize) { }
</span><del>- Ref<RequestDataCallback> m_requestCallback;
</del><ins>+ RefPtr<RequestDataCallback> m_requestCallback;
</ins><span class="cx"> InjectedScript m_injectedScript;
</span><span class="cx"> String m_objectStoreName;
</span><span class="cx"> String m_indexName;
</span><span class="lines">@@ -619,7 +605,7 @@
</span><span class="cx"> return idbFactory;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::requestDatabaseNames(ErrorString& errorString, const String& securityOrigin, Ref<RequestDatabaseNamesCallback>&& requestCallback)
</del><ins>+void InspectorIndexedDBAgent::requestDatabaseNames(ErrorString& errorString, const String& securityOrigin, PassRefPtr<RequestDatabaseNamesCallback> requestCallback)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = m_pageAgent->findFrameWithSecurityOrigin(securityOrigin);
</span><span class="cx"> Document* document = assertDocument(errorString, frame);
</span><span class="lines">@@ -637,10 +623,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- idbRequest->addEventListener(eventNames().successEvent, GetDatabaseNamesCallback::create(WTF::move(requestCallback), document->securityOrigin()->toRawString()), false);
</del><ins>+ idbRequest->addEventListener(eventNames().successEvent, GetDatabaseNamesCallback::create(requestCallback, document->securityOrigin()->toRawString()), false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::requestDatabase(ErrorString& errorString, const String& securityOrigin, const String& databaseName, Ref<RequestDatabaseCallback>&& requestCallback)
</del><ins>+void InspectorIndexedDBAgent::requestDatabase(ErrorString& errorString, const String& securityOrigin, const String& databaseName, PassRefPtr<RequestDatabaseCallback> requestCallback)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = m_pageAgent->findFrameWithSecurityOrigin(securityOrigin);
</span><span class="cx"> Document* document = assertDocument(errorString, frame);
</span><span class="lines">@@ -651,11 +637,11 @@
</span><span class="cx"> if (!idbFactory)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Ref<DatabaseLoader> databaseLoader = DatabaseLoader::create(document, WTF::move(requestCallback));
</del><ins>+ RefPtr<DatabaseLoader> databaseLoader = DatabaseLoader::create(document, requestCallback);
</ins><span class="cx"> databaseLoader->start(idbFactory, document->securityOrigin(), databaseName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::requestData(ErrorString& errorString, const String& securityOrigin, const String& databaseName, const String& objectStoreName, const String& indexName, int skipCount, int pageSize, const RefPtr<InspectorObject>&& keyRange, Ref<RequestDataCallback>&& requestCallback)
</del><ins>+void InspectorIndexedDBAgent::requestData(ErrorString& errorString, const String& securityOrigin, const String& databaseName, const String& objectStoreName, const String& indexName, int skipCount, int pageSize, const RefPtr<InspectorObject>* keyRange, PassRefPtr<RequestDataCallback> requestCallback)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = m_pageAgent->findFrameWithSecurityOrigin(securityOrigin);
</span><span class="cx"> Document* document = assertDocument(errorString, frame);
</span><span class="lines">@@ -668,22 +654,22 @@
</span><span class="cx">
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(mainWorldExecState(frame));
</span><span class="cx">
</span><del>- RefPtr<IDBKeyRange> idbKeyRange = keyRange ? idbKeyRangeFromKeyRange(keyRange.get()) : nullptr;
</del><ins>+ RefPtr<IDBKeyRange> idbKeyRange = keyRange ? idbKeyRangeFromKeyRange(keyRange->get()) : nullptr;
</ins><span class="cx"> if (keyRange && !idbKeyRange) {
</span><span class="cx"> errorString = ASCIILiteral("Can not parse key range.");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<DataLoader> dataLoader = DataLoader::create(document, WTF::move(requestCallback), injectedScript, objectStoreName, indexName, WTF::move(idbKeyRange), skipCount, pageSize);
</del><ins>+ RefPtr<DataLoader> dataLoader = DataLoader::create(document, requestCallback, injectedScript, objectStoreName, indexName, idbKeyRange, skipCount, pageSize);
</ins><span class="cx"> dataLoader->start(idbFactory, document->securityOrigin(), databaseName);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class ClearObjectStoreListener : public EventListener {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ClearObjectStoreListener);
</span><span class="cx"> public:
</span><del>- static Ref<ClearObjectStoreListener> create(Ref<ClearObjectStoreCallback> requestCallback)
</del><ins>+ static PassRefPtr<ClearObjectStoreListener> create(PassRefPtr<ClearObjectStoreCallback> requestCallback)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new ClearObjectStoreListener(WTF::move(requestCallback)));
</del><ins>+ return adoptRef(new ClearObjectStoreListener(requestCallback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~ClearObjectStoreListener() { }
</span><span class="lines">@@ -705,35 +691,36 @@
</span><span class="cx"> m_requestCallback->sendSuccess();
</span><span class="cx"> }
</span><span class="cx"> private:
</span><del>- ClearObjectStoreListener(Ref<ClearObjectStoreCallback>&& requestCallback)
</del><ins>+ ClearObjectStoreListener(PassRefPtr<ClearObjectStoreCallback> requestCallback)
</ins><span class="cx"> : EventListener(EventListener::CPPEventListenerType)
</span><del>- , m_requestCallback(WTF::move(requestCallback))
</del><ins>+ , m_requestCallback(requestCallback)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Ref<ClearObjectStoreCallback> m_requestCallback;
</del><ins>+ RefPtr<ClearObjectStoreCallback> m_requestCallback;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class ClearObjectStore : public ExecutableWithDatabase {
</span><span class="cx"> public:
</span><del>- static Ref<ClearObjectStore> create(ScriptExecutionContext* context, const String& objectStoreName, Ref<ClearObjectStoreCallback>&& requestCallback)
</del><ins>+ static PassRefPtr<ClearObjectStore> create(ScriptExecutionContext* context, const String& objectStoreName, PassRefPtr<ClearObjectStoreCallback> requestCallback)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new ClearObjectStore(context, objectStoreName, WTF::move(requestCallback)));
</del><ins>+ return adoptRef(new ClearObjectStore(context, objectStoreName, requestCallback));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- ClearObjectStore(ScriptExecutionContext* context, const String& objectStoreName, Ref<ClearObjectStoreCallback>&& requestCallback)
</del><ins>+ ClearObjectStore(ScriptExecutionContext* context, const String& objectStoreName, PassRefPtr<ClearObjectStoreCallback> requestCallback)
</ins><span class="cx"> : ExecutableWithDatabase(context)
</span><span class="cx"> , m_objectStoreName(objectStoreName)
</span><del>- , m_requestCallback(WTF::move(requestCallback))
</del><ins>+ , m_requestCallback(requestCallback)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void execute(RefPtr<IDBDatabase>&& database) override
</del><ins>+ virtual void execute(PassRefPtr<IDBDatabase> prpDatabase) override
</ins><span class="cx"> {
</span><del>- if (!requestCallback().isActive())
</del><ins>+ RefPtr<IDBDatabase> idbDatabase = prpDatabase;
+ if (!requestCallback()->isActive())
</ins><span class="cx"> return;
</span><del>- RefPtr<IDBTransaction> idbTransaction = transactionForDatabase(context(), database.get(), m_objectStoreName, IDBTransaction::modeReadWrite());
</del><ins>+ RefPtr<IDBTransaction> idbTransaction = transactionForDatabase(context(), idbDatabase.get(), m_objectStoreName, IDBTransaction::modeReadWrite());
</ins><span class="cx"> if (!idbTransaction) {
</span><span class="cx"> m_requestCallback->sendFailure("Could not get transaction");
</span><span class="cx"> return;
</span><span class="lines">@@ -751,16 +738,16 @@
</span><span class="cx"> m_requestCallback->sendFailure(String::format("Could not clear object store '%s': %d", m_objectStoreName.utf8().data(), ec));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- idbTransaction->addEventListener(eventNames().completeEvent, ClearObjectStoreListener::create(m_requestCallback.copyRef()), false);
</del><ins>+ idbTransaction->addEventListener(eventNames().completeEvent, ClearObjectStoreListener::create(m_requestCallback), false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- virtual RequestCallback& requestCallback() override { return m_requestCallback.get(); }
</del><ins>+ virtual RequestCallback* requestCallback() override { return m_requestCallback.get(); }
</ins><span class="cx"> private:
</span><span class="cx"> const String m_objectStoreName;
</span><del>- Ref<ClearObjectStoreCallback> m_requestCallback;
</del><ins>+ RefPtr<ClearObjectStoreCallback> m_requestCallback;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::clearObjectStore(ErrorString& errorString, const String& securityOrigin, const String& databaseName, const String& objectStoreName, Ref<ClearObjectStoreCallback>&& requestCallback)
</del><ins>+void InspectorIndexedDBAgent::clearObjectStore(ErrorString& errorString, const String& securityOrigin, const String& databaseName, const String& objectStoreName, PassRefPtr<ClearObjectStoreCallback> requestCallback)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = m_pageAgent->findFrameWithSecurityOrigin(securityOrigin);
</span><span class="cx"> Document* document = assertDocument(errorString, frame);
</span><span class="lines">@@ -770,7 +757,7 @@
</span><span class="cx"> if (!idbFactory)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Ref<ClearObjectStore> clearObjectStore = ClearObjectStore::create(document, objectStoreName, WTF::move(requestCallback));
</del><ins>+ RefPtr<ClearObjectStore> clearObjectStore = ClearObjectStore::create(document, objectStoreName, requestCallback);
</ins><span class="cx"> clearObjectStore->start(idbFactory, document->securityOrigin(), databaseName);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -58,10 +58,10 @@
</span><span class="cx"> // Called from the front-end.
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span><del>- virtual void requestDatabaseNames(ErrorString&, const String& securityOrigin, Ref<RequestDatabaseNamesCallback>&&) override;
- virtual void requestDatabase(ErrorString&, const String& securityOrigin, const String& databaseName, Ref<RequestDatabaseCallback>&&) override;
- virtual void requestData(ErrorString&, const String& securityOrigin, const String& databaseName, const String& objectStoreName, const String& indexName, int skipCount, int pageSize, const RefPtr<Inspector::InspectorObject>&& keyRange, Ref<RequestDataCallback>&&) override;
- virtual void clearObjectStore(ErrorString&, const String& in_securityOrigin, const String& in_databaseName, const String& in_objectStoreName, Ref<ClearObjectStoreCallback>&&) override;
</del><ins>+ virtual void requestDatabaseNames(ErrorString&, const String& securityOrigin, PassRefPtr<RequestDatabaseNamesCallback>) override;
+ virtual void requestDatabase(ErrorString&, const String& securityOrigin, const String& databaseName, PassRefPtr<RequestDatabaseCallback>) override;
+ virtual void requestData(ErrorString&, const String& securityOrigin, const String& databaseName, const String& objectStoreName, const String& indexName, int skipCount, int pageSize, const RefPtr<Inspector::InspectorObject>* keyRange, PassRefPtr<RequestDataCallback>) override;
+ virtual void clearObjectStore(ErrorString&, const String& in_securityOrigin, const String& in_databaseName, const String& in_objectStoreName, PassRefPtr<ClearObjectStoreCallback>) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Inspector::InjectedScriptManager* m_injectedScriptManager;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -689,10 +689,10 @@
</span><span class="cx"> resourceAgent->documentThreadableLoaderStartedLoadingForClient(identifier, client);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::willLoadXHRImpl(InstrumentingAgents& instrumentingAgents, ThreadableLoaderClient* client, const String& method, const URL& url, bool async, RefPtr<FormData>&& formData, const HTTPHeaderMap& headers, bool includeCredentials)
</del><ins>+void InspectorInstrumentation::willLoadXHRImpl(InstrumentingAgents& instrumentingAgents, ThreadableLoaderClient* client, const String& method, const URL& url, bool async, PassRefPtr<FormData> formData, const HTTPHeaderMap& headers, bool includeCredentials)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span><del>- resourceAgent->willLoadXHR(client, method, url, async, WTF::move(formData), headers, includeCredentials);
</del><ins>+ resourceAgent->willLoadXHR(client, method, url, async, formData, headers, includeCredentials);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didFailXHRLoadingImpl(InstrumentingAgents& instrumentingAgents, ThreadableLoaderClient* client)
</span><span class="lines">@@ -916,7 +916,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Drop this once we no longer generate stacks outside of Inspector.
</span><del>-void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents& instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, RefPtr<ScriptCallStack>&& callStack, unsigned long requestIdentifier)
</del><ins>+void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents& instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent())
</span><span class="cx"> consoleAgent->addMessageToConsole(source, type, level, message, callStack, requestIdentifier);
</span><span class="lines">@@ -927,7 +927,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents& instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, RefPtr<ScriptArguments>&& arguments, unsigned long requestIdentifier)
</del><ins>+void InspectorInstrumentation::addMessageToConsoleImpl(InstrumentingAgents& instrumentingAgents, MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent())
</span><span class="cx"> consoleAgent->addMessageToConsole(source, type, level, message, state, arguments, requestIdentifier);
</span><span class="lines">@@ -949,7 +949,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::consoleCountImpl(InstrumentingAgents& instrumentingAgents, JSC::ExecState* state, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void InspectorInstrumentation::consoleCountImpl(InstrumentingAgents& instrumentingAgents, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><span class="cx"> if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent())
</span><span class="cx"> consoleAgent->count(state, arguments);
</span><span class="lines">@@ -963,7 +963,7 @@
</span><span class="cx"> consoleAgent->startTiming(title);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::stopConsoleTimingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame, const String& title, RefPtr<ScriptCallStack>&& stack)
</del><ins>+void InspectorInstrumentation::stopConsoleTimingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame, const String& title, PassRefPtr<ScriptCallStack> stack)
</ins><span class="cx"> {
</span><span class="cx"> if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent())
</span><span class="cx"> consoleAgent->stopTiming(title, stack);
</span><span class="lines">@@ -971,7 +971,7 @@
</span><span class="cx"> timelineAgent->timeEnd(frame, title);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::consoleTimeStampImpl(InstrumentingAgents& instrumentingAgents, Frame& frame, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void InspectorInstrumentation::consoleTimeStampImpl(InstrumentingAgents& instrumentingAgents, Frame& frame, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent()) {
</span><span class="cx"> String message;
</span><span class="lines">@@ -986,7 +986,7 @@
</span><span class="cx"> timelineAgent->startFromConsole(exec, title);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<JSC::Profile> InspectorInstrumentation::stopProfilingImpl(InstrumentingAgents& instrumentingAgents, JSC::ExecState* exec, const String& title)
</del><ins>+PassRefPtr<JSC::Profile> InspectorInstrumentation::stopProfilingImpl(InstrumentingAgents& instrumentingAgents, JSC::ExecState* exec, const String& title)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.persistentInspectorTimelineAgent())
</span><span class="cx"> return timelineAgent->stopFromConsole(exec, title);
</span><span class="lines">@@ -994,7 +994,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>-void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents& instrumentingAgents, RefPtr<Database>&& database, const String& domain, const String& name, const String& version)
</del><ins>+void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents& instrumentingAgents, PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
</ins><span class="cx"> {
</span><span class="cx"> if (!instrumentingAgents.inspectorEnvironment().developerExtrasEnabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -1107,40 +1107,40 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><del>-void InspectorInstrumentation::sessionCreatedImpl(InstrumentingAgents& instrumentingAgents, RefPtr<ReplaySession>&& session)
</del><ins>+void InspectorInstrumentation::sessionCreatedImpl(InstrumentingAgents& instrumentingAgents, PassRefPtr<ReplaySession> session)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorReplayAgent* replayAgent = instrumentingAgents.inspectorReplayAgent())
</span><del>- replayAgent->sessionCreated(WTF::move(session));
</del><ins>+ replayAgent->sessionCreated(session);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::sessionLoadedImpl(InstrumentingAgents& instrumentingAgents, RefPtr<ReplaySession>&& session)
</del><ins>+void InspectorInstrumentation::sessionLoadedImpl(InstrumentingAgents& instrumentingAgents, PassRefPtr<ReplaySession> session)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorReplayAgent* replayAgent = instrumentingAgents.inspectorReplayAgent())
</span><del>- replayAgent->sessionLoaded(WTF::move(session));
</del><ins>+ replayAgent->sessionLoaded(session);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::sessionModifiedImpl(InstrumentingAgents& instrumentingAgents, RefPtr<ReplaySession>&& session)
</del><ins>+void InspectorInstrumentation::sessionModifiedImpl(InstrumentingAgents& instrumentingAgents, PassRefPtr<ReplaySession> session)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorReplayAgent* replayAgent = instrumentingAgents.inspectorReplayAgent())
</span><del>- replayAgent->sessionModified(WTF::move(session));
</del><ins>+ replayAgent->sessionModified(session);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::segmentCreatedImpl(InstrumentingAgents& instrumentingAgents, RefPtr<ReplaySessionSegment>&& segment)
</del><ins>+void InspectorInstrumentation::segmentCreatedImpl(InstrumentingAgents& instrumentingAgents, PassRefPtr<ReplaySessionSegment> segment)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorReplayAgent* replayAgent = instrumentingAgents.inspectorReplayAgent())
</span><del>- replayAgent->segmentCreated(WTF::move(segment));
</del><ins>+ replayAgent->segmentCreated(segment);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::segmentCompletedImpl(InstrumentingAgents& instrumentingAgents, RefPtr<ReplaySessionSegment>&& segment)
</del><ins>+void InspectorInstrumentation::segmentCompletedImpl(InstrumentingAgents& instrumentingAgents, PassRefPtr<ReplaySessionSegment> segment)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorReplayAgent* replayAgent = instrumentingAgents.inspectorReplayAgent())
</span><del>- replayAgent->segmentCompleted(WTF::move(segment));
</del><ins>+ replayAgent->segmentCompleted(segment);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::segmentLoadedImpl(InstrumentingAgents& instrumentingAgents, RefPtr<ReplaySessionSegment>&& segment)
</del><ins>+void InspectorInstrumentation::segmentLoadedImpl(InstrumentingAgents& instrumentingAgents, PassRefPtr<ReplaySessionSegment> segment)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorReplayAgent* replayAgent = instrumentingAgents.inspectorReplayAgent())
</span><del>- replayAgent->segmentLoaded(WTF::move(segment));
</del><ins>+ replayAgent->segmentLoaded(segment);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::segmentUnloadedImpl(InstrumentingAgents& instrumentingAgents)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> static void didFinishLoading(Frame*, DocumentLoader*, unsigned long identifier, double finishTime);
</span><span class="cx"> static void didFailLoading(Frame*, DocumentLoader*, unsigned long identifier, const ResourceError&);
</span><span class="cx"> static void documentThreadableLoaderStartedLoadingForClient(Document&, unsigned long identifier, ThreadableLoaderClient*);
</span><del>- static void willLoadXHR(ScriptExecutionContext*, ThreadableLoaderClient*, const String&, const URL&, bool, RefPtr<FormData>&&, const HTTPHeaderMap&, bool);
</del><ins>+ static void willLoadXHR(ScriptExecutionContext*, ThreadableLoaderClient*, const String&, const URL&, bool, PassRefPtr<FormData>, const HTTPHeaderMap&, bool);
</ins><span class="cx"> static void didFailXHRLoading(ScriptExecutionContext*, ThreadableLoaderClient*);
</span><span class="cx"> static void didFinishXHRLoading(ScriptExecutionContext*, ThreadableLoaderClient*, unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
</span><span class="cx"> static void didReceiveXHRResponse(ScriptExecutionContext*, unsigned long identifier);
</span><span class="lines">@@ -213,18 +213,18 @@
</span><span class="cx"> static void didWriteHTML(const InspectorInstrumentationCookie&, unsigned endLine);
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove once we no longer generate stacks outside of Inspector.
</span><del>- static void addMessageToConsole(Page&, MessageSource, MessageType, MessageLevel, const String& message, RefPtr<Inspector::ScriptCallStack>&&, unsigned long requestIdentifier = 0);
- static void addMessageToConsole(Page&, MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&, unsigned long requestIdentifier = 0);
</del><ins>+ static void addMessageToConsole(Page&, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<Inspector::ScriptCallStack>, unsigned long requestIdentifier = 0);
+ static void addMessageToConsole(Page&, MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>, unsigned long requestIdentifier = 0);
</ins><span class="cx"> static void addMessageToConsole(Page&, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
</span><span class="cx">
</span><span class="cx"> // FIXME: Convert to ScriptArguments to match non-worker context.
</span><del>- static void addMessageToConsole(WorkerGlobalScope*, MessageSource, MessageType, MessageLevel, const String& message, RefPtr<Inspector::ScriptCallStack>&&, unsigned long requestIdentifier = 0);
</del><ins>+ static void addMessageToConsole(WorkerGlobalScope*, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<Inspector::ScriptCallStack>, unsigned long requestIdentifier = 0);
</ins><span class="cx"> static void addMessageToConsole(WorkerGlobalScope*, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
</span><span class="cx">
</span><del>- static void consoleCount(Page&, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ static void consoleCount(Page&, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx"> static void startConsoleTiming(Frame&, const String& title);
</span><del>- static void stopConsoleTiming(Frame&, const String& title, RefPtr<Inspector::ScriptCallStack>&&);
- static void consoleTimeStamp(Frame&, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ static void stopConsoleTiming(Frame&, const String& title, PassRefPtr<Inspector::ScriptCallStack>);
+ static void consoleTimeStamp(Frame&, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx">
</span><span class="cx"> static void didRequestAnimationFrame(Document*, int callbackId);
</span><span class="cx"> static void didCancelAnimationFrame(Document*, int callbackId);
</span><span class="lines">@@ -232,10 +232,10 @@
</span><span class="cx"> static void didFireAnimationFrame(const InspectorInstrumentationCookie&);
</span><span class="cx">
</span><span class="cx"> static void startProfiling(Page&, JSC::ExecState*, const String& title);
</span><del>- static RefPtr<JSC::Profile> stopProfiling(Page&, JSC::ExecState*, const String& title);
</del><ins>+ static PassRefPtr<JSC::Profile> stopProfiling(Page&, JSC::ExecState*, const String& title);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- static void didOpenDatabase(ScriptExecutionContext*, RefPtr<Database>&&, const String& domain, const String& name, const String& version);
</del><ins>+ static void didOpenDatabase(ScriptExecutionContext*, PassRefPtr<Database>, const String& domain, const String& name, const String& version);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static void didDispatchDOMStorageEvent(const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
</span><span class="lines">@@ -246,13 +246,13 @@
</span><span class="cx"> static void willEvaluateWorkerScript(WorkerGlobalScope*, int workerThreadStartMode);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><del>- static void sessionCreated(Page&, RefPtr<ReplaySession>&&);
- static void sessionLoaded(Page&, RefPtr<ReplaySession>&&);
- static void sessionModified(Page&, RefPtr<ReplaySession>&&);
</del><ins>+ static void sessionCreated(Page&, PassRefPtr<ReplaySession>);
+ static void sessionLoaded(Page&, PassRefPtr<ReplaySession>);
+ static void sessionModified(Page&, PassRefPtr<ReplaySession>);
</ins><span class="cx">
</span><del>- static void segmentCreated(Page&, RefPtr<ReplaySessionSegment>&&);
- static void segmentCompleted(Page&, RefPtr<ReplaySessionSegment>&&);
- static void segmentLoaded(Page&, RefPtr<ReplaySessionSegment>&&);
</del><ins>+ static void segmentCreated(Page&, PassRefPtr<ReplaySessionSegment>);
+ static void segmentCompleted(Page&, PassRefPtr<ReplaySessionSegment>);
+ static void segmentLoaded(Page&, PassRefPtr<ReplaySessionSegment>);
</ins><span class="cx"> static void segmentUnloaded(Page&);
</span><span class="cx">
</span><span class="cx"> static void captureStarted(Page&);
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> static void didFinishLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, double finishTime);
</span><span class="cx"> static void didFailLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const ResourceError&);
</span><span class="cx"> static void documentThreadableLoaderStartedLoadingForClientImpl(InstrumentingAgents&, unsigned long identifier, ThreadableLoaderClient*);
</span><del>- static void willLoadXHRImpl(InstrumentingAgents&, ThreadableLoaderClient*, const String&, const URL&, bool, RefPtr<FormData>&&, const HTTPHeaderMap&, bool);
</del><ins>+ static void willLoadXHRImpl(InstrumentingAgents&, ThreadableLoaderClient*, const String&, const URL&, bool, PassRefPtr<FormData>, const HTTPHeaderMap&, bool);
</ins><span class="cx"> static void didFailXHRLoadingImpl(InstrumentingAgents&, ThreadableLoaderClient*);
</span><span class="cx"> static void didFinishXHRLoadingImpl(InstrumentingAgents&, ThreadableLoaderClient*, unsigned long identifier, const String& sourceString, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
</span><span class="cx"> static void didReceiveXHRResponseImpl(InstrumentingAgents&, unsigned long identifier);
</span><span class="lines">@@ -412,16 +412,16 @@
</span><span class="cx"> static InspectorInstrumentationCookie willWriteHTMLImpl(InstrumentingAgents&, unsigned startLine, Frame*);
</span><span class="cx"> static void didWriteHTMLImpl(const InspectorInstrumentationCookie&, unsigned endLine);
</span><span class="cx">
</span><del>- static void addMessageToConsoleImpl(InstrumentingAgents&, MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&, unsigned long requestIdentifier);
</del><ins>+ static void addMessageToConsoleImpl(InstrumentingAgents&, MessageSource, MessageType, MessageLevel, const String& message, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>, unsigned long requestIdentifier);
</ins><span class="cx"> static void addMessageToConsoleImpl(InstrumentingAgents&, MessageSource, MessageType, MessageLevel, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState*, unsigned long requestIdentifier);
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove once we no longer generate stacks outside of Inspector.
</span><del>- static void addMessageToConsoleImpl(InstrumentingAgents&, MessageSource, MessageType, MessageLevel, const String& message, RefPtr<Inspector::ScriptCallStack>&&, unsigned long requestIdentifier);
</del><ins>+ static void addMessageToConsoleImpl(InstrumentingAgents&, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<Inspector::ScriptCallStack>, unsigned long requestIdentifier);
</ins><span class="cx">
</span><del>- static void consoleCountImpl(InstrumentingAgents&, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ static void consoleCountImpl(InstrumentingAgents&, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx"> static void startConsoleTimingImpl(InstrumentingAgents&, Frame&, const String& title);
</span><del>- static void stopConsoleTimingImpl(InstrumentingAgents&, Frame&, const String& title, RefPtr<Inspector::ScriptCallStack>&&);
- static void consoleTimeStampImpl(InstrumentingAgents&, Frame&, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ static void stopConsoleTimingImpl(InstrumentingAgents&, Frame&, const String& title, PassRefPtr<Inspector::ScriptCallStack>);
+ static void consoleTimeStampImpl(InstrumentingAgents&, Frame&, PassRefPtr<Inspector::ScriptArguments>);
</ins><span class="cx">
</span><span class="cx"> static void didRequestAnimationFrameImpl(InstrumentingAgents&, int callbackId, Frame*);
</span><span class="cx"> static void didCancelAnimationFrameImpl(InstrumentingAgents&, int callbackId, Frame*);
</span><span class="lines">@@ -429,10 +429,10 @@
</span><span class="cx"> static void didFireAnimationFrameImpl(const InspectorInstrumentationCookie&);
</span><span class="cx">
</span><span class="cx"> static void startProfilingImpl(InstrumentingAgents&, JSC::ExecState*, const String& title);
</span><del>- static RefPtr<JSC::Profile> stopProfilingImpl(InstrumentingAgents&, JSC::ExecState*, const String& title);
</del><ins>+ static PassRefPtr<JSC::Profile> stopProfilingImpl(InstrumentingAgents&, JSC::ExecState*, const String& title);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- static void didOpenDatabaseImpl(InstrumentingAgents&, RefPtr<Database>&&, const String& domain, const String& name, const String& version);
</del><ins>+ static void didOpenDatabaseImpl(InstrumentingAgents&, PassRefPtr<Database>, const String& domain, const String& name, const String& version);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static void didDispatchDOMStorageEventImpl(InstrumentingAgents&, const String& key, const String& oldValue, const String& newValue, StorageType, SecurityOrigin*, Page*);
</span><span class="lines">@@ -442,13 +442,13 @@
</span><span class="cx"> static void workerGlobalScopeTerminatedImpl(InstrumentingAgents&, WorkerGlobalScopeProxy*);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><del>- static void sessionCreatedImpl(InstrumentingAgents&, RefPtr<ReplaySession>&&);
- static void sessionLoadedImpl(InstrumentingAgents&, RefPtr<ReplaySession>&&);
- static void sessionModifiedImpl(InstrumentingAgents&, RefPtr<ReplaySession>&&);
</del><ins>+ static void sessionCreatedImpl(InstrumentingAgents&, PassRefPtr<ReplaySession>);
+ static void sessionLoadedImpl(InstrumentingAgents&, PassRefPtr<ReplaySession>);
+ static void sessionModifiedImpl(InstrumentingAgents&, PassRefPtr<ReplaySession>);
</ins><span class="cx">
</span><del>- static void segmentCreatedImpl(InstrumentingAgents&, RefPtr<ReplaySessionSegment>&&);
- static void segmentCompletedImpl(InstrumentingAgents&, RefPtr<ReplaySessionSegment>&&);
- static void segmentLoadedImpl(InstrumentingAgents&, RefPtr<ReplaySessionSegment>&&);
</del><ins>+ static void segmentCreatedImpl(InstrumentingAgents&, PassRefPtr<ReplaySessionSegment>);
+ static void segmentCompletedImpl(InstrumentingAgents&, PassRefPtr<ReplaySessionSegment>);
+ static void segmentLoadedImpl(InstrumentingAgents&, PassRefPtr<ReplaySessionSegment>);
</ins><span class="cx"> static void segmentUnloadedImpl(InstrumentingAgents&);
</span><span class="cx">
</span><span class="cx"> static void captureStartedImpl(InstrumentingAgents&);
</span><span class="lines">@@ -1386,11 +1386,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::willLoadXHR(ScriptExecutionContext* context, ThreadableLoaderClient* client, const String& method, const URL& url, bool async, RefPtr<FormData>&& formData, const HTTPHeaderMap& headers, bool includeCredentials)
</del><ins>+inline void InspectorInstrumentation::willLoadXHR(ScriptExecutionContext* context, ThreadableLoaderClient* client, const String& method, const URL& url, bool async, PassRefPtr<FormData> formData, const HTTPHeaderMap& headers, bool includeCredentials)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
</span><del>- willLoadXHRImpl(*instrumentingAgents, client, method, url, async, WTF::move(formData), headers, includeCredentials);
</del><ins>+ willLoadXHRImpl(*instrumentingAgents, client, method, url, async, formData, headers, includeCredentials);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(context);
</span><span class="cx"> UNUSED_PARAM(client);
</span><span class="lines">@@ -1796,72 +1796,72 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><del>-inline void InspectorInstrumentation::sessionCreated(Page& page, RefPtr<ReplaySession>&& session)
</del><ins>+inline void InspectorInstrumentation::sessionCreated(Page& page, PassRefPtr<ReplaySession> session)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><del>- sessionCreatedImpl(*instrumentingAgents, WTF::move(session));
</del><ins>+ sessionCreatedImpl(*instrumentingAgents, session);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> UNUSED_PARAM(session);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::sessionLoaded(Page& page, RefPtr<ReplaySession>&& session)
</del><ins>+inline void InspectorInstrumentation::sessionLoaded(Page& page, PassRefPtr<ReplaySession> session)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><del>- sessionLoadedImpl(*instrumentingAgents, WTF::move(session));
</del><ins>+ sessionLoadedImpl(*instrumentingAgents, session);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> UNUSED_PARAM(session);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::sessionModified(Page& page, RefPtr<ReplaySession>&& session)
</del><ins>+inline void InspectorInstrumentation::sessionModified(Page& page, PassRefPtr<ReplaySession> session)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><del>- sessionModifiedImpl(*instrumentingAgents, WTF::move(session));
</del><ins>+ sessionModifiedImpl(*instrumentingAgents, session);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> UNUSED_PARAM(session);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::segmentCreated(Page& page, RefPtr<ReplaySessionSegment>&& segment)
</del><ins>+inline void InspectorInstrumentation::segmentCreated(Page& page, PassRefPtr<ReplaySessionSegment> segment)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><del>- segmentCreatedImpl(*instrumentingAgents, WTF::move(segment));
</del><ins>+ segmentCreatedImpl(*instrumentingAgents, segment);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> UNUSED_PARAM(segment);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::segmentCompleted(Page& page, RefPtr<ReplaySessionSegment>&& segment)
</del><ins>+inline void InspectorInstrumentation::segmentCompleted(Page& page, PassRefPtr<ReplaySessionSegment> segment)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><del>- segmentCompletedImpl(*instrumentingAgents, WTF::move(segment));
</del><ins>+ segmentCompletedImpl(*instrumentingAgents, segment);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> UNUSED_PARAM(segment);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::segmentLoaded(Page& page, RefPtr<ReplaySessionSegment>&& segment)
</del><ins>+inline void InspectorInstrumentation::segmentLoaded(Page& page, PassRefPtr<ReplaySessionSegment> segment)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
</span><del>- segmentLoadedImpl(*instrumentingAgents, WTF::move(segment));
</del><ins>+ segmentLoadedImpl(*instrumentingAgents, segment);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><span class="cx"> UNUSED_PARAM(segment);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> gatherLayersUsingRenderLayerHierarchy(errorString, renderLayer, layers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::LayerTree::Layer> InspectorLayerTreeAgent::buildObjectForLayer(ErrorString& errorString, RenderLayer* renderLayer)
</del><ins>+PassRefPtr<Inspector::Protocol::LayerTree::Layer> InspectorLayerTreeAgent::buildObjectForLayer(ErrorString& errorString, RenderLayer* renderLayer)
</ins><span class="cx"> {
</span><span class="cx"> RenderObject* renderer = &renderLayer->renderer();
</span><span class="cx"> RenderLayerBacking* backing = renderLayer->backing();
</span><span class="lines">@@ -166,14 +166,13 @@
</span><span class="cx"> node = renderer->parent()->element();
</span><span class="cx">
</span><span class="cx"> // Basic set of properties.
</span><del>- auto layerObject = Inspector::Protocol::LayerTree::Layer::create()
</del><ins>+ RefPtr<Inspector::Protocol::LayerTree::Layer> layerObject = Inspector::Protocol::LayerTree::Layer::create()
</ins><span class="cx"> .setLayerId(bind(renderLayer))
</span><span class="cx"> .setNodeId(idForNode(errorString, node))
</span><span class="cx"> .setBounds(buildObjectForIntRect(renderer->absoluteBoundingBoxRect()))
</span><span class="cx"> .setMemory(backing->backingStoreMemoryEstimate())
</span><span class="cx"> .setCompositedBounds(buildObjectForIntRect(enclosingIntRect(backing->compositedBounds())))
</span><del>- .setPaintCount(backing->graphicsLayer()->repaintCount())
- .release();
</del><ins>+ .setPaintCount(backing->graphicsLayer()->repaintCount());
</ins><span class="cx">
</span><span class="cx"> if (node && node->shadowHost())
</span><span class="cx"> layerObject->setIsInShadowTree(true);
</span><span class="lines">@@ -202,7 +201,7 @@
</span><span class="cx"> layerObject->setPseudoElement("first-line");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(layerObject);
</del><ins>+ return layerObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int InspectorLayerTreeAgent::idForNode(ErrorString& errorString, Node* node)
</span><span class="lines">@@ -219,17 +218,16 @@
</span><span class="cx"> return nodeId;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::LayerTree::IntRect> InspectorLayerTreeAgent::buildObjectForIntRect(const IntRect& rect)
</del><ins>+PassRefPtr<Inspector::Protocol::LayerTree::IntRect> InspectorLayerTreeAgent::buildObjectForIntRect(const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::LayerTree::IntRect::create()
</span><span class="cx"> .setX(rect.x())
</span><span class="cx"> .setY(rect.y())
</span><span class="cx"> .setWidth(rect.width())
</span><del>- .setHeight(rect.height())
- .release();
</del><ins>+ .setHeight(rect.height()).release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::reasonsForCompositingLayer(ErrorString& errorString, const String& layerId, RefPtr<Inspector::Protocol::LayerTree::CompositingReasons>& compositingReasonsResult)
</del><ins>+void InspectorLayerTreeAgent::reasonsForCompositingLayer(ErrorString& errorString, const String& layerId, RefPtr<Inspector::Protocol::LayerTree::CompositingReasons>& compositingReasons)
</ins><span class="cx"> {
</span><span class="cx"> const RenderLayer* renderLayer = m_idToLayer.get(layerId);
</span><span class="cx">
</span><span class="lines">@@ -239,7 +237,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CompositingReasons reasonsBitmask = renderLayer->compositor().reasonsForCompositing(*renderLayer);
</span><del>- auto compositingReasons = Inspector::Protocol::LayerTree::CompositingReasons::create().release();
</del><ins>+ compositingReasons = Inspector::Protocol::LayerTree::CompositingReasons::create();
</ins><span class="cx">
</span><span class="cx"> if (reasonsBitmask & CompositingReason3DTransform)
</span><span class="cx"> compositingReasons->setTransform3D(true);
</span><span class="lines">@@ -312,8 +310,6 @@
</span><span class="cx">
</span><span class="cx"> if (reasonsBitmask & CompositingReasonRoot)
</span><span class="cx"> compositingReasons->setRoot(true);
</span><del>-
- compositingReasonsResult = WTF::move(compositingReasons);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String InspectorLayerTreeAgent::bind(const RenderLayer* layer)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx"> void gatherLayersUsingRenderObjectHierarchy(ErrorString&, RenderObject*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>&);
</span><span class="cx"> void gatherLayersUsingRenderLayerHierarchy(ErrorString&, RenderLayer*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>&);
</span><span class="cx">
</span><del>- Ref<Inspector::Protocol::LayerTree::Layer> buildObjectForLayer(ErrorString&, RenderLayer*);
- Ref<Inspector::Protocol::LayerTree::IntRect> buildObjectForIntRect(const IntRect&);
</del><ins>+ PassRefPtr<Inspector::Protocol::LayerTree::Layer> buildObjectForLayer(ErrorString&, RenderLayer*);
+ PassRefPtr<Inspector::Protocol::LayerTree::IntRect> buildObjectForIntRect(const IntRect&);
</ins><span class="cx">
</span><span class="cx"> int idForNode(ErrorString&, Node*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -331,50 +331,50 @@
</span><span class="cx"> forcePaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorObject> buildObjectForPoint(const FloatPoint& point)
</del><ins>+static PassRefPtr<InspectorObject> buildObjectForPoint(const FloatPoint& point)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> object = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> object = InspectorObject::create();
</ins><span class="cx"> object->setDouble(ASCIILiteral("x"), point.x());
</span><span class="cx"> object->setDouble(ASCIILiteral("y"), point.y());
</span><del>- return WTF::move(object);
</del><ins>+ return object.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorObject> buildObjectForRect(const FloatRect& rect)
</del><ins>+static PassRefPtr<InspectorObject> buildObjectForRect(const FloatRect& rect)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> object = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> object = InspectorObject::create();
</ins><span class="cx"> object->setDouble(ASCIILiteral("x"), rect.x());
</span><span class="cx"> object->setDouble(ASCIILiteral("y"), rect.y());
</span><span class="cx"> object->setDouble(ASCIILiteral("width"), rect.width());
</span><span class="cx"> object->setDouble(ASCIILiteral("height"), rect.height());
</span><del>- return WTF::move(object);
</del><ins>+ return object.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorArray> buildArrayForQuad(const FloatQuad& quad)
</del><ins>+static PassRefPtr<InspectorArray> buildArrayForQuad(const FloatQuad& quad)
</ins><span class="cx"> {
</span><del>- Ref<InspectorArray> array = InspectorArray::create();
</del><ins>+ RefPtr<InspectorArray> array = InspectorArray::create();
</ins><span class="cx"> array->pushObject(buildObjectForPoint(quad.p1()));
</span><span class="cx"> array->pushObject(buildObjectForPoint(quad.p2()));
</span><span class="cx"> array->pushObject(buildObjectForPoint(quad.p3()));
</span><span class="cx"> array->pushObject(buildObjectForPoint(quad.p4()));
</span><del>- return WTF::move(array);
</del><ins>+ return array.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorObject> buildObjectForHighlight(const Highlight& highlight)
</del><ins>+static PassRefPtr<InspectorObject> buildObjectForHighlight(const Highlight& highlight)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> object = InspectorObject::create();
- Ref<InspectorArray> array = InspectorArray::create();
</del><ins>+ RefPtr<InspectorObject> object = InspectorObject::create();
+ RefPtr<InspectorArray> array = InspectorArray::create();
</ins><span class="cx"> for (size_t i = 0; i < highlight.quads.size(); ++i)
</span><span class="cx"> array->pushArray(buildArrayForQuad(highlight.quads[i]));
</span><del>- object->setArray("quads", WTF::move(array));
</del><ins>+ object->setArray("quads", array.release());
</ins><span class="cx"> object->setString("contentColor", highlight.contentColor.serialized());
</span><span class="cx"> object->setString("contentOutlineColor", highlight.contentOutlineColor.serialized());
</span><span class="cx"> object->setString("paddingColor", highlight.paddingColor.serialized());
</span><span class="cx"> object->setString("borderColor", highlight.borderColor.serialized());
</span><span class="cx"> object->setString("marginColor", highlight.marginColor.serialized());
</span><del>- return WTF::move(object);
</del><ins>+ return object.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<InspectorObject> buildObjectForRegionHighlight(FrameView* mainView, RenderRegion* region)
</del><ins>+static PassRefPtr<InspectorObject> buildObjectForRegionHighlight(FrameView* mainView, RenderRegion* region)
</ins><span class="cx"> {
</span><span class="cx"> FrameView* containingView = region->frame().view();
</span><span class="cx"> if (!containingView)
</span><span class="lines">@@ -406,20 +406,20 @@
</span><span class="cx"> contentsQuadToPage(mainView, containingView, incomingRectQuad);
</span><span class="cx"> contentsQuadToPage(mainView, containingView, outgoingRectQuad);
</span><span class="cx">
</span><del>- Ref<InspectorObject> regionObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> regionObject = InspectorObject::create();
</ins><span class="cx">
</span><span class="cx"> regionObject->setArray("borderQuad", buildArrayForQuad(borderRectQuad));
</span><span class="cx"> regionObject->setArray("incomingQuad", buildArrayForQuad(incomingRectQuad));
</span><span class="cx"> regionObject->setArray("outgoingQuad", buildArrayForQuad(outgoingRectQuad));
</span><span class="cx">
</span><del>- return WTF::move(regionObject);
</del><ins>+ return regionObject.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorArray> buildObjectForCSSRegionsHighlight(RenderRegion* region, RenderFlowThread* flowThread)
</del><ins>+static PassRefPtr<InspectorArray> buildObjectForCSSRegionsHighlight(RenderRegion* region, RenderFlowThread* flowThread)
</ins><span class="cx"> {
</span><span class="cx"> FrameView* mainFrameView = region->document().page()->mainFrame().view();
</span><span class="cx">
</span><del>- Ref<InspectorArray> array = InspectorArray::create();
</del><ins>+ RefPtr<InspectorArray> array = InspectorArray::create();
</ins><span class="cx">
</span><span class="cx"> const RenderRegionList& regionList = flowThread->renderRegionList();
</span><span class="cx"> for (auto& iterRegion : regionList) {
</span><span class="lines">@@ -435,18 +435,18 @@
</span><span class="cx"> array->pushObject(regionHighlightObject.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(array);
</del><ins>+ return array.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorObject> buildObjectForSize(const IntSize& size)
</del><ins>+static PassRefPtr<InspectorObject> buildObjectForSize(const IntSize& size)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> result = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> result = InspectorObject::create();
</ins><span class="cx"> result->setInteger("width", size.width());
</span><span class="cx"> result->setInteger("height", size.height());
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<InspectorObject> buildObjectForCSSRegionContentClip(RenderRegion* region)
</del><ins>+static PassRefPtr<InspectorObject> buildObjectForCSSRegionContentClip(RenderRegion* region)
</ins><span class="cx"> {
</span><span class="cx"> Frame* containingFrame = region->document().frame();
</span><span class="cx"> if (!containingFrame)
</span><span class="lines">@@ -466,9 +466,9 @@
</span><span class="cx"> FloatQuad clipQuad = region->localToAbsoluteQuad(FloatRect(flippedRegionRect));
</span><span class="cx"> contentsQuadToPage(mainView, containingView, clipQuad);
</span><span class="cx">
</span><del>- Ref<InspectorObject> regionObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> regionObject = InspectorObject::create();
</ins><span class="cx"> regionObject->setArray("quad", buildArrayForQuad(clipQuad));
</span><del>- return WTF::move(regionObject);
</del><ins>+ return regionObject.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::setShowingPaintRects(bool showingPaintRects)
</span><span class="lines">@@ -526,11 +526,11 @@
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::drawPaintRects()
</span><span class="cx"> {
</span><del>- Ref<InspectorArray> fragmentsArray = InspectorArray::create();
</del><ins>+ RefPtr<InspectorArray> fragmentsArray = InspectorArray::create();
</ins><span class="cx"> for (const auto& pair : m_paintRects)
</span><span class="cx"> fragmentsArray->pushObject(buildObjectForRect(pair.second));
</span><span class="cx">
</span><del>- evaluateInOverlay(ASCIILiteral("updatePaintRects"), WTF::move(fragmentsArray));
</del><ins>+ evaluateInOverlay(ASCIILiteral("updatePaintRects"), fragmentsArray.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::drawGutter()
</span><span class="lines">@@ -538,9 +538,9 @@
</span><span class="cx"> evaluateInOverlay(ASCIILiteral("drawGutter"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<InspectorArray> buildObjectForRendererFragments(RenderObject* renderer, const HighlightConfig& config)
</del><ins>+static PassRefPtr<InspectorArray> buildObjectForRendererFragments(RenderObject* renderer, const HighlightConfig& config)
</ins><span class="cx"> {
</span><del>- Ref<InspectorArray> fragmentsArray = InspectorArray::create();
</del><ins>+ RefPtr<InspectorArray> fragmentsArray = InspectorArray::create();
</ins><span class="cx">
</span><span class="cx"> RenderFlowThread* containingFlowThread = renderer->flowThreadContainingBlock();
</span><span class="cx"> if (!containingFlowThread) {
</span><span class="lines">@@ -562,18 +562,18 @@
</span><span class="cx"> // Compute the highlight of the fragment inside the current region.
</span><span class="cx"> Highlight highlight;
</span><span class="cx"> buildRendererHighlight(renderer, region, config, &highlight, InspectorOverlay::CoordinateSystem::View);
</span><del>- Ref<InspectorObject> fragmentObject = buildObjectForHighlight(highlight);
</del><ins>+ RefPtr<InspectorObject> fragmentObject = buildObjectForHighlight(highlight);
</ins><span class="cx">
</span><span class="cx"> // Compute the clipping area of the region.
</span><span class="cx"> fragmentObject->setObject("region", buildObjectForCSSRegionContentClip(region));
</span><del>- fragmentsArray->pushObject(WTF::move(fragmentObject));
</del><ins>+ fragmentsArray->pushObject(fragmentObject.release());
</ins><span class="cx"> }
</span><span class="cx"> if (region == endRegion)
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(fragmentsArray);
</del><ins>+ return fragmentsArray.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="lines">@@ -633,13 +633,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<InspectorObject> buildObjectForShapeOutside(Frame* containingFrame, RenderBox* renderer)
</del><ins>+static PassRefPtr<InspectorObject> buildObjectForShapeOutside(Frame* containingFrame, RenderBox* renderer)
</ins><span class="cx"> {
</span><span class="cx"> const ShapeOutsideInfo* shapeOutsideInfo = renderer->shapeOutsideInfo();
</span><span class="cx"> if (!shapeOutsideInfo)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Ref<InspectorObject> shapeObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> shapeObject = InspectorObject::create();
</ins><span class="cx"> LayoutRect shapeBounds = shapeOutsideInfo->computedShapePhysicalBoundingBox();
</span><span class="cx"> FloatQuad shapeQuad = renderer->localToAbsoluteQuad(FloatRect(shapeBounds));
</span><span class="cx"> contentsQuadToPage(containingFrame->page()->mainFrame().view(), containingFrame->view(), shapeQuad);
</span><span class="lines">@@ -649,39 +649,39 @@
</span><span class="cx"> shapeOutsideInfo->computedShape().buildDisplayPaths(paths);
</span><span class="cx">
</span><span class="cx"> if (paths.shape.length()) {
</span><del>- Ref<InspectorArray> shapePath = InspectorArray::create();
</del><ins>+ RefPtr<InspectorArray> shapePath = InspectorArray::create();
</ins><span class="cx"> PathApplyInfo info;
</span><span class="cx"> info.rootView = containingFrame->page()->mainFrame().view();
</span><span class="cx"> info.view = containingFrame->view();
</span><del>- info.array = &shapePath.get();
</del><ins>+ info.array = shapePath.get();
</ins><span class="cx"> info.renderer = renderer;
</span><span class="cx"> info.shapeOutsideInfo = shapeOutsideInfo;
</span><span class="cx">
</span><span class="cx"> paths.shape.apply(&info, &appendPathSegment);
</span><span class="cx">
</span><del>- shapeObject->setArray(ASCIILiteral("shape"), shapePath.copyRef());
</del><ins>+ shapeObject->setArray(ASCIILiteral("shape"), shapePath.release());
</ins><span class="cx">
</span><span class="cx"> if (paths.marginShape.length()) {
</span><span class="cx"> shapePath = InspectorArray::create();
</span><del>- info.array = &shapePath.get();
</del><ins>+ info.array = shapePath.get();
</ins><span class="cx">
</span><span class="cx"> paths.marginShape.apply(&info, &appendPathSegment);
</span><span class="cx">
</span><del>- shapeObject->setArray(ASCIILiteral("marginShape"), shapePath.copyRef());
</del><ins>+ shapeObject->setArray(ASCIILiteral("marginShape"), shapePath.release());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(shapeObject);
</del><ins>+ return shapeObject.release();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static RefPtr<InspectorObject> buildObjectForElementInfo(Node* node)
</del><ins>+static PassRefPtr<InspectorObject> buildObjectForElementInfo(Node* node)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(node);
</span><span class="cx"> if (!is<Element>(*node) || !node->document().frame())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Ref<InspectorObject> elementInfo = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> elementInfo = InspectorObject::create();
</ins><span class="cx">
</span><span class="cx"> Element& element = downcast<Element>(*node);
</span><span class="cx"> bool isXHTML = element.document().isXHTMLDocument();
</span><span class="lines">@@ -746,10 +746,10 @@
</span><span class="cx"> elementInfo->setString("role", axObject->computedRoleString());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(elementInfo);
</del><ins>+ return elementInfo.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorObject> InspectorOverlay::buildObjectForHighlightedNode() const
</del><ins>+PassRefPtr<InspectorObject> InspectorOverlay::buildObjectForHighlightedNode() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_highlightNode)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -763,7 +763,7 @@
</span><span class="cx"> if (!highlightFragments)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- Ref<InspectorObject> highlightObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> highlightObject = InspectorObject::create();
</ins><span class="cx">
</span><span class="cx"> // The main view's scroll offset is shared across all quads.
</span><span class="cx"> FrameView* mainView = m_page.mainFrame().view();
</span><span class="lines">@@ -777,7 +777,7 @@
</span><span class="cx"> highlightObject->setObject("elementInfo", elementInfo.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(highlightObject);
</del><ins>+ return highlightObject.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::drawNodeHighlight()
</span><span class="lines">@@ -859,33 +859,33 @@
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::reset(const IntSize& viewportSize, const IntSize& frameViewFullSize)
</span><span class="cx"> {
</span><del>- Ref<InspectorObject> resetData = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> resetData = InspectorObject::create();
</ins><span class="cx"> resetData->setDouble("deviceScaleFactor", m_page.deviceScaleFactor());
</span><span class="cx"> resetData->setObject("viewportSize", buildObjectForSize(viewportSize));
</span><span class="cx"> resetData->setObject("frameViewFullSize", buildObjectForSize(frameViewFullSize));
</span><del>- evaluateInOverlay("reset", WTF::move(resetData));
</del><ins>+ evaluateInOverlay("reset", resetData.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::evaluateInOverlay(const String& method)
</span><span class="cx"> {
</span><del>- Ref<InspectorArray> command = InspectorArray::create();
</del><ins>+ RefPtr<InspectorArray> command = InspectorArray::create();
</ins><span class="cx"> command->pushString(method);
</span><span class="cx"> overlayPage()->mainFrame().script().evaluate(ScriptSourceCode(makeString("dispatch(", command->toJSONString(), ')')));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::evaluateInOverlay(const String& method, const String& argument)
</span><span class="cx"> {
</span><del>- Ref<InspectorArray> command = InspectorArray::create();
</del><ins>+ RefPtr<InspectorArray> command = InspectorArray::create();
</ins><span class="cx"> command->pushString(method);
</span><span class="cx"> command->pushString(argument);
</span><span class="cx"> overlayPage()->mainFrame().script().evaluate(ScriptSourceCode(makeString("dispatch(", command->toJSONString(), ')')));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorOverlay::evaluateInOverlay(const String& method, RefPtr<InspectorValue>&& argument)
</del><ins>+void InspectorOverlay::evaluateInOverlay(const String& method, PassRefPtr<InspectorValue> argument)
</ins><span class="cx"> {
</span><del>- Ref<InspectorArray> command = InspectorArray::create();
</del><ins>+ RefPtr<InspectorArray> command = InspectorArray::create();
</ins><span class="cx"> command->pushString(method);
</span><del>- command->pushValue(WTF::move(argument));
</del><ins>+ command->pushValue(argument);
</ins><span class="cx"> overlayPage()->mainFrame().script().evaluate(ScriptSourceCode(makeString("dispatch(", command->toJSONString(), ')')));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx">
</span><span class="cx"> void setIndicating(bool indicating);
</span><span class="cx">
</span><del>- RefPtr<Inspector::InspectorObject> buildObjectForHighlightedNode() const;
</del><ins>+ PassRefPtr<Inspector::InspectorObject> buildObjectForHighlightedNode() const;
</ins><span class="cx">
</span><span class="cx"> void freePage();
</span><span class="cx"> private:
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> void reset(const IntSize& viewportSize, const IntSize& frameViewFullSize);
</span><span class="cx"> void evaluateInOverlay(const String& method);
</span><span class="cx"> void evaluateInOverlay(const String& method, const String& argument);
</span><del>- void evaluateInOverlay(const String& method, RefPtr<Inspector::InspectorValue>&& argument);
</del><ins>+ void evaluateInOverlay(const String& method, PassRefPtr<Inspector::InspectorValue> argument);
</ins><span class="cx">
</span><span class="cx"> Page& m_page;
</span><span class="cx"> InspectorClient* m_client;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> return type == InspectorPageAgent::DocumentResource || type == InspectorPageAgent::StylesheetResource || type == InspectorPageAgent::ScriptResource || type == InspectorPageAgent::XHRResource;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<TextResourceDecoder> createXHRTextDecoder(const String& mimeType, const String& textEncodingName)
</del><ins>+static PassRefPtr<TextResourceDecoder> createXHRTextDecoder(const String& mimeType, const String& textEncodingName)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<TextResourceDecoder> decoder;
</span><span class="cx"> if (!textEncodingName.isEmpty())
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> decoder = TextResourceDecoder::create("text/html", "UTF-8");
</span><span class="cx"> else
</span><span class="cx"> decoder = TextResourceDecoder::create("text/plain", "UTF-8");
</span><del>- return WTF::move(decoder);
</del><ins>+ return decoder;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InspectorPageAgent::cachedResourceContent(CachedResource* cachedResource, String* result, bool* base64Encoded)
</span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx"> frame.loader().changeLocation(frame.document()->securityOrigin(), frame.document()->completeURL(url), "", LockHistory::No, LockBackForwardList::No);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Page::Cookie> buildObjectForCookie(const Cookie& cookie)
</del><ins>+static PassRefPtr<Inspector::Protocol::Page::Cookie> buildObjectForCookie(const Cookie& cookie)
</ins><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::Page::Cookie::create()
</span><span class="cx"> .setName(cookie.name)
</span><span class="lines">@@ -435,14 +435,14 @@
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>> buildArrayForCookies(ListHashSet<Cookie>& cookiesList)
</del><ins>+static PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>> buildArrayForCookies(ListHashSet<Cookie>& cookiesList)
</ins><span class="cx"> {
</span><del>- auto cookies = Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>> cookies = Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>::create();
</ins><span class="cx">
</span><del>- for (const auto& cookie : cookiesList)
</del><ins>+ for (auto& cookie : cookiesList)
</ins><span class="cx"> cookies->addItem(buildObjectForCookie(cookie));
</span><span class="cx">
</span><del>- return WTF::move(cookies);
</del><ins>+ return cookies;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Vector<CachedResource*> cachedResourcesForFrame(Frame* frame)
</span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx"> results = ContentSearchUtilities::searchInTextByLines(content, query, caseSensitive, isRegex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Page::SearchResult> buildObjectForSearchResult(const String& frameId, const String& url, int matchesCount)
</del><ins>+static PassRefPtr<Inspector::Protocol::Page::SearchResult> buildObjectForSearchResult(const String& frameId, const String& url, int matchesCount)
</ins><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::Page::SearchResult::create()
</span><span class="cx"> .setUrl(url)
</span><span class="lines">@@ -851,13 +851,13 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect absoluteRect = LayoutRect(renderer->localToAbsoluteQuad(FloatRect(rect)).boundingBox());
</span><span class="cx"> FrameView* view = renderer->document().view();
</span><del>-
</del><ins>+
</ins><span class="cx"> LayoutRect rootRect = absoluteRect;
</span><span class="cx"> if (!view->frame().isMainFrame()) {
</span><span class="cx"> IntRect rootViewRect = view->contentsToRootView(snappedIntRect(absoluteRect));
</span><span class="cx"> rootRect = view->frame().mainFrame().view()->rootViewToContents(rootViewRect);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (m_client->overridesShowPaintRects()) {
</span><span class="cx"> m_client->showPaintRect(rootRect);
</span><span class="cx"> return;
</span><span class="lines">@@ -898,15 +898,14 @@
</span><span class="cx"> m_frontendDispatcher->scriptsEnabled(isEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::Page::Frame> InspectorPageAgent::buildObjectForFrame(Frame* frame)
</del><ins>+PassRefPtr<Inspector::Protocol::Page::Frame> InspectorPageAgent::buildObjectForFrame(Frame* frame)
</ins><span class="cx"> {
</span><del>- auto frameObject = Inspector::Protocol::Page::Frame::create()
</del><ins>+ RefPtr<Inspector::Protocol::Page::Frame> frameObject = Inspector::Protocol::Page::Frame::create()
</ins><span class="cx"> .setId(frameId(frame))
</span><span class="cx"> .setLoaderId(loaderId(frame->loader().documentLoader()))
</span><span class="cx"> .setUrl(frame->document()->url().string())
</span><span class="cx"> .setMimeType(frame->loader().documentLoader()->responseMIMEType())
</span><del>- .setSecurityOrigin(frame->document()->securityOrigin()->toRawString())
- .release();
</del><ins>+ .setSecurityOrigin(frame->document()->securityOrigin()->toRawString());
</ins><span class="cx"> if (frame->tree().parent())
</span><span class="cx"> frameObject->setParentId(frameId(frame->tree().parent()));
</span><span class="cx"> if (frame->ownerElement()) {
</span><span class="lines">@@ -916,24 +915,22 @@
</span><span class="cx"> frameObject->setName(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(frameObject);
</del><ins>+ return frameObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::Page::FrameResourceTree> InspectorPageAgent::buildObjectForFrameTree(Frame* frame)
</del><ins>+PassRefPtr<Inspector::Protocol::Page::FrameResourceTree> InspectorPageAgent::buildObjectForFrameTree(Frame* frame)
</ins><span class="cx"> {
</span><del>- Ref<Inspector::Protocol::Page::Frame> frameObject = buildObjectForFrame(frame);
- auto subresources = Inspector::Protocol::Array<Inspector::Protocol::Page::FrameResource>::create();
- auto result = Inspector::Protocol::Page::FrameResourceTree::create()
- .setFrame(WTF::move(frameObject))
- .setResources(subresources.copyRef())
- .release();
</del><ins>+ RefPtr<Inspector::Protocol::Page::Frame> frameObject = buildObjectForFrame(frame);
+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::FrameResource>> subresources = Inspector::Protocol::Array<Inspector::Protocol::Page::FrameResource>::create();
+ RefPtr<Inspector::Protocol::Page::FrameResourceTree> result = Inspector::Protocol::Page::FrameResourceTree::create()
+ .setFrame(frameObject)
+ .setResources(subresources);
</ins><span class="cx">
</span><span class="cx"> for (auto* cachedResource : cachedResourcesForFrame(frame)) {
</span><del>- auto resourceObject = Inspector::Protocol::Page::FrameResource::create()
</del><ins>+ RefPtr<Inspector::Protocol::Page::FrameResource> resourceObject = Inspector::Protocol::Page::FrameResource::create()
</ins><span class="cx"> .setUrl(cachedResource->url())
</span><span class="cx"> .setType(cachedResourceTypeJson(*cachedResource))
</span><del>- .setMimeType(cachedResource->response().mimeType())
- .release();
</del><ins>+ .setMimeType(cachedResource->response().mimeType());
</ins><span class="cx"> if (cachedResource->wasCanceled())
</span><span class="cx"> resourceObject->setCanceled(true);
</span><span class="cx"> else if (cachedResource->status() == CachedResource::LoadError)
</span><span class="lines">@@ -941,7 +938,7 @@
</span><span class="cx"> String sourceMappingURL = InspectorPageAgent::sourceMapURLForResource(cachedResource);
</span><span class="cx"> if (!sourceMappingURL.isEmpty())
</span><span class="cx"> resourceObject->setSourceMapURL(sourceMappingURL);
</span><del>- subresources->addItem(WTF::move(resourceObject));
</del><ins>+ subresources->addItem(resourceObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::FrameResourceTree>> childrenArray;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -166,8 +166,8 @@
</span><span class="cx"> static bool mainResourceContent(Frame*, bool withBase64Encode, String* result);
</span><span class="cx"> static bool dataContent(const char* data, unsigned size, const String& textEncodingName, bool withBase64Encode, String* result);
</span><span class="cx">
</span><del>- Ref<Inspector::Protocol::Page::Frame> buildObjectForFrame(Frame*);
- Ref<Inspector::Protocol::Page::FrameResourceTree> buildObjectForFrameTree(Frame*);
</del><ins>+ PassRefPtr<Inspector::Protocol::Page::Frame> buildObjectForFrame(Frame*);
+ PassRefPtr<Inspector::Protocol::Page::FrameResourceTree> buildObjectForFrameTree(Frame*);
</ins><span class="cx"> Page* m_page;
</span><span class="cx"> InspectorClient* m_client;
</span><span class="cx"> std::unique_ptr<Inspector::InspectorPageFrontendDispatcher> m_frontendDispatcher;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -54,36 +54,40 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Replay::ReplayPosition> buildInspectorObjectForPosition(const ReplayPosition& position)
</del><ins>+static PassRefPtr<Inspector::Protocol::Replay::ReplayPosition> buildInspectorObjectForPosition(const ReplayPosition& position)
</ins><span class="cx"> {
</span><del>- return Inspector::Protocol::Replay::ReplayPosition::create()
</del><ins>+ RefPtr<Inspector::Protocol::Replay::ReplayPosition> positionObject = Inspector::Protocol::Replay::ReplayPosition::create()
</ins><span class="cx"> .setSegmentOffset(position.segmentOffset)
</span><del>- .setInputOffset(position.inputOffset)
- .release();
</del><ins>+ .setInputOffset(position.inputOffset);
+
+ return positionObject.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Replay::ReplayInput> buildInspectorObjectForInput(const NondeterministicInputBase& input, size_t offset)
</del><ins>+static PassRefPtr<Inspector::Protocol::Replay::ReplayInput> buildInspectorObjectForInput(const NondeterministicInputBase& input, size_t offset)
</ins><span class="cx"> {
</span><span class="cx"> EncodedValue encodedInput = EncodingTraits<NondeterministicInputBase>::encodeValue(input);
</span><del>- return Inspector::Protocol::Replay::ReplayInput::create()
</del><ins>+ RefPtr<Inspector::Protocol::Replay::ReplayInput> inputObject = Inspector::Protocol::Replay::ReplayInput::create()
</ins><span class="cx"> .setType(input.type())
</span><span class="cx"> .setOffset(offset)
</span><del>- .setData(encodedInput.asObject())
- .release();
</del><ins>+ .setData(encodedInput.asObject());
+
+ return inputObject.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Replay::ReplaySession> buildInspectorObjectForSession(RefPtr<ReplaySession>&& session)
</del><ins>+static PassRefPtr<Inspector::Protocol::Replay::ReplaySession> buildInspectorObjectForSession(PassRefPtr<ReplaySession> prpSession)
</ins><span class="cx"> {
</span><del>- auto segments = Inspector::Protocol::Array<SegmentIdentifier>::create();
</del><ins>+ RefPtr<ReplaySession> session = prpSession;
+ RefPtr<Inspector::Protocol::Array<SegmentIdentifier>> segments = Inspector::Protocol::Array<SegmentIdentifier>::create();
</ins><span class="cx">
</span><span class="cx"> for (auto it = session->begin(); it != session->end(); ++it)
</span><span class="cx"> segments->addItem((*it)->identifier());
</span><span class="cx">
</span><del>- return Inspector::Protocol::Replay::ReplaySession::create()
</del><ins>+ RefPtr<Inspector::Protocol::Replay::ReplaySession> sessionObject = Inspector::Protocol::Replay::ReplaySession::create()
</ins><span class="cx"> .setId(session->identifier())
</span><span class="cx"> .setTimestamp(session->timestamp())
</span><del>- .setSegments(WTF::move(segments))
- .release();
</del><ins>+ .setSegments(segments.release());
+
+ return sessionObject.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Inspector::Protocol::Replay::SessionState buildInspectorObjectForSessionState(WebCore::SessionState sessionState)
</span><span class="lines">@@ -107,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> class SerializeInputToJSONFunctor {
</span><span class="cx"> public:
</span><del>- typedef RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInput>> ReturnType;
</del><ins>+ typedef PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInput>> ReturnType;
</ins><span class="cx">
</span><span class="cx"> SerializeInputToJSONFunctor()
</span><span class="cx"> : m_inputs(Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInput>::create()) { }
</span><span class="lines">@@ -126,28 +130,30 @@
</span><span class="cx"> RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInput>> m_inputs;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Replay::SessionSegment> buildInspectorObjectForSegment(RefPtr<ReplaySessionSegment>&& segment)
</del><ins>+static PassRefPtr<Inspector::Protocol::Replay::SessionSegment> buildInspectorObjectForSegment(PassRefPtr<ReplaySessionSegment> prpSegment)
</ins><span class="cx"> {
</span><del>- auto queuesObject = Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInputQueue>::create();
</del><ins>+ RefPtr<ReplaySessionSegment> segment = prpSegment;
+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInputQueue>> queuesObject = Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInputQueue>::create();
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < static_cast<size_t>(InputQueue::Count); i++) {
</span><span class="cx"> SerializeInputToJSONFunctor collector;
</span><span class="cx"> InputQueue queue = static_cast<InputQueue>(i);
</span><del>- RefPtr<FunctorInputCursor> functorCursor = FunctorInputCursor::create(segment.copyRef());
</del><ins>+ RefPtr<FunctorInputCursor> functorCursor = FunctorInputCursor::create(segment);
</ins><span class="cx"> RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::ReplayInput>> queueInputs = functorCursor->forEachInputInQueue(queue, collector);
</span><span class="cx">
</span><del>- auto queueObject = Inspector::Protocol::Replay::ReplayInputQueue::create()
</del><ins>+ RefPtr<Inspector::Protocol::Replay::ReplayInputQueue> queueObject = Inspector::Protocol::Replay::ReplayInputQueue::create()
</ins><span class="cx"> .setType(EncodingTraits<InputQueue>::encodeValue(queue).convertTo<String>())
</span><del>- .setInputs(queueInputs)
- .release();
- queuesObject->addItem(WTF::move(queueObject));
</del><ins>+ .setInputs(queueInputs);
+
+ queuesObject->addItem(queueObject.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return Inspector::Protocol::Replay::SessionSegment::create()
</del><ins>+ RefPtr<Inspector::Protocol::Replay::SessionSegment> segmentObject = Inspector::Protocol::Replay::SessionSegment::create()
</ins><span class="cx"> .setId(segment->identifier())
</span><span class="cx"> .setTimestamp(segment->timestamp())
</span><del>- .setQueues(WTF::move(queuesObject))
- .release();
</del><ins>+ .setQueues(queuesObject.release());
+
+ return segmentObject.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorReplayAgent::InspectorReplayAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent)
</span><span class="lines">@@ -331,7 +337,7 @@
</span><span class="cx"> m_page.replayController().stopCapturing();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::replayToPosition(ErrorString& errorString, const RefPtr<InspectorObject>&& positionObject, bool fastReplay)
</del><ins>+void InspectorReplayAgent::replayToPosition(ErrorString& errorString, const RefPtr<InspectorObject>& positionObject, bool fastReplay)
</ins><span class="cx"> {
</span><span class="cx"> ReplayPosition position;
</span><span class="cx"> if (!positionObject->getInteger(ASCIILiteral("segmentOffset"), position.segmentOffset)) {
</span><span class="lines">@@ -501,7 +507,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- serializedObject = buildInspectorObjectForSession(WTF::move(session));
</del><ins>+ serializedObject = buildInspectorObjectForSession(session);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorReplayAgent::getSegmentData(ErrorString& errorString, Inspector::Protocol::Replay::SegmentIdentifier identifier, RefPtr<Inspector::Protocol::Replay::SessionSegment>& serializedObject)
</span><span class="lines">@@ -512,7 +518,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- serializedObject = buildInspectorObjectForSegment(WTF::move(segment));
</del><ins>+ serializedObject = buildInspectorObjectForSegment(segment);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> virtual void startCapturing(ErrorString&) override;
</span><span class="cx"> virtual void stopCapturing(ErrorString&) override;
</span><span class="cx">
</span><del>- virtual void replayToPosition(ErrorString&, const RefPtr<Inspector::InspectorObject>&&, bool shouldFastForward) override;
</del><ins>+ virtual void replayToPosition(ErrorString&, const RefPtr<Inspector::InspectorObject>&, bool shouldFastForward) override;
</ins><span class="cx"> virtual void replayToCompletion(ErrorString&, bool shouldFastForward) override;
</span><span class="cx"> virtual void pausePlayback(ErrorString&) override;
</span><span class="cx"> virtual void cancelPlayback(ErrorString&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -190,16 +190,16 @@
</span><span class="cx"> disable(unused);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<InspectorObject> buildObjectForHeaders(const HTTPHeaderMap& headers)
</del><ins>+static PassRefPtr<InspectorObject> buildObjectForHeaders(const HTTPHeaderMap& headers)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> headersObject = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> headersObject = InspectorObject::create();
</ins><span class="cx">
</span><span class="cx"> for (const auto& header : headers)
</span><span class="cx"> headersObject->setString(header.key, header.value);
</span><del>- return WTF::move(headersObject);
</del><ins>+ return headersObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Network::ResourceTiming> buildObjectForTiming(const ResourceLoadTiming& timing, DocumentLoader* loader)
</del><ins>+static PassRefPtr<Inspector::Protocol::Network::ResourceTiming> buildObjectForTiming(const ResourceLoadTiming& timing, DocumentLoader* loader)
</ins><span class="cx"> {
</span><span class="cx"> return Inspector::Protocol::Network::ResourceTiming::create()
</span><span class="cx"> .setNavigationStart(loader->timing()->navigationStart())
</span><span class="lines">@@ -213,56 +213,54 @@
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Network::Request> buildObjectForResourceRequest(const ResourceRequest& request)
</del><ins>+static PassRefPtr<Inspector::Protocol::Network::Request> buildObjectForResourceRequest(const ResourceRequest& request)
</ins><span class="cx"> {
</span><del>- auto requestObject = Inspector::Protocol::Network::Request::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::Request> requestObject = Inspector::Protocol::Network::Request::create()
</ins><span class="cx"> .setUrl(request.url().string())
</span><span class="cx"> .setMethod(request.httpMethod())
</span><del>- .setHeaders(buildObjectForHeaders(request.httpHeaderFields()))
- .release();
</del><ins>+ .setHeaders(buildObjectForHeaders(request.httpHeaderFields()));
</ins><span class="cx"> if (request.httpBody() && !request.httpBody()->isEmpty())
</span><span class="cx"> requestObject->setPostData(request.httpBody()->flattenToString());
</span><del>- return WTF::move(requestObject);
</del><ins>+ return requestObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<Inspector::Protocol::Network::Response> buildObjectForResourceResponse(const ResourceResponse& response, DocumentLoader* loader)
</del><ins>+static PassRefPtr<Inspector::Protocol::Network::Response> buildObjectForResourceResponse(const ResourceResponse& response, DocumentLoader* loader)
</ins><span class="cx"> {
</span><span class="cx"> if (response.isNull())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> double status = response.httpStatusCode();
</span><del>- Ref<InspectorObject> headers = buildObjectForHeaders(response.httpHeaderFields());
</del><ins>+ RefPtr<InspectorObject> headers = buildObjectForHeaders(response.httpHeaderFields());
</ins><span class="cx">
</span><del>- auto responseObject = Inspector::Protocol::Network::Response::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::Response> responseObject = Inspector::Protocol::Network::Response::create()
</ins><span class="cx"> .setUrl(response.url().string())
</span><span class="cx"> .setStatus(status)
</span><span class="cx"> .setStatusText(response.httpStatusText())
</span><del>- .setHeaders(WTF::move(headers))
- .setMimeType(response.mimeType())
- .release();
</del><ins>+ .setHeaders(headers)
+ .setMimeType(response.mimeType());
</ins><span class="cx">
</span><span class="cx"> responseObject->setFromDiskCache(response.source() == ResourceResponse::Source::DiskCache || response.source() == ResourceResponse::Source::DiskCacheAfterValidation);
</span><span class="cx"> responseObject->setTiming(buildObjectForTiming(response.resourceLoadTiming(), loader));
</span><span class="cx">
</span><del>- return WTF::move(responseObject);
</del><ins>+ return responseObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Network::CachedResource> buildObjectForCachedResource(CachedResource* cachedResource, DocumentLoader* loader)
</del><ins>+static PassRefPtr<Inspector::Protocol::Network::CachedResource> buildObjectForCachedResource(CachedResource* cachedResource, DocumentLoader* loader)
</ins><span class="cx"> {
</span><del>- auto resourceObject = Inspector::Protocol::Network::CachedResource::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::CachedResource> resourceObject = Inspector::Protocol::Network::CachedResource::create()
</ins><span class="cx"> .setUrl(cachedResource->url())
</span><span class="cx"> .setType(InspectorPageAgent::cachedResourceTypeJson(*cachedResource))
</span><del>- .setBodySize(cachedResource->encodedSize())
- .release();
</del><ins>+ .setBodySize(cachedResource->encodedSize());
</ins><span class="cx">
</span><del>- auto resourceResponse = buildObjectForResourceResponse(cachedResource->response(), loader);
- resourceObject->setResponse(WTF::move(resourceResponse));
</del><ins>+ RefPtr<Inspector::Protocol::Network::Response> resourceResponse = buildObjectForResourceResponse(cachedResource->response(), loader);
+ if (resourceResponse)
+ resourceObject->setResponse(resourceResponse);
</ins><span class="cx">
</span><span class="cx"> String sourceMappingURL = InspectorPageAgent::sourceMapURLForResource(cachedResource);
</span><span class="cx"> if (!sourceMappingURL.isEmpty())
</span><span class="cx"> resourceObject->setSourceMapURL(sourceMappingURL);
</span><span class="cx">
</span><del>- return WTF::move(resourceObject);
</del><ins>+ return resourceObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorResourceAgent::~InspectorResourceAgent()
</span><span class="lines">@@ -484,9 +482,9 @@
</span><span class="cx"> m_resourcesData->setXHRReplayData(requestId, xhrReplayData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::willLoadXHR(ThreadableLoaderClient* client, const String& method, const URL& url, bool async, RefPtr<FormData>&& formData, const HTTPHeaderMap& headers, bool includeCredentials)
</del><ins>+void InspectorResourceAgent::willLoadXHR(ThreadableLoaderClient* client, const String& method, const URL& url, bool async, PassRefPtr<FormData> formData, const HTTPHeaderMap& headers, bool includeCredentials)
</ins><span class="cx"> {
</span><del>- RefPtr<XHRReplayData> xhrReplayData = XHRReplayData::create(method, url, async, WTF::move(formData), headers, includeCredentials);
</del><ins>+ RefPtr<XHRReplayData> xhrReplayData = XHRReplayData::create(method, url, async, formData, headers, includeCredentials);
</ins><span class="cx">
</span><span class="cx"> m_pendingXHRReplayData.set(client, WTF::move(xhrReplayData));
</span><span class="cx"> }
</span><span class="lines">@@ -552,24 +550,22 @@
</span><span class="cx"> m_styleRecalculationInitiator = buildInitiatorObject(&document);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::Network::Initiator> InspectorResourceAgent::buildInitiatorObject(Document* document)
</del><ins>+PassRefPtr<Inspector::Protocol::Network::Initiator> InspectorResourceAgent::buildInitiatorObject(Document* document)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ScriptCallStack> stackTrace = createScriptCallStack(JSMainThreadExecState::currentState(), ScriptCallStack::maxCallStackSizeToCapture);
</span><span class="cx"> if (stackTrace && stackTrace->size() > 0) {
</span><del>- auto initiatorObject = Inspector::Protocol::Network::Initiator::create()
- .setType(Inspector::Protocol::Network::Initiator::Type::Script)
- .release();
</del><ins>+ RefPtr<Inspector::Protocol::Network::Initiator> initiatorObject = Inspector::Protocol::Network::Initiator::create()
+ .setType(Inspector::Protocol::Network::Initiator::Type::Script);
</ins><span class="cx"> initiatorObject->setStackTrace(stackTrace->buildInspectorArray());
</span><del>- return WTF::move(initiatorObject);
</del><ins>+ return initiatorObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (document && document->scriptableDocumentParser()) {
</span><del>- auto initiatorObject = Inspector::Protocol::Network::Initiator::create()
- .setType(Inspector::Protocol::Network::Initiator::Type::Parser)
- .release();
</del><ins>+ RefPtr<Inspector::Protocol::Network::Initiator> initiatorObject = Inspector::Protocol::Network::Initiator::create()
+ .setType(Inspector::Protocol::Network::Initiator::Type::Parser);
</ins><span class="cx"> initiatorObject->setUrl(document->url().string());
</span><span class="cx"> initiatorObject->setLineNumber(document->scriptableDocumentParser()->textPosition().m_line.oneBasedInt());
</span><del>- return WTF::move(initiatorObject);
</del><ins>+ return initiatorObject;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_isRecalculatingStyle && m_styleRecalculationInitiator)
</span><span class="lines">@@ -589,20 +585,18 @@
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::willSendWebSocketHandshakeRequest(unsigned long identifier, const ResourceRequest& request)
</span><span class="cx"> {
</span><del>- auto requestObject = Inspector::Protocol::Network::WebSocketRequest::create()
- .setHeaders(buildObjectForHeaders(request.httpHeaderFields()))
- .release();
- m_frontendDispatcher->webSocketWillSendHandshakeRequest(IdentifiersFactory::requestId(identifier), timestamp(), WTF::move(requestObject));
</del><ins>+ RefPtr<Inspector::Protocol::Network::WebSocketRequest> requestObject = Inspector::Protocol::Network::WebSocketRequest::create()
+ .setHeaders(buildObjectForHeaders(request.httpHeaderFields()));
+ m_frontendDispatcher->webSocketWillSendHandshakeRequest(IdentifiersFactory::requestId(identifier), timestamp(), requestObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didReceiveWebSocketHandshakeResponse(unsigned long identifier, const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- auto responseObject = Inspector::Protocol::Network::WebSocketResponse::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::WebSocketResponse> responseObject = Inspector::Protocol::Network::WebSocketResponse::create()
</ins><span class="cx"> .setStatus(response.httpStatusCode())
</span><span class="cx"> .setStatusText(response.httpStatusText())
</span><del>- .setHeaders(buildObjectForHeaders(response.httpHeaderFields()))
- .release();
- m_frontendDispatcher->webSocketHandshakeResponseReceived(IdentifiersFactory::requestId(identifier), timestamp(), WTF::move(responseObject));
</del><ins>+ .setHeaders(buildObjectForHeaders(response.httpHeaderFields()));
+ m_frontendDispatcher->webSocketHandshakeResponseReceived(IdentifiersFactory::requestId(identifier), timestamp(), responseObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didCloseWebSocket(unsigned long identifier)
</span><span class="lines">@@ -612,22 +606,20 @@
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didReceiveWebSocketFrame(unsigned long identifier, const WebSocketFrame& frame)
</span><span class="cx"> {
</span><del>- auto frameObject = Inspector::Protocol::Network::WebSocketFrame::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::WebSocketFrame> frameObject = Inspector::Protocol::Network::WebSocketFrame::create()
</ins><span class="cx"> .setOpcode(frame.opCode)
</span><span class="cx"> .setMask(frame.masked)
</span><del>- .setPayloadData(String(frame.payload, frame.payloadLength))
- .release();
- m_frontendDispatcher->webSocketFrameReceived(IdentifiersFactory::requestId(identifier), timestamp(), WTF::move(frameObject));
</del><ins>+ .setPayloadData(String(frame.payload, frame.payloadLength));
+ m_frontendDispatcher->webSocketFrameReceived(IdentifiersFactory::requestId(identifier), timestamp(), frameObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didSendWebSocketFrame(unsigned long identifier, const WebSocketFrame& frame)
</span><span class="cx"> {
</span><del>- auto frameObject = Inspector::Protocol::Network::WebSocketFrame::create()
</del><ins>+ RefPtr<Inspector::Protocol::Network::WebSocketFrame> frameObject = Inspector::Protocol::Network::WebSocketFrame::create()
</ins><span class="cx"> .setOpcode(frame.opCode)
</span><span class="cx"> .setMask(frame.masked)
</span><del>- .setPayloadData(String(frame.payload, frame.payloadLength))
- .release();
- m_frontendDispatcher->webSocketFrameSent(IdentifiersFactory::requestId(identifier), timestamp(), WTF::move(frameObject));
</del><ins>+ .setPayloadData(String(frame.payload, frame.payloadLength));
+ m_frontendDispatcher->webSocketFrameSent(IdentifiersFactory::requestId(identifier), timestamp(), frameObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didReceiveWebSocketFrameError(unsigned long identifier, const String& errorMessage)
</span><span class="lines">@@ -658,9 +650,9 @@
</span><span class="cx"> m_extraRequestHeaders.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::setExtraHTTPHeaders(ErrorString&, const RefPtr<InspectorObject>&& headers)
</del><ins>+void InspectorResourceAgent::setExtraHTTPHeaders(ErrorString&, const RefPtr<InspectorObject>& headers)
</ins><span class="cx"> {
</span><del>- m_extraRequestHeaders = headers.copyRef();
</del><ins>+ m_extraRequestHeaders = headers;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::getResponseBody(ErrorString& errorString, const String& requestId, String* content, bool* base64Encoded)
</span><span class="lines">@@ -747,7 +739,7 @@
</span><span class="cx"> memoryCache().evictResources();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::loadResource(ErrorString& errorString, const String& frameId, const String& urlString, Ref<LoadResourceCallback>&& callback)
</del><ins>+void InspectorResourceAgent::loadResource(ErrorString& errorString, const String& frameId, const String& urlString, PassRefPtr<LoadResourceCallback> prpCallback)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = m_pageAgent->assertFrame(errorString, frameId);
</span><span class="cx"> if (!frame)
</span><span class="lines">@@ -759,6 +751,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ RefPtr<LoadResourceCallback> callback = prpCallback;
+
</ins><span class="cx"> URL url = document->completeURL(urlString);
</span><span class="cx"> ResourceRequest request(url);
</span><span class="cx"> request.setHTTPMethod(ASCIILiteral("GET"));
</span><span class="lines">@@ -770,7 +764,7 @@
</span><span class="cx"> options.crossOriginRequestPolicy = AllowCrossOriginRequests;
</span><span class="cx">
</span><span class="cx"> // InspectorThreadableLoaderClient deletes itself when the load completes.
</span><del>- InspectorThreadableLoaderClient* inspectorThreadableLoaderClient = new InspectorThreadableLoaderClient(WTF::move(callback));
</del><ins>+ InspectorThreadableLoaderClient* inspectorThreadableLoaderClient = new InspectorThreadableLoaderClient(callback);
</ins><span class="cx">
</span><span class="cx"> RefPtr<DocumentThreadableLoader> loader = DocumentThreadableLoader::create(*document, *inspectorThreadableLoaderClient, request, options);
</span><span class="cx"> if (!loader) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> void didFailLoading(unsigned long identifier, DocumentLoader&, const ResourceError&);
</span><span class="cx"> void didLoadResourceFromMemoryCache(DocumentLoader&, CachedResource&);
</span><span class="cx"> void documentThreadableLoaderStartedLoadingForClient(unsigned long identifier, ThreadableLoaderClient*);
</span><del>- void willLoadXHR(ThreadableLoaderClient*, const String& method, const URL&, bool async, RefPtr<FormData>&& body, const HTTPHeaderMap& headers, bool includeCrendentials);
</del><ins>+ void willLoadXHR(ThreadableLoaderClient*, const String& method, const URL&, bool async, PassRefPtr<FormData> body, const HTTPHeaderMap& headers, bool includeCrendentials);
</ins><span class="cx"> void didFailXHRLoading(ThreadableLoaderClient*);
</span><span class="cx"> void didFinishXHRLoading(ThreadableLoaderClient*, unsigned long identifier, const String& sourceString);
</span><span class="cx"> void didReceiveXHRResponse(unsigned long identifier);
</span><span class="lines">@@ -118,12 +118,12 @@
</span><span class="cx">
</span><span class="cx"> void didScheduleStyleRecalculation(Document&);
</span><span class="cx">
</span><del>- RefPtr<Inspector::Protocol::Network::Initiator> buildInitiatorObject(Document*);
</del><ins>+ PassRefPtr<Inspector::Protocol::Network::Initiator> buildInitiatorObject(Document*);
</ins><span class="cx">
</span><span class="cx"> // Called from frontend.
</span><span class="cx"> virtual void enable(ErrorString&) override;
</span><span class="cx"> virtual void disable(ErrorString&) override;
</span><del>- virtual void setExtraHTTPHeaders(ErrorString&, const RefPtr<Inspector::InspectorObject>&&) override;
</del><ins>+ virtual void setExtraHTTPHeaders(ErrorString&, const RefPtr<Inspector::InspectorObject>&) override;
</ins><span class="cx"> virtual void getResponseBody(ErrorString&, const String& requestId, String* content, bool* base64Encoded) override;
</span><span class="cx"> virtual void replayXHR(ErrorString&, const String& requestId) override;
</span><span class="cx"> virtual void canClearBrowserCache(ErrorString&, bool*) override;
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> virtual void canClearBrowserCookies(ErrorString&, bool*) override;
</span><span class="cx"> virtual void clearBrowserCookies(ErrorString&) override;
</span><span class="cx"> virtual void setCacheDisabled(ErrorString&, bool cacheDisabled) override;
</span><del>- virtual void loadResource(ErrorString&, const String& frameId, const String& url, Ref<LoadResourceCallback>&&) override;
</del><ins>+ virtual void loadResource(ErrorString&, const String& frameId, const String& url, PassRefPtr<LoadResourceCallback>) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void enable();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> RuleSourceDataList* sourceData() const { return m_sourceData.get(); }
</span><span class="cx"> void setSourceData(std::unique_ptr<RuleSourceDataList>);
</span><span class="cx"> bool hasSourceData() const { return m_sourceData != nullptr; }
</span><del>- RefPtr<WebCore::CSSRuleSourceData> ruleSourceDataAt(unsigned) const;
</del><ins>+ PassRefPtr<WebCore::CSSRuleSourceData> ruleSourceDataAt(unsigned) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx">
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> flattenSourceData(sourceData.get(), m_sourceData.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebCore::CSSRuleSourceData> ParsedStyleSheet::ruleSourceDataAt(unsigned index) const
</del><ins>+PassRefPtr<WebCore::CSSRuleSourceData> ParsedStyleSheet::ruleSourceDataAt(unsigned index) const
</ins><span class="cx"> {
</span><span class="cx"> if (!hasSourceData() || index >= m_sourceData->size())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> MediaListSourceImportRule
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static RefPtr<Inspector::Protocol::CSS::SourceRange> buildSourceRangeObject(const SourceRange& range, Vector<size_t>* lineEndings)
</del><ins>+static PassRefPtr<Inspector::Protocol::CSS::SourceRange> buildSourceRangeObject(const SourceRange& range, Vector<size_t>* lineEndings)
</ins><span class="cx"> {
</span><span class="cx"> if (!lineEndings)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::CSS::CSSMedia> buildMediaObject(const MediaList* media, MediaListSource mediaListSource, const String& sourceURL)
</del><ins>+static PassRefPtr<Inspector::Protocol::CSS::CSSMedia> buildMediaObject(const MediaList* media, MediaListSource mediaListSource, const String& sourceURL)
</ins><span class="cx"> {
</span><span class="cx"> // Make certain compilers happy by initializing |source| up-front.
</span><span class="cx"> Inspector::Protocol::CSS::CSSMedia::Source source = Inspector::Protocol::CSS::CSSMedia::Source::InlineSheet;
</span><span class="lines">@@ -178,19 +178,18 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto mediaObject = Inspector::Protocol::CSS::CSSMedia::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSMedia> mediaObject = Inspector::Protocol::CSS::CSSMedia::create()
</ins><span class="cx"> .setText(media->mediaText())
</span><del>- .setSource(source)
- .release();
</del><ins>+ .setSource(source);
</ins><span class="cx">
</span><span class="cx"> if (!sourceURL.isEmpty()) {
</span><span class="cx"> mediaObject->setSourceURL(sourceURL);
</span><span class="cx"> mediaObject->setSourceLine(media->queries()->lastLine());
</span><span class="cx"> }
</span><del>- return WTF::move(mediaObject);
</del><ins>+ return mediaObject.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<CSSRuleList> asCSSRuleList(CSSStyleSheet* styleSheet)
</del><ins>+static PassRefPtr<CSSRuleList> asCSSRuleList(CSSStyleSheet* styleSheet)
</ins><span class="cx"> {
</span><span class="cx"> if (!styleSheet)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -203,10 +202,10 @@
</span><span class="cx"> continue;
</span><span class="cx"> listRules.append(item);
</span><span class="cx"> }
</span><del>- return WTF::move(list);
</del><ins>+ return list.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<CSSRuleList> asCSSRuleList(CSSRule* rule)
</del><ins>+static PassRefPtr<CSSRuleList> asCSSRuleList(CSSRule* rule)
</ins><span class="cx"> {
</span><span class="cx"> if (!rule)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -223,7 +222,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void fillMediaListChain(CSSRule* rule, Array<Inspector::Protocol::CSS::CSSMedia>& mediaArray)
</del><ins>+static void fillMediaListChain(CSSRule* rule, Array<Inspector::Protocol::CSS::CSSMedia>* mediaArray)
</ins><span class="cx"> {
</span><span class="cx"> MediaList* mediaList;
</span><span class="cx"> CSSRule* parentRule = rule;
</span><span class="lines">@@ -251,7 +250,7 @@
</span><span class="cx"> sourceURL = "";
</span><span class="cx">
</span><span class="cx"> if (mediaList && mediaList->length())
</span><del>- mediaArray.addItem(buildMediaObject(mediaList, isMediaRule ? MediaListSourceMediaRule : MediaListSourceImportRule, sourceURL));
</del><ins>+ mediaArray->addItem(buildMediaObject(mediaList, isMediaRule ? MediaListSourceMediaRule : MediaListSourceImportRule, sourceURL));
</ins><span class="cx">
</span><span class="cx"> if (parentRule->parentRule())
</span><span class="cx"> parentRule = parentRule->parentRule();
</span><span class="lines">@@ -267,7 +266,7 @@
</span><span class="cx"> sourceURL = styleSheet->contents().baseURL();
</span><span class="cx"> else
</span><span class="cx"> sourceURL = "";
</span><del>- mediaArray.addItem(buildMediaObject(mediaList, styleSheet->ownerNode() ? MediaListSourceLinkedSheet : MediaListSourceInlineSheet, sourceURL));
</del><ins>+ mediaArray->addItem(buildMediaObject(mediaList, styleSheet->ownerNode() ? MediaListSourceLinkedSheet : MediaListSourceInlineSheet, sourceURL));
</ins><span class="cx"> }
</span><span class="cx"> parentRule = styleSheet->ownerRule();
</span><span class="cx"> if (parentRule)
</span><span class="lines">@@ -283,12 +282,12 @@
</span><span class="cx"> return std::make_unique<CSSParser>(document ? CSSParserContext(*document) : strictCSSParserContext());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorStyle> InspectorStyle::create(const InspectorCSSId& styleId, RefPtr<CSSStyleDeclaration>&& style, InspectorStyleSheet* parentStyleSheet)
</del><ins>+PassRefPtr<InspectorStyle> InspectorStyle::create(const InspectorCSSId& styleId, PassRefPtr<CSSStyleDeclaration> style, InspectorStyleSheet* parentStyleSheet)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorStyle(styleId, WTF::move(style), parentStyleSheet));
</del><ins>+ return adoptRef(new InspectorStyle(styleId, style, parentStyleSheet));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorStyle::InspectorStyle(const InspectorCSSId& styleId, RefPtr<CSSStyleDeclaration>&& style, InspectorStyleSheet* parentStyleSheet)
</del><ins>+InspectorStyle::InspectorStyle(const InspectorCSSId& styleId, PassRefPtr<CSSStyleDeclaration> style, InspectorStyleSheet* parentStyleSheet)
</ins><span class="cx"> : m_styleId(styleId)
</span><span class="cx"> , m_style(style)
</span><span class="cx"> , m_parentStyleSheet(parentStyleSheet)
</span><span class="lines">@@ -301,9 +300,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorStyle::buildObjectForStyle() const
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorStyle::buildObjectForStyle() const
</ins><span class="cx"> {
</span><del>- Ref<Inspector::Protocol::CSS::CSSStyle> result = styleWithProperties();
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSStyle> result = styleWithProperties();
</ins><span class="cx"> if (!m_styleId.isEmpty())
</span><span class="cx"> result->setStyleId(m_styleId.asProtocolValue<Inspector::Protocol::CSS::CSSStyleId>());
</span><span class="cx">
</span><span class="lines">@@ -314,25 +313,24 @@
</span><span class="cx"> if (sourceData)
</span><span class="cx"> result->setRange(buildSourceRangeObject(sourceData->ruleBodyRange, m_parentStyleSheet->lineEndings().get()));
</span><span class="cx">
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>> InspectorStyle::buildArrayForComputedStyle() const
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>> InspectorStyle::buildArrayForComputedStyle() const
</ins><span class="cx"> {
</span><del>- auto result = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>> result = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>::create();
</ins><span class="cx"> Vector<InspectorStyleProperty> properties;
</span><span class="cx"> populateAllProperties(&properties);
</span><span class="cx">
</span><span class="cx"> for (Vector<InspectorStyleProperty>::iterator it = properties.begin(), itEnd = properties.end(); it != itEnd; ++it) {
</span><span class="cx"> const CSSPropertySourceData& propertyEntry = it->sourceData;
</span><del>- auto entry = Inspector::Protocol::CSS::CSSComputedStyleProperty::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSComputedStyleProperty> entry = Inspector::Protocol::CSS::CSSComputedStyleProperty::create()
</ins><span class="cx"> .setName(propertyEntry.name)
</span><del>- .setValue(propertyEntry.value)
- .release();
- result->addItem(WTF::move(entry));
</del><ins>+ .setValue(propertyEntry.value);
+ result->addItem(entry.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This method does the following preprocessing of |propertyText| with |overwrite| == false and |index| past the last active property:
</span><span class="lines">@@ -505,13 +503,13 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::CSS::CSSStyle> InspectorStyle::styleWithProperties() const
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorStyle::styleWithProperties() const
</ins><span class="cx"> {
</span><span class="cx"> Vector<InspectorStyleProperty> properties;
</span><span class="cx"> populateAllProperties(&properties);
</span><span class="cx">
</span><del>- auto propertiesObject = Array<Inspector::Protocol::CSS::CSSProperty>::create();
- auto shorthandEntries = Array<Inspector::Protocol::CSS::ShorthandEntry>::create();
</del><ins>+ RefPtr<Array<Inspector::Protocol::CSS::CSSProperty>> propertiesObject = Array<Inspector::Protocol::CSS::CSSProperty>::create();
+ RefPtr<Array<Inspector::Protocol::CSS::ShorthandEntry>> shorthandEntries = Array<Inspector::Protocol::CSS::ShorthandEntry>::create();
</ins><span class="cx"> HashMap<String, RefPtr<Inspector::Protocol::CSS::CSSProperty>> propertyNameToPreviousActiveProperty;
</span><span class="cx"> HashSet<String> foundShorthands;
</span><span class="cx"> String previousPriority;
</span><span class="lines">@@ -534,10 +532,9 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Inspector::Protocol::CSS::CSSProperty> property = Inspector::Protocol::CSS::CSSProperty::create()
</span><span class="cx"> .setName(name.lower())
</span><del>- .setValue(propertyEntry.value)
- .release();
</del><ins>+ .setValue(propertyEntry.value);
</ins><span class="cx">
</span><del>- propertiesObject->addItem(property.copyRef());
</del><ins>+ propertiesObject->addItem(property);
</ins><span class="cx">
</span><span class="cx"> // Default "parsedOk" == true.
</span><span class="cx"> if (!propertyEntry.parsedOk)
</span><span class="lines">@@ -603,11 +600,10 @@
</span><span class="cx"> if (!shorthand.isEmpty()) {
</span><span class="cx"> if (!foundShorthands.contains(shorthand)) {
</span><span class="cx"> foundShorthands.add(shorthand);
</span><del>- auto entry = Inspector::Protocol::CSS::ShorthandEntry::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::ShorthandEntry> entry = Inspector::Protocol::CSS::ShorthandEntry::create()
</ins><span class="cx"> .setName(shorthand)
</span><del>- .setValue(shorthandValue(shorthand))
- .release();
- shorthandEntries->addItem(WTF::move(entry));
</del><ins>+ .setValue(shorthandValue(shorthand));
+ shorthandEntries->addItem(entry.release());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -619,12 +615,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return Inspector::Protocol::CSS::CSSStyle::create()
</span><del>- .setCssProperties(WTF::move(propertiesObject))
- .setShorthandEntries(WTF::move(shorthandEntries))
</del><ins>+ .setCssProperties(propertiesObject.release())
+ .setShorthandEntries(shorthandEntries.release())
</ins><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSRuleSourceData> InspectorStyle::extractSourceData() const
</del><ins>+PassRefPtr<CSSRuleSourceData> InspectorStyle::extractSourceData() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_parentStyleSheet || !m_parentStyleSheet->ensureParsedDataReady())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -753,9 +749,9 @@
</span><span class="cx"> return m_format;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorStyleSheet> InspectorStyleSheet::create(InspectorPageAgent* pageAgent, const String& id, RefPtr<CSSStyleSheet>&& pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin origin, const String& documentURL, Listener* listener)
</del><ins>+PassRefPtr<InspectorStyleSheet> InspectorStyleSheet::create(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin origin, const String& documentURL, Listener* listener)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorStyleSheet(pageAgent, id, WTF::move(pageStyleSheet), origin, documentURL, listener));
</del><ins>+ return adoptRef(new InspectorStyleSheet(pageAgent, id, pageStyleSheet, origin, documentURL, listener));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // static
</span><span class="lines">@@ -766,10 +762,10 @@
</span><span class="cx"> return emptyString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorStyleSheet::InspectorStyleSheet(InspectorPageAgent* pageAgent, const String& id, RefPtr<CSSStyleSheet>&& pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin origin, const String& documentURL, Listener* listener)
</del><ins>+InspectorStyleSheet::InspectorStyleSheet(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin origin, const String& documentURL, Listener* listener)
</ins><span class="cx"> : m_pageAgent(pageAgent)
</span><span class="cx"> , m_id(id)
</span><del>- , m_pageStyleSheet(WTF::move(pageStyleSheet))
</del><ins>+ , m_pageStyleSheet(pageStyleSheet)
</ins><span class="cx"> , m_origin(origin)
</span><span class="cx"> , m_documentURL(documentURL)
</span><span class="cx"> , m_isRevalidating(false)
</span><span class="lines">@@ -957,7 +953,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody> InspectorStyleSheet::buildObjectForStyleSheet()
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody> InspectorStyleSheet::buildObjectForStyleSheet()
</ins><span class="cx"> {
</span><span class="cx"> CSSStyleSheet* styleSheet = pageStyleSheet();
</span><span class="cx"> if (!styleSheet)
</span><span class="lines">@@ -965,20 +961,19 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSRuleList> cssRuleList = asCSSRuleList(styleSheet);
</span><span class="cx">
</span><del>- auto result = Inspector::Protocol::CSS::CSSStyleSheetBody::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody> result = Inspector::Protocol::CSS::CSSStyleSheetBody::create()
</ins><span class="cx"> .setStyleSheetId(id())
</span><del>- .setRules(buildArrayForRuleList(cssRuleList.get()))
- .release();
</del><ins>+ .setRules(buildArrayForRuleList(cssRuleList.get()));
</ins><span class="cx">
</span><span class="cx"> String styleSheetText;
</span><span class="cx"> bool success = getText(&styleSheetText);
</span><span class="cx"> if (success)
</span><span class="cx"> result->setText(styleSheetText);
</span><span class="cx">
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::CSS::CSSStyleSheetHeader> InspectorStyleSheet::buildObjectForStyleSheetInfo()
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyleSheetHeader> InspectorStyleSheet::buildObjectForStyleSheetInfo()
</ins><span class="cx"> {
</span><span class="cx"> CSSStyleSheet* styleSheet = pageStyleSheet();
</span><span class="cx"> if (!styleSheet)
</span><span class="lines">@@ -996,31 +991,30 @@
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::CSS::CSSSelector> buildObjectForSelectorHelper(const String& selectorText, const CSSSelector& selector)
</del><ins>+static PassRefPtr<Inspector::Protocol::CSS::CSSSelector> buildObjectForSelectorHelper(const String& selectorText, const CSSSelector& selector)
</ins><span class="cx"> {
</span><del>- auto inspectorSelector = Inspector::Protocol::CSS::CSSSelector::create()
- .setText(selectorText)
- .release();
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSSelector> inspectorSelector = Inspector::Protocol::CSS::CSSSelector::create()
+ .setText(selectorText);
</ins><span class="cx">
</span><span class="cx"> bool ok;
</span><span class="cx"> unsigned specificity = selector.staticSpecificity(ok);
</span><span class="cx">
</span><span class="cx"> if (ok) {
</span><del>- auto tuple = Inspector::Protocol::Array<int>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<int>> tuple = Inspector::Protocol::Array<int>::create();
</ins><span class="cx"> tuple->addItem(static_cast<int>((specificity & CSSSelector::idMask) >> 16));
</span><span class="cx"> tuple->addItem(static_cast<int>((specificity & CSSSelector::classMask) >> 8));
</span><span class="cx"> tuple->addItem(static_cast<int>(specificity & CSSSelector::elementMask));
</span><del>- inspectorSelector->setSpecificity(WTF::move(tuple));
</del><ins>+ inspectorSelector->setSpecificity(tuple.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(inspectorSelector);
</del><ins>+ return inspectorSelector.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSSelector>> selectorsFromSource(const CSSRuleSourceData* sourceData, const String& sheetText, const CSSSelectorList& selectorList)
</del><ins>+static PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSSelector>> selectorsFromSource(const CSSRuleSourceData* sourceData, const String& sheetText, const CSSSelectorList& selectorList)
</ins><span class="cx"> {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(JSC::Yarr::RegularExpression, comment, ("/\\*[^]*?\\*/", TextCaseSensitive, JSC::Yarr::MultilineEnabled));
</span><span class="cx">
</span><del>- auto result = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSSelector>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSSelector>> result = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSSelector>::create();
</ins><span class="cx"> const SelectorRangeList& ranges = sourceData->selectorRanges;
</span><span class="cx"> const CSSSelector* selector = selectorList.first();
</span><span class="cx"> for (size_t i = 0, size = ranges.size(); i < size; ++i) {
</span><span class="lines">@@ -1033,15 +1027,15 @@
</span><span class="cx">
</span><span class="cx"> selector = CSSSelectorList::next(selector);
</span><span class="cx"> }
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::CSS::CSSSelector> InspectorStyleSheet::buildObjectForSelector(const CSSSelector* selector)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSSelector> InspectorStyleSheet::buildObjectForSelector(const CSSSelector* selector)
</ins><span class="cx"> {
</span><span class="cx"> return buildObjectForSelectorHelper(selector->selectorText(), *selector);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::CSS::SelectorList> InspectorStyleSheet::buildObjectForSelectorList(CSSStyleRule* rule)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::SelectorList> InspectorStyleSheet::buildObjectForSelectorList(CSSStyleRule* rule)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSRuleSourceData> sourceData;
</span><span class="cx"> if (ensureParsedDataReady())
</span><span class="lines">@@ -1059,27 +1053,26 @@
</span><span class="cx"> for (const CSSSelector* selector = selectorList.first(); selector; selector = CSSSelectorList::next(selector))
</span><span class="cx"> selectors->addItem(buildObjectForSelector(selector));
</span><span class="cx"> }
</span><del>- auto result = Inspector::Protocol::CSS::SelectorList::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::SelectorList> result = Inspector::Protocol::CSS::SelectorList::create()
</ins><span class="cx"> .setSelectors(selectors.release())
</span><span class="cx"> .setText(selectorText)
</span><span class="cx"> .release();
</span><span class="cx"> if (sourceData)
</span><span class="cx"> result->setRange(buildSourceRangeObject(sourceData->ruleHeaderRange, lineEndings().get()));
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::CSS::CSSRule> InspectorStyleSheet::buildObjectForRule(CSSStyleRule* rule)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSRule> InspectorStyleSheet::buildObjectForRule(CSSStyleRule* rule)
</ins><span class="cx"> {
</span><span class="cx"> CSSStyleSheet* styleSheet = pageStyleSheet();
</span><span class="cx"> if (!styleSheet)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto result = Inspector::Protocol::CSS::CSSRule::create()
</del><ins>+ RefPtr<Inspector::Protocol::CSS::CSSRule> result = Inspector::Protocol::CSS::CSSRule::create()
</ins><span class="cx"> .setSelectorList(buildObjectForSelectorList(rule))
</span><span class="cx"> .setSourceLine(rule->styleRule().sourceLine())
</span><span class="cx"> .setOrigin(m_origin)
</span><del>- .setStyle(buildObjectForStyle(&rule->style()))
- .release();
</del><ins>+ .setStyle(buildObjectForStyle(&rule->style()));
</ins><span class="cx">
</span><span class="cx"> // "sourceURL" is present only for regular rules, otherwise "origin" should be used in the frontend.
</span><span class="cx"> if (m_origin == Inspector::Protocol::CSS::StyleSheetOrigin::Regular)
</span><span class="lines">@@ -1091,16 +1084,16 @@
</span><span class="cx"> result->setRuleId(id.asProtocolValue<Inspector::Protocol::CSS::CSSRuleId>());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto mediaArray = Array<Inspector::Protocol::CSS::CSSMedia>::create();
</del><ins>+ RefPtr<Array<Inspector::Protocol::CSS::CSSMedia>> mediaArray = Array<Inspector::Protocol::CSS::CSSMedia>::create();
</ins><span class="cx">
</span><span class="cx"> fillMediaListChain(rule, mediaArray.get());
</span><span class="cx"> if (mediaArray->length())
</span><del>- result->setMedia(WTF::move(mediaArray));
</del><ins>+ result->setMedia(mediaArray.release());
</ins><span class="cx">
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorStyleSheet::buildObjectForStyle(CSSStyleDeclaration* style)
</del><ins>+PassRefPtr<Inspector::Protocol::CSS::CSSStyle> InspectorStyleSheet::buildObjectForStyle(CSSStyleDeclaration* style)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSRuleSourceData> sourceData;
</span><span class="cx"> if (ensureParsedDataReady())
</span><span class="lines">@@ -1126,7 +1119,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InspectorStyleSheet::setStyleText(const InspectorCSSId& id, const String& text, String* oldText, ExceptionCode& ec)
</span><span class="lines">@@ -1171,7 +1164,7 @@
</span><span class="cx"> bool success = inspectorStyle->toggleProperty(propertyIndex, disable, ec);
</span><span class="cx"> if (success) {
</span><span class="cx"> if (disable)
</span><del>- rememberInspectorStyle(inspectorStyle.copyRef());
</del><ins>+ rememberInspectorStyle(inspectorStyle);
</ins><span class="cx"> else if (!inspectorStyle->hasDisabledProperties())
</span><span class="cx"> forgetInspectorStyle(inspectorStyle->cssStyle());
</span><span class="cx"> fireStyleSheetChanged();
</span><span class="lines">@@ -1202,7 +1195,7 @@
</span><span class="cx"> m_listener->styleSheetChanged(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorStyle> InspectorStyleSheet::inspectorStyleForId(const InspectorCSSId& id)
</del><ins>+PassRefPtr<InspectorStyle> InspectorStyleSheet::inspectorStyleForId(const InspectorCSSId& id)
</ins><span class="cx"> {
</span><span class="cx"> CSSStyleDeclaration* style = styleForId(id);
</span><span class="cx"> if (!style)
</span><span class="lines">@@ -1214,7 +1207,7 @@
</span><span class="cx"> return it->value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorStyleSheet::rememberInspectorStyle(RefPtr<InspectorStyle>&& inspectorStyle)
</del><ins>+void InspectorStyleSheet::rememberInspectorStyle(RefPtr<InspectorStyle> inspectorStyle)
</ins><span class="cx"> {
</span><span class="cx"> m_inspectorStyles.set(inspectorStyle->cssStyle(), inspectorStyle);
</span><span class="cx"> }
</span><span class="lines">@@ -1424,23 +1417,23 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> InspectorStyleSheet::buildArrayForRuleList(CSSRuleList* ruleList)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> InspectorStyleSheet::buildArrayForRuleList(CSSRuleList* ruleList)
</ins><span class="cx"> {
</span><del>- auto result = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>::create();
</del><ins>+ RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> result = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>::create();
</ins><span class="cx"> if (!ruleList)
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSRuleList> refRuleList = ruleList;
</span><span class="cx"> CSSStyleRuleVector rules;
</span><del>- collectFlatRules(WTF::move(refRuleList), &rules);
</del><ins>+ collectFlatRules(refRuleList, &rules);
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0, size = rules.size(); i < size; ++i)
</span><span class="cx"> result->addItem(buildObjectForRule(rules.at(i).get()));
</span><span class="cx">
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorStyleSheet::collectFlatRules(RefPtr<CSSRuleList>&& ruleList, CSSStyleRuleVector* result)
</del><ins>+void InspectorStyleSheet::collectFlatRules(PassRefPtr<CSSRuleList> ruleList, CSSStyleRuleVector* result)
</ins><span class="cx"> {
</span><span class="cx"> if (!ruleList)
</span><span class="cx"> return;
</span><span class="lines">@@ -1453,19 +1446,19 @@
</span><span class="cx"> else {
</span><span class="cx"> RefPtr<CSSRuleList> childRuleList = asCSSRuleList(rule);
</span><span class="cx"> if (childRuleList)
</span><del>- collectFlatRules(WTF::move(childRuleList), result);
</del><ins>+ collectFlatRules(childRuleList, result);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorStyleSheetForInlineStyle> InspectorStyleSheetForInlineStyle::create(InspectorPageAgent* pageAgent, const String& id, RefPtr<Element>&& element, Inspector::Protocol::CSS::StyleSheetOrigin origin, Listener* listener)
</del><ins>+PassRefPtr<InspectorStyleSheetForInlineStyle> InspectorStyleSheetForInlineStyle::create(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<Element> element, Inspector::Protocol::CSS::StyleSheetOrigin origin, Listener* listener)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new InspectorStyleSheetForInlineStyle(pageAgent, id, WTF::move(element), origin, listener));
</del><ins>+ return adoptRef(new InspectorStyleSheetForInlineStyle(pageAgent, id, element, origin, listener));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorStyleSheetForInlineStyle::InspectorStyleSheetForInlineStyle(InspectorPageAgent* pageAgent, const String& id, RefPtr<Element>&& element, Inspector::Protocol::CSS::StyleSheetOrigin origin, Listener* listener)
</del><ins>+InspectorStyleSheetForInlineStyle::InspectorStyleSheetForInlineStyle(InspectorPageAgent* pageAgent, const String& id, PassRefPtr<Element> element, Inspector::Protocol::CSS::StyleSheetOrigin origin, Listener* listener)
</ins><span class="cx"> : InspectorStyleSheet(pageAgent, id, nullptr, origin, "", listener)
</span><del>- , m_element(WTF::move(element))
</del><ins>+ , m_element(element)
</ins><span class="cx"> , m_ruleSourceData(nullptr)
</span><span class="cx"> , m_isStyleTextValid(false)
</span><span class="cx"> {
</span><span class="lines">@@ -1538,10 +1531,10 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<InspectorStyle> InspectorStyleSheetForInlineStyle::inspectorStyleForId(const InspectorCSSId& id)
</del><ins>+PassRefPtr<InspectorStyle> InspectorStyleSheetForInlineStyle::inspectorStyleForId(const InspectorCSSId& id)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(id, !id.ordinal());
</span><del>- return m_inspectorStyle.copyRef();
</del><ins>+ return m_inspectorStyle;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSStyleDeclaration* InspectorStyleSheetForInlineStyle::inlineStyle() const
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -63,13 +64,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- explicit InspectorCSSId(const RefPtr<Inspector::InspectorObject>&& value)
</del><ins>+ explicit InspectorCSSId(RefPtr<Inspector::InspectorObject> value)
</ins><span class="cx"> {
</span><span class="cx"> if (!value->getString("styleSheetId", m_styleSheetId))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- int ordinalValue;
- if (!value->getInteger("ordinal", ordinalValue))
</del><ins>+ RefPtr<Inspector::InspectorValue> ordinalValue = value->get("ordinal");
+ if (!ordinalValue || !ordinalValue->asInteger(m_ordinal))
</ins><span class="cx"> m_styleSheetId = "";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -86,15 +87,15 @@
</span><span class="cx">
</span><span class="cx"> // ID type is either Inspector::Protocol::CSS::CSSStyleId or Inspector::Protocol::CSS::CSSRuleId.
</span><span class="cx"> template<typename ID>
</span><del>- RefPtr<ID> asProtocolValue() const
</del><ins>+ PassRefPtr<ID> asProtocolValue() const
</ins><span class="cx"> {
</span><span class="cx"> if (isEmpty())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return ID::create()
</del><ins>+ RefPtr<ID> result = ID::create()
</ins><span class="cx"> .setStyleSheetId(m_styleSheetId)
</span><del>- .setOrdinal(m_ordinal)
- .release();
</del><ins>+ .setOrdinal(m_ordinal);
+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -135,12 +136,12 @@
</span><span class="cx">
</span><span class="cx"> class InspectorStyle final : public RefCounted<InspectorStyle> {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorStyle> create(const InspectorCSSId& styleId, RefPtr<CSSStyleDeclaration>&&, InspectorStyleSheet* parentStyleSheet);
</del><ins>+ static PassRefPtr<InspectorStyle> create(const InspectorCSSId& styleId, PassRefPtr<CSSStyleDeclaration> style, InspectorStyleSheet* parentStyleSheet);
</ins><span class="cx"> ~InspectorStyle();
</span><span class="cx">
</span><span class="cx"> CSSStyleDeclaration* cssStyle() const { return m_style.get(); }
</span><del>- RefPtr<Inspector::Protocol::CSS::CSSStyle> buildObjectForStyle() const;
- Ref<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>> buildArrayForComputedStyle() const;
</del><ins>+ PassRefPtr<Inspector::Protocol::CSS::CSSStyle> buildObjectForStyle() const;
+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>> buildArrayForComputedStyle() const;
</ins><span class="cx"> bool hasDisabledProperties() const { return !m_disabledProperties.isEmpty(); }
</span><span class="cx"> bool setPropertyText(unsigned index, const String& text, bool overwrite, String* oldText, ExceptionCode&);
</span><span class="cx"> bool toggleProperty(unsigned index, bool disable, ExceptionCode&);
</span><span class="lines">@@ -149,15 +150,15 @@
</span><span class="cx"> bool setText(const String&, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- InspectorStyle(const InspectorCSSId& styleId, RefPtr<CSSStyleDeclaration>&&, InspectorStyleSheet* parentStyleSheet);
</del><ins>+ InspectorStyle(const InspectorCSSId& styleId, PassRefPtr<CSSStyleDeclaration> style, InspectorStyleSheet* parentStyleSheet);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Remove these aliases and update all the current call sites to use the new public methods.
</span><span class="cx"> bool styleText(String* result) const { return getText(result); }
</span><span class="cx"> bool applyStyleText(const String& text) { ExceptionCode ec = 0; return setText(text, ec); }
</span><span class="cx">
</span><span class="cx"> bool populateAllProperties(Vector<InspectorStyleProperty>* result) const;
</span><del>- Ref<Inspector::Protocol::CSS::CSSStyle> styleWithProperties() const;
- RefPtr<CSSRuleSourceData> extractSourceData() const;
</del><ins>+ PassRefPtr<Inspector::Protocol::CSS::CSSStyle> styleWithProperties() const;
+ PassRefPtr<CSSRuleSourceData> extractSourceData() const;
</ins><span class="cx"> String shorthandValue(const String& shorthandProperty) const;
</span><span class="cx"> String shorthandPriority(const String& shorthandProperty) const;
</span><span class="cx"> Vector<String> longhandProperties(const String& shorthandProperty) const;
</span><span class="lines">@@ -181,7 +182,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef HashMap<CSSStyleDeclaration*, RefPtr<InspectorStyle>> InspectorStyleMap;
</span><del>- static Ref<InspectorStyleSheet> create(InspectorPageAgent*, const String& id, RefPtr<CSSStyleSheet>&& pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin, const String& documentURL, Listener*);
</del><ins>+ static PassRefPtr<InspectorStyleSheet> create(InspectorPageAgent*, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin, const String& documentURL, Listener*);
</ins><span class="cx"> static String styleSheetURL(CSSStyleSheet* pageStyleSheet);
</span><span class="cx">
</span><span class="cx"> virtual ~InspectorStyleSheet();
</span><span class="lines">@@ -196,10 +197,10 @@
</span><span class="cx"> CSSStyleRule* addRule(const String& selector, ExceptionCode&);
</span><span class="cx"> bool deleteRule(const InspectorCSSId&, ExceptionCode&);
</span><span class="cx"> CSSStyleRule* ruleForId(const InspectorCSSId&) const;
</span><del>- RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody> buildObjectForStyleSheet();
- RefPtr<Inspector::Protocol::CSS::CSSStyleSheetHeader> buildObjectForStyleSheetInfo();
- RefPtr<Inspector::Protocol::CSS::CSSRule> buildObjectForRule(CSSStyleRule*);
- RefPtr<Inspector::Protocol::CSS::CSSStyle> buildObjectForStyle(CSSStyleDeclaration*);
</del><ins>+ PassRefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody> buildObjectForStyleSheet();
+ PassRefPtr<Inspector::Protocol::CSS::CSSStyleSheetHeader> buildObjectForStyleSheetInfo();
+ PassRefPtr<Inspector::Protocol::CSS::CSSRule> buildObjectForRule(CSSStyleRule*);
+ PassRefPtr<Inspector::Protocol::CSS::CSSStyle> buildObjectForStyle(CSSStyleDeclaration*);
</ins><span class="cx"> bool setStyleText(const InspectorCSSId&, const String& text, String* oldText, ExceptionCode&);
</span><span class="cx"> bool setPropertyText(const InspectorCSSId&, unsigned propertyIndex, const String& text, bool overwrite, String* oldPropertyText, ExceptionCode&);
</span><span class="cx"> bool toggleProperty(const InspectorCSSId&, unsigned propertyIndex, bool disable, ExceptionCode&);
</span><span class="lines">@@ -212,17 +213,17 @@
</span><span class="cx"> InspectorCSSId styleId(CSSStyleDeclaration* style) const { return ruleOrStyleId(style); }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- InspectorStyleSheet(InspectorPageAgent*, const String& id, RefPtr<CSSStyleSheet>&& pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin, const String& documentURL, Listener*);
</del><ins>+ InspectorStyleSheet(InspectorPageAgent*, const String& id, PassRefPtr<CSSStyleSheet> pageStyleSheet, Inspector::Protocol::CSS::StyleSheetOrigin, const String& documentURL, Listener*);
</ins><span class="cx">
</span><span class="cx"> bool canBind() const { return m_origin != Inspector::Protocol::CSS::StyleSheetOrigin::UserAgent && m_origin != Inspector::Protocol::CSS::StyleSheetOrigin::User; }
</span><del>- InspectorCSSId ruleOrStyleId(CSSStyleDeclaration*) const;
</del><ins>+ InspectorCSSId ruleOrStyleId(CSSStyleDeclaration* style) const;
</ins><span class="cx"> virtual Document* ownerDocument() const;
</span><del>- virtual RefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration*) const;
</del><ins>+ virtual RefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const;
</ins><span class="cx"> virtual unsigned ruleIndexByStyle(CSSStyleDeclaration*) const;
</span><span class="cx"> virtual bool ensureParsedDataReady();
</span><del>- virtual RefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&);
- virtual void rememberInspectorStyle(RefPtr<InspectorStyle>&&);
- virtual void forgetInspectorStyle(CSSStyleDeclaration*);
</del><ins>+ virtual PassRefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&);
+ virtual void rememberInspectorStyle(RefPtr<InspectorStyle> inspectorStyle);
+ virtual void forgetInspectorStyle(CSSStyleDeclaration* style);
</ins><span class="cx">
</span><span class="cx"> // Also accessed by friend class InspectorStyle.
</span><span class="cx"> virtual bool setStyleText(CSSStyleDeclaration*, const String&, ExceptionCode&);
</span><span class="lines">@@ -232,7 +233,7 @@
</span><span class="cx"> typedef Vector<RefPtr<CSSStyleRule>> CSSStyleRuleVector;
</span><span class="cx"> friend class InspectorStyle;
</span><span class="cx">
</span><del>- static void collectFlatRules(RefPtr<CSSRuleList>&&, CSSStyleRuleVector* result);
</del><ins>+ static void collectFlatRules(PassRefPtr<CSSRuleList>, CSSStyleRuleVector* result);
</ins><span class="cx"> bool checkPageStyleSheet(ExceptionCode&) const;
</span><span class="cx"> bool ensureText() const;
</span><span class="cx"> bool ensureSourceData();
</span><span class="lines">@@ -242,9 +243,9 @@
</span><span class="cx"> bool originalStyleSheetText(String* result) const;
</span><span class="cx"> bool resourceStyleSheetText(String* result) const;
</span><span class="cx"> bool inlineStyleSheetText(String* result) const;
</span><del>- Ref<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> buildArrayForRuleList(CSSRuleList*);
- Ref<Inspector::Protocol::CSS::CSSSelector> buildObjectForSelector(const CSSSelector*);
- Ref<Inspector::Protocol::CSS::SelectorList> buildObjectForSelectorList(CSSStyleRule*);
</del><ins>+ PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> buildArrayForRuleList(CSSRuleList*);
+ PassRefPtr<Inspector::Protocol::CSS::CSSSelector> buildObjectForSelector(const CSSSelector*);
+ PassRefPtr<Inspector::Protocol::CSS::SelectorList> buildObjectForSelectorList(CSSStyleRule*);
</ins><span class="cx">
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> String m_id;
</span><span class="lines">@@ -260,21 +261,21 @@
</span><span class="cx">
</span><span class="cx"> class InspectorStyleSheetForInlineStyle final : public InspectorStyleSheet {
</span><span class="cx"> public:
</span><del>- static Ref<InspectorStyleSheetForInlineStyle> create(InspectorPageAgent*, const String& id, RefPtr<Element>&&, Inspector::Protocol::CSS::StyleSheetOrigin, Listener*);
</del><ins>+ static PassRefPtr<InspectorStyleSheetForInlineStyle> create(InspectorPageAgent*, const String& id, PassRefPtr<Element>, Inspector::Protocol::CSS::StyleSheetOrigin, Listener*);
</ins><span class="cx">
</span><span class="cx"> void didModifyElementAttribute();
</span><span class="cx"> virtual bool getText(String* result) const override;
</span><span class="cx"> virtual CSSStyleDeclaration* styleForId(const InspectorCSSId& id) const override { ASSERT_UNUSED(id, !id.ordinal()); return inlineStyle(); }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- InspectorStyleSheetForInlineStyle(InspectorPageAgent*, const String& id, RefPtr<Element>&&, Inspector::Protocol::CSS::StyleSheetOrigin, Listener*);
</del><ins>+ InspectorStyleSheetForInlineStyle(InspectorPageAgent*, const String& id, PassRefPtr<Element>, Inspector::Protocol::CSS::StyleSheetOrigin, Listener*);
</ins><span class="cx">
</span><span class="cx"> virtual Document* ownerDocument() const override;
</span><span class="cx"> virtual RefPtr<CSSRuleSourceData> ruleSourceDataFor(CSSStyleDeclaration* style) const override { ASSERT_UNUSED(style, style == inlineStyle()); return m_ruleSourceData; }
</span><span class="cx"> virtual unsigned ruleIndexByStyle(CSSStyleDeclaration*) const override { return 0; }
</span><span class="cx"> virtual bool ensureParsedDataReady() override;
</span><del>- virtual RefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) override;
- virtual void rememberInspectorStyle(RefPtr<InspectorStyle>&&) override { }
</del><ins>+ virtual PassRefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&) override;
+ virtual void rememberInspectorStyle(RefPtr<InspectorStyle>) override { }
</ins><span class="cx"> virtual void forgetInspectorStyle(CSSStyleDeclaration*) override { }
</span><span class="cx">
</span><span class="cx"> // Also accessed by friend class InspectorStyle.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -197,9 +197,9 @@
</span><span class="cx">
</span><span class="cx"> // Use an independent stopwatch for console-initiated profiling, since the user will expect it
</span><span class="cx"> // to be relative to when their command was issued.
</span><del>- Ref<Stopwatch> profilerStopwatch = Stopwatch::create();
</del><ins>+ RefPtr<Stopwatch> profilerStopwatch = Stopwatch::create();
</ins><span class="cx"> profilerStopwatch->start();
</span><del>- startProfiling(exec, title, WTF::move(profilerStopwatch));
</del><ins>+ startProfiling(exec, title, profilerStopwatch.release());
</ins><span class="cx">
</span><span class="cx"> m_pendingConsoleProfileRecords.append(createRecordEntry(TimelineRecordFactory::createConsoleProfileData(title), TimelineRecordType::ConsoleProfile, true, frameFromExecState(exec)));
</span><span class="cx"> }
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> if (title.isEmpty() || recordTitle == title) {
</span><span class="cx"> RefPtr<JSC::Profile> profile = stopProfiling(exec, title);
</span><span class="cx"> if (profile)
</span><del>- TimelineRecordFactory::appendProfile(record.data.get(), profile.copyRef());
</del><ins>+ TimelineRecordFactory::appendProfile(record.data.get(), profile);
</ins><span class="cx">
</span><span class="cx"> didCompleteRecordEntry(record);
</span><span class="cx">
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> if (!m_enabledFromFrontend && m_pendingConsoleProfileRecords.isEmpty())
</span><span class="cx"> internalStop();
</span><span class="cx">
</span><del>- return WTF::move(profile);
</del><ins>+ return profile.release();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -647,17 +647,17 @@
</span><span class="cx"> return Inspector::Protocol::Timeline::EventType::TimeStamp;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::addRecordToTimeline(RefPtr<InspectorObject>&& record, TimelineRecordType type)
</del><ins>+void InspectorTimelineAgent::addRecordToTimeline(PassRefPtr<InspectorObject> prpRecord, TimelineRecordType type)
</ins><span class="cx"> {
</span><del>- ASSERT_ARG(record, record);
- record->setString("type", Inspector::Protocol::getEnumConstantValue(toProtocol(type)));
</del><ins>+ prpRecord->setString("type", Inspector::Protocol::getEnumConstantValue(toProtocol(type)));
</ins><span class="cx">
</span><del>- if (m_recordStack.isEmpty()) {
- auto recordObject = BindingTraits<Inspector::Protocol::Timeline::TimelineEvent>::runtimeCast(WTF::move(record));
- sendEvent(WTF::move(recordObject));
- } else {
</del><ins>+ RefPtr<Inspector::Protocol::Timeline::TimelineEvent> record = BindingTraits<Inspector::Protocol::Timeline::TimelineEvent>::runtimeCast(prpRecord);
+
+ if (m_recordStack.isEmpty())
+ sendEvent(record.release());
+ else {
</ins><span class="cx"> const TimelineRecordEntry& parent = m_recordStack.last();
</span><del>- parent.children->pushObject(WTF::move(record));
</del><ins>+ parent.children->pushObject(record.release());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -676,7 +676,7 @@
</span><span class="cx"> entry.record->setObject(ASCIILiteral("data"), entry.data);
</span><span class="cx"> entry.record->setArray(ASCIILiteral("children"), entry.children);
</span><span class="cx"> entry.record->setDouble(ASCIILiteral("endTime"), timestamp());
</span><del>- addRecordToTimeline(entry.record.copyRef(), entry.type);
</del><ins>+ addRecordToTimeline(entry.record, entry.type);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::didCompleteCurrentRecord(TimelineRecordType type)
</span><span class="lines">@@ -705,34 +705,34 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::appendRecord(RefPtr<InspectorObject>&& data, TimelineRecordType type, bool captureCallStack, Frame* frame)
</del><ins>+void InspectorTimelineAgent::appendRecord(PassRefPtr<InspectorObject> data, TimelineRecordType type, bool captureCallStack, Frame* frame)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0);
- record->setObject("data", WTF::move(data));
- setFrameIdentifier(&record.get(), frame);
- addRecordToTimeline(WTF::move(record), type);
</del><ins>+ RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0);
+ record->setObject("data", data);
+ setFrameIdentifier(record.get(), frame);
+ addRecordToTimeline(record.release(), type);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::sendEvent(RefPtr<InspectorObject>&& event)
</del><ins>+void InspectorTimelineAgent::sendEvent(PassRefPtr<InspectorObject> event)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_frontendDispatcher)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: runtimeCast is a hack. We do it because we can't build TimelineEvent directly now.
</span><del>- auto recordChecked = BindingTraits<Inspector::Protocol::Timeline::TimelineEvent>::runtimeCast(WTF::move(event));
- m_frontendDispatcher->eventRecorded(WTF::move(recordChecked));
</del><ins>+ RefPtr<Inspector::Protocol::Timeline::TimelineEvent> recordChecked = BindingTraits<Inspector::Protocol::Timeline::TimelineEvent>::runtimeCast(event);
+ m_frontendDispatcher->eventRecorded(recordChecked.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTimelineAgent::TimelineRecordEntry InspectorTimelineAgent::createRecordEntry(RefPtr<InspectorObject>&& data, TimelineRecordType type, bool captureCallStack, Frame* frame)
</del><ins>+InspectorTimelineAgent::TimelineRecordEntry InspectorTimelineAgent::createRecordEntry(PassRefPtr<InspectorObject> data, TimelineRecordType type, bool captureCallStack, Frame* frame)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0);
- setFrameIdentifier(&record.get(), frame);
- return TimelineRecordEntry(WTF::move(record), WTF::move(data), InspectorArray::create(), type);
</del><ins>+ RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0);
+ setFrameIdentifier(record.get(), frame);
+ return TimelineRecordEntry(record.release(), data, InspectorArray::create(), type);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::pushCurrentRecord(RefPtr<InspectorObject>&& data, TimelineRecordType type, bool captureCallStack, Frame* frame)
</del><ins>+void InspectorTimelineAgent::pushCurrentRecord(PassRefPtr<InspectorObject> data, TimelineRecordType type, bool captureCallStack, Frame* frame)
</ins><span class="cx"> {
</span><del>- pushCurrentRecord(createRecordEntry(WTF::move(data), type, captureCallStack, frame));
</del><ins>+ pushCurrentRecord(createRecordEntry(data, type, captureCallStack, frame));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::clearRecordStack()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -224,19 +224,19 @@
</span><span class="cx"> void internalStop();
</span><span class="cx"> double timestamp();
</span><span class="cx">
</span><del>- void sendEvent(RefPtr<Inspector::InspectorObject>&&);
- void appendRecord(RefPtr<Inspector::InspectorObject>&& data, TimelineRecordType, bool captureCallStack, Frame*);
- void pushCurrentRecord(RefPtr<Inspector::InspectorObject>&&, TimelineRecordType, bool captureCallStack, Frame*);
</del><ins>+ void sendEvent(PassRefPtr<Inspector::InspectorObject>);
+ void appendRecord(PassRefPtr<Inspector::InspectorObject> data, TimelineRecordType, bool captureCallStack, Frame*);
+ void pushCurrentRecord(PassRefPtr<Inspector::InspectorObject>, TimelineRecordType, bool captureCallStack, Frame*);
</ins><span class="cx"> void pushCurrentRecord(const TimelineRecordEntry& record) { m_recordStack.append(record); }
</span><span class="cx">
</span><del>- TimelineRecordEntry createRecordEntry(RefPtr<Inspector::InspectorObject>&& data, TimelineRecordType, bool captureCallStack, Frame*);
</del><ins>+ TimelineRecordEntry createRecordEntry(PassRefPtr<Inspector::InspectorObject> data, TimelineRecordType, bool captureCallStack, Frame*);
</ins><span class="cx">
</span><span class="cx"> void setFrameIdentifier(Inspector::InspectorObject* record, Frame*);
</span><span class="cx">
</span><span class="cx"> void didCompleteRecordEntry(const TimelineRecordEntry&);
</span><span class="cx"> void didCompleteCurrentRecord(TimelineRecordType);
</span><span class="cx">
</span><del>- void addRecordToTimeline(RefPtr<Inspector::InspectorObject>&&, TimelineRecordType);
</del><ins>+ void addRecordToTimeline(PassRefPtr<Inspector::InspectorObject>, TimelineRecordType);
</ins><span class="cx"> void clearRecordStack();
</span><span class="cx">
</span><span class="cx"> void localToPageQuad(const RenderObject&, const LayoutRect&, FloatQuad*);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> error = ASCIILiteral("Worker is gone");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorWorkerAgent::sendMessageToWorker(ErrorString& error, int workerId, const RefPtr<InspectorObject>&& message)
</del><ins>+void InspectorWorkerAgent::sendMessageToWorker(ErrorString& error, int workerId, const RefPtr<InspectorObject>& message)
</ins><span class="cx"> {
</span><span class="cx"> WorkerFrontendChannel* channel = m_idToChannel.get(workerId);
</span><span class="cx"> if (channel)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> virtual void canInspectWorkers(ErrorString&, bool*) override;
</span><span class="cx"> virtual void connectToWorker(ErrorString&, int workerId) override;
</span><span class="cx"> virtual void disconnectFromWorker(ErrorString&, int workerId) override;
</span><del>- virtual void sendMessageToWorker(ErrorString&, int workerId, const RefPtr<Inspector::InspectorObject>&& message) override;
</del><ins>+ virtual void sendMessageToWorker(ErrorString&, int workerId, const RefPtr<Inspector::InspectorObject>& message) override;
</ins><span class="cx"> virtual void setAutoconnectToWorkers(ErrorString&, bool value) override;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorNetworkResourcesDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/NetworkResourcesData.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/NetworkResourcesData.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -51,17 +51,17 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx">
</span><del>-Ref<XHRReplayData> XHRReplayData::create(const String &method, const URL& url, bool async, RefPtr<FormData>&& formData, const HTTPHeaderMap& headers, bool includeCredentials)
</del><ins>+PassRefPtr<XHRReplayData> XHRReplayData::create(const String &method, const URL& url, bool async, PassRefPtr<FormData> formData, const HTTPHeaderMap& headers, bool includeCredentials)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new XHRReplayData(method, url, async, WTF::move(formData), headers, includeCredentials));
</del><ins>+ return adoptRef(new XHRReplayData(method, url, async, formData, headers, includeCredentials));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-XHRReplayData::XHRReplayData(const String &method, const URL& url, bool async, RefPtr<FormData>&& formData, const HTTPHeaderMap& headers, bool includeCredentials)
</del><ins>+XHRReplayData::XHRReplayData(const String &method, const URL& url, bool async, PassRefPtr<FormData> formData, const HTTPHeaderMap& headers, bool includeCredentials)
</ins><span class="cx"> : m_method(method)
</span><span class="cx"> , m_url(url)
</span><span class="cx"> , m_async(async)
</span><del>- , m_formData(WTF::move(formData))
</del><ins>+ , m_formData(formData)
</ins><span class="cx"> , m_headers(headers)
</span><span class="cx"> , m_includeCredentials(includeCredentials)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorNetworkResourcesDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/NetworkResourcesData.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/NetworkResourcesData.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/NetworkResourcesData.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> class XHRReplayData : public RefCounted<XHRReplayData> {
</span><span class="cx"> public:
</span><del>- static Ref<XHRReplayData> create(const String &method, const URL&, bool async, RefPtr<FormData>&&, const HTTPHeaderMap& headers, bool includeCredentials);
</del><ins>+ static PassRefPtr<XHRReplayData> create(const String &method, const URL&, bool async, PassRefPtr<FormData>, const HTTPHeaderMap& headers, bool includeCredentials);
</ins><span class="cx">
</span><span class="cx"> const String& method() const { return m_method; }
</span><span class="cx"> const URL& url() const { return m_url; }
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> const HTTPHeaderMap& headers() const { return m_headers; }
</span><span class="cx"> bool includeCredentials() const { return m_includeCredentials; }
</span><span class="cx"> private:
</span><del>- XHRReplayData(const String &method, const URL&, bool async, RefPtr<FormData>&&, const HTTPHeaderMap& headers, bool includeCredentials);
</del><ins>+ XHRReplayData(const String &method, const URL&, bool async, PassRefPtr<FormData>, const HTTPHeaderMap& headers, bool includeCredentials);
</ins><span class="cx">
</span><span class="cx"> String m_method;
</span><span class="cx"> URL m_url;
</span><span class="lines">@@ -107,11 +107,11 @@
</span><span class="cx"> String textEncodingName() const { return m_textEncodingName; }
</span><span class="cx"> void setTextEncodingName(const String& textEncodingName) { m_textEncodingName = textEncodingName; }
</span><span class="cx">
</span><del>- RefPtr<TextResourceDecoder> decoder() const { return m_decoder.copyRef(); }
- void setDecoder(RefPtr<TextResourceDecoder>&& decoder) { m_decoder = WTF::move(decoder); }
</del><ins>+ PassRefPtr<TextResourceDecoder> decoder() const { return m_decoder; }
+ void setDecoder(PassRefPtr<TextResourceDecoder> decoder) { m_decoder = decoder; }
</ins><span class="cx">
</span><del>- RefPtr<SharedBuffer> buffer() const { return m_buffer.copyRef(); }
- void setBuffer(RefPtr<SharedBuffer>&& buffer) { m_buffer = WTF::move(buffer); }
</del><ins>+ PassRefPtr<SharedBuffer> buffer() const { return m_buffer; }
+ void setBuffer(PassRefPtr<SharedBuffer> buffer) { m_buffer = buffer; }
</ins><span class="cx">
</span><span class="cx"> CachedResource* cachedResource() const { return m_cachedResource; }
</span><span class="cx"> void setCachedResource(CachedResource* cachedResource) { m_cachedResource = cachedResource; }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -52,9 +52,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createGenericRecord(double startTime, int maxCallStackDepth)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createGenericRecord(double startTime, int maxCallStackDepth)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> record = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> record = InspectorObject::create();
</ins><span class="cx"> record->setDouble("startTime", startTime);
</span><span class="cx">
</span><span class="cx"> if (maxCallStackDepth) {
</span><span class="lines">@@ -62,185 +62,185 @@
</span><span class="cx"> if (stackTrace && stackTrace->size())
</span><span class="cx"> record->setValue("stackTrace", stackTrace->buildInspectorArray());
</span><span class="cx"> }
</span><del>- return WTF::move(record);
</del><ins>+ return record.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createBackgroundRecord(double startTime, const String& threadName)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createBackgroundRecord(double startTime, const String& threadName)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> record = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> record = InspectorObject::create();
</ins><span class="cx"> record->setDouble("startTime", startTime);
</span><span class="cx"> record->setString("thread", threadName);
</span><del>- return WTF::move(record);
</del><ins>+ return record.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createGCEventData(const size_t usedHeapSizeDelta)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createGCEventData(const size_t usedHeapSizeDelta)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setInteger("usedHeapSizeDelta", usedHeapSizeDelta);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createFunctionCallData(const String& scriptName, int scriptLine)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createFunctionCallData(const String& scriptName, int scriptLine)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("scriptName", scriptName);
</span><span class="cx"> data->setInteger("scriptLine", scriptLine);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createConsoleProfileData(const String& title)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createConsoleProfileData(const String& title)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("title", title);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createProbeSampleData(const ScriptBreakpointAction& action, unsigned sampleId)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createProbeSampleData(const ScriptBreakpointAction& action, unsigned sampleId)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setInteger(ASCIILiteral("probeId"), action.identifier);
</span><span class="cx"> data->setInteger(ASCIILiteral("sampleId"), sampleId);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createEventDispatchData(const Event& event)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createEventDispatchData(const Event& event)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("type", event.type().string());
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createGenericTimerData(int timerId)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createGenericTimerData(int timerId)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setInteger("timerId", timerId);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createTimerInstallData(int timerId, int timeout, bool singleShot)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createTimerInstallData(int timerId, int timeout, bool singleShot)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setInteger("timerId", timerId);
</span><span class="cx"> data->setInteger("timeout", timeout);
</span><span class="cx"> data->setBoolean("singleShot", singleShot);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createXHRReadyStateChangeData(const String& url, int readyState)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createXHRReadyStateChangeData(const String& url, int readyState)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("url", url);
</span><span class="cx"> data->setInteger("readyState", readyState);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createXHRLoadData(const String& url)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createXHRLoadData(const String& url)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("url", url);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createEvaluateScriptData(const String& url, double lineNumber)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createEvaluateScriptData(const String& url, double lineNumber)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("url", url);
</span><span class="cx"> data->setInteger("lineNumber", lineNumber);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createTimeStampData(const String& message)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createTimeStampData(const String& message)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("message", message);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createScheduleResourceRequestData(const String& url)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createScheduleResourceRequestData(const String& url)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("url", url);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createResourceSendRequestData(const String& requestId, const ResourceRequest& request)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createResourceSendRequestData(const String& requestId, const ResourceRequest& request)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("requestId", requestId);
</span><span class="cx"> data->setString("url", request.url().string());
</span><span class="cx"> data->setString("requestMethod", request.httpMethod());
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createResourceReceiveResponseData(const String& requestId, const ResourceResponse& response)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createResourceReceiveResponseData(const String& requestId, const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("requestId", requestId);
</span><span class="cx"> data->setInteger("statusCode", response.httpStatusCode());
</span><span class="cx"> data->setString("mimeType", response.mimeType());
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createResourceFinishData(const String& requestId, bool didFail, double finishTime)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createResourceFinishData(const String& requestId, bool didFail, double finishTime)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("requestId", requestId);
</span><span class="cx"> data->setBoolean("didFail", didFail);
</span><span class="cx"> if (finishTime)
</span><span class="cx"> data->setDouble("networkTime", finishTime);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createReceiveResourceData(const String& requestId, int length)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createReceiveResourceData(const String& requestId, int length)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("requestId", requestId);
</span><span class="cx"> data->setInteger("encodedDataLength", length);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createLayoutData(unsigned dirtyObjects, unsigned totalObjects, bool partialLayout)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createLayoutData(unsigned dirtyObjects, unsigned totalObjects, bool partialLayout)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setInteger("dirtyObjects", dirtyObjects);
</span><span class="cx"> data->setInteger("totalObjects", totalObjects);
</span><span class="cx"> data->setBoolean("partialLayout", partialLayout);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><del>-
-Ref<InspectorObject> TimelineRecordFactory::createDecodeImageData(const String& imageType)
</del><ins>+
+PassRefPtr<InspectorObject> TimelineRecordFactory::createDecodeImageData(const String& imageType)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setString("imageType", imageType);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createResizeImageData(bool shouldCache)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createResizeImageData(bool shouldCache)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setBoolean("cached", shouldCache);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createMarkData(bool isMainFrame)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createMarkData(bool isMainFrame)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setBoolean("isMainFrame", isMainFrame);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createParseHTMLData(unsigned startLine)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createParseHTMLData(unsigned startLine)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setInteger("startLine", startLine);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createAnimationFrameData(int callbackId)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createAnimationFrameData(int callbackId)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setInteger("id", callbackId);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<InspectorArray> createQuad(const FloatQuad& quad)
</span><span class="lines">@@ -254,14 +254,14 @@
</span><span class="cx"> array->pushDouble(quad.p3().y());
</span><span class="cx"> array->pushDouble(quad.p4().x());
</span><span class="cx"> array->pushDouble(quad.p4().y());
</span><del>- return WTF::move(array);
</del><ins>+ return array.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createPaintData(const FloatQuad& quad)
</del><ins>+PassRefPtr<InspectorObject> TimelineRecordFactory::createPaintData(const FloatQuad& quad)
</ins><span class="cx"> {
</span><del>- Ref<InspectorObject> data = InspectorObject::create();
</del><ins>+ RefPtr<InspectorObject> data = InspectorObject::create();
</ins><span class="cx"> data->setArray("clip", createQuad(quad));
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TimelineRecordFactory::appendLayoutRoot(InspectorObject* data, const FloatQuad& quad)
</span><span class="lines">@@ -269,24 +269,23 @@
</span><span class="cx"> data->setArray("root", createQuad(quad));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Protocol::Timeline::CPUProfileNodeCall> buildInspectorObject(const JSC::ProfileNode::Call& call)
</del><ins>+static PassRefPtr<Protocol::Timeline::CPUProfileNodeCall> buildInspectorObject(const JSC::ProfileNode::Call& call)
</ins><span class="cx"> {
</span><del>- return Protocol::Timeline::CPUProfileNodeCall::create()
</del><ins>+ RefPtr<Protocol::Timeline::CPUProfileNodeCall> result = Protocol::Timeline::CPUProfileNodeCall::create()
</ins><span class="cx"> .setStartTime(call.startTime())
</span><del>- .setTotalTime(call.elapsedTime())
- .release();
</del><ins>+ .setTotalTime(call.elapsedTime());
+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Protocol::Timeline::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
</del><ins>+static PassRefPtr<Protocol::Timeline::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
</ins><span class="cx"> {
</span><del>- auto calls = Protocol::Array<Protocol::Timeline::CPUProfileNodeCall>::create();
</del><ins>+ RefPtr<Protocol::Array<Protocol::Timeline::CPUProfileNodeCall>> calls = Protocol::Array<Protocol::Timeline::CPUProfileNodeCall>::create();
</ins><span class="cx"> for (const JSC::ProfileNode::Call& call : node->calls())
</span><span class="cx"> calls->addItem(buildInspectorObject(call));
</span><span class="cx">
</span><del>- auto result = Protocol::Timeline::CPUProfileNode::create()
</del><ins>+ RefPtr<Protocol::Timeline::CPUProfileNode> result = Protocol::Timeline::CPUProfileNode::create()
</ins><span class="cx"> .setId(node->id())
</span><del>- .setCalls(WTF::move(calls))
- .release();
</del><ins>+ .setCalls(calls.release());
</ins><span class="cx">
</span><span class="cx"> if (!node->functionName().isEmpty())
</span><span class="cx"> result->setFunctionName(node->functionName());
</span><span class="lines">@@ -298,27 +297,28 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!node->children().isEmpty()) {
</span><del>- auto children = Protocol::Array<Protocol::Timeline::CPUProfileNode>::create();
</del><ins>+ RefPtr<Protocol::Array<Protocol::Timeline::CPUProfileNode>> children = Protocol::Array<Protocol::Timeline::CPUProfileNode>::create();
</ins><span class="cx"> for (RefPtr<JSC::ProfileNode> profileNode : node->children())
</span><span class="cx"> children->addItem(buildInspectorObject(profileNode.get()));
</span><del>- result->setChildren(WTF::move(children));
</del><ins>+ result->setChildren(children);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return WTF::move(result);
</del><ins>+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<Protocol::Timeline::CPUProfile> buildProfileInspectorObject(const JSC::Profile* profile)
</del><ins>+static PassRefPtr<Protocol::Timeline::CPUProfile> buildProfileInspectorObject(const JSC::Profile* profile)
</ins><span class="cx"> {
</span><del>- auto rootNodes = Protocol::Array<Protocol::Timeline::CPUProfileNode>::create();
</del><ins>+ RefPtr<Protocol::Array<Protocol::Timeline::CPUProfileNode>> rootNodes = Protocol::Array<Protocol::Timeline::CPUProfileNode>::create();
</ins><span class="cx"> for (RefPtr<JSC::ProfileNode> profileNode : profile->rootNode()->children())
</span><span class="cx"> rootNodes->addItem(buildInspectorObject(profileNode.get()));
</span><span class="cx">
</span><del>- return Protocol::Timeline::CPUProfile::create()
- .setRootNodes(WTF::move(rootNodes))
- .release();
</del><ins>+ RefPtr<Protocol::Timeline::CPUProfile> result = Protocol::Timeline::CPUProfile::create()
+ .setRootNodes(rootNodes);
+
+ return result.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void TimelineRecordFactory::appendProfile(InspectorObject* data, RefPtr<JSC::Profile>&& profile)
</del><ins>+void TimelineRecordFactory::appendProfile(InspectorObject* data, PassRefPtr<JSC::Profile> profile)
</ins><span class="cx"> {
</span><span class="cx"> data->setValue(ASCIILiteral("profile"), buildProfileInspectorObject(profile.get()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -55,74 +55,74 @@
</span><span class="cx">
</span><span class="cx"> class TimelineRecordFactory {
</span><span class="cx"> public:
</span><del>- static Ref<Inspector::InspectorObject> createGenericRecord(double startTime, int maxCallStackDepth);
- static Ref<Inspector::InspectorObject> createBackgroundRecord(double startTime, const String& thread);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createGenericRecord(double startTime, int maxCallStackDepth);
+ static PassRefPtr<Inspector::InspectorObject> createBackgroundRecord(double startTime, const String& thread);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createGCEventData(const size_t usedHeapSizeDelta);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createGCEventData(const size_t usedHeapSizeDelta);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createFunctionCallData(const String& scriptName, int scriptLine);
- static Ref<Inspector::InspectorObject> createConsoleProfileData(const String& title);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createFunctionCallData(const String& scriptName, int scriptLine);
+ static PassRefPtr<Inspector::InspectorObject> createConsoleProfileData(const String& title);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createProbeSampleData(const Inspector::ScriptBreakpointAction&, unsigned sampleId);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createProbeSampleData(const Inspector::ScriptBreakpointAction&, unsigned sampleId);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createEventDispatchData(const Event&);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createEventDispatchData(const Event&);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createGenericTimerData(int timerId);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createGenericTimerData(int timerId);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createTimerInstallData(int timerId, int timeout, bool singleShot);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createTimerInstallData(int timerId, int timeout, bool singleShot);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createXHRReadyStateChangeData(const String& url, int readyState);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createXHRReadyStateChangeData(const String& url, int readyState);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createXHRLoadData(const String& url);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createXHRLoadData(const String& url);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createEvaluateScriptData(const String&, double lineNumber);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createEvaluateScriptData(const String&, double lineNumber);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createTimeStampData(const String&);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createTimeStampData(const String&);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createResourceSendRequestData(const String& requestId, const ResourceRequest&);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createResourceSendRequestData(const String& requestId, const ResourceRequest&);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createScheduleResourceRequestData(const String&);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createScheduleResourceRequestData(const String&);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createResourceReceiveResponseData(const String& requestId, const ResourceResponse&);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createResourceReceiveResponseData(const String& requestId, const ResourceResponse&);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createReceiveResourceData(const String& requestId, int length);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createReceiveResourceData(const String& requestId, int length);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createResourceFinishData(const String& requestId, bool didFail, double finishTime);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createResourceFinishData(const String& requestId, bool didFail, double finishTime);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createLayoutData(unsigned dirtyObjects, unsigned totalObjects, bool partialLayout);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createLayoutData(unsigned dirtyObjects, unsigned totalObjects, bool partialLayout);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createDecodeImageData(const String& imageType);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createDecodeImageData(const String& imageType);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createResizeImageData(bool shouldCache);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createResizeImageData(bool shouldCache);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createMarkData(bool isMainFrame);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createMarkData(bool isMainFrame);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createParseHTMLData(unsigned startLine);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createParseHTMLData(unsigned startLine);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createAnimationFrameData(int callbackId);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createAnimationFrameData(int callbackId);
</ins><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createPaintData(const FloatQuad&);
</del><ins>+ static PassRefPtr<Inspector::InspectorObject> createPaintData(const FloatQuad&);
</ins><span class="cx">
</span><span class="cx"> static void appendLayoutRoot(Inspector::InspectorObject* data, const FloatQuad&);
</span><span class="cx">
</span><del>- static void appendProfile(Inspector::InspectorObject*, RefPtr<JSC::Profile>&&);
</del><ins>+ static void appendProfile(Inspector::InspectorObject*, PassRefPtr<JSC::Profile>);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><del>- static inline Ref<Inspector::InspectorObject> createWebSocketCreateData(unsigned long identifier, const URL& url, const String& protocol)
</del><ins>+ static inline PassRefPtr<Inspector::InspectorObject> createWebSocketCreateData(unsigned long identifier, const URL& url, const String& protocol)
</ins><span class="cx"> {
</span><del>- Ref<Inspector::InspectorObject> data = Inspector::InspectorObject::create();
</del><ins>+ RefPtr<Inspector::InspectorObject> data = Inspector::InspectorObject::create();
</ins><span class="cx"> data->setInteger("identifier", identifier);
</span><span class="cx"> data->setString("url", url.string());
</span><span class="cx"> if (!protocol.isNull())
</span><span class="cx"> data->setString("webSocketProtocol", protocol);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static inline Ref<Inspector::InspectorObject> createGenericWebSocketData(unsigned long identifier)
</del><ins>+ static inline PassRefPtr<Inspector::InspectorObject> createGenericWebSocketData(unsigned long identifier)
</ins><span class="cx"> {
</span><del>- Ref<Inspector::InspectorObject> data = Inspector::InspectorObject::create();
</del><ins>+ RefPtr<Inspector::InspectorObject> data = Inspector::InspectorObject::create();
</ins><span class="cx"> data->setInteger("identifier", identifier);
</span><del>- return WTF::move(data);
</del><ins>+ return data.release();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -172,9 +172,9 @@
</span><span class="cx"> InspectorInstrumentation::didCallFunction(cookie, scriptExecutionContext);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Stopwatch> WorkerInspectorController::executionStopwatch()
</del><ins>+PassRefPtr<Stopwatch> WorkerInspectorController::executionStopwatch()
</ins><span class="cx"> {
</span><del>- return m_executionStopwatch.copyRef();
</del><ins>+ return m_executionStopwatch;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> virtual void willCallInjectedScriptFunction(JSC::ExecState*, const String& scriptName, int scriptLine) override;
</span><span class="cx"> virtual void didCallInjectedScriptFunction(JSC::ExecState*) override;
</span><span class="cx"> virtual void frontendInitialized() override { }
</span><del>- virtual Ref<WTF::Stopwatch> executionStopwatch() override;
</del><ins>+ virtual PassRefPtr<WTF::Stopwatch> executionStopwatch() override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class InspectorInstrumentation;
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> WorkerRuntimeAgent* m_runtimeAgent;
</span><span class="cx"> Inspector::InspectorAgentRegistry m_agents;
</span><span class="cx"> std::unique_ptr<InspectorFrontendChannel> m_frontendChannel;
</span><del>- Ref<WTF::Stopwatch> m_executionStopwatch;
</del><ins>+ RefPtr<WTF::Stopwatch> m_executionStopwatch;
</ins><span class="cx"> RefPtr<Inspector::InspectorBackendDispatcher> m_backendDispatcher;
</span><span class="cx"> Vector<InspectorInstrumentationCookie, 2> m_injectedScriptInstrumentationCookies;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsoleClient.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsoleClient.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/page/PageConsoleClient.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -106,18 +106,18 @@
</span><span class="cx"> addMessage(source, level, message, url, line, column, 0, JSMainThreadExecState::currentState(), requestIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageConsoleClient::addMessage(MessageSource source, MessageLevel level, const String& message, RefPtr<ScriptCallStack>&& callStack)
</del><ins>+void PageConsoleClient::addMessage(MessageSource source, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack)
</ins><span class="cx"> {
</span><del>- addMessage(source, level, message, String(), 0, 0, WTF::move(callStack), 0);
</del><ins>+ addMessage(source, level, message, String(), 0, 0, callStack, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PageConsoleClient::addMessage(MessageSource source, MessageLevel level, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber, RefPtr<ScriptCallStack>&& callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</del><ins>+void PageConsoleClient::addMessage(MessageSource source, MessageLevel level, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> if (muteCount && source != MessageSource::ConsoleAPI)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (callStack)
</span><del>- InspectorInstrumentation::addMessageToConsole(m_page, source, MessageType::Log, level, message, WTF::move(callStack), requestIdentifier);
</del><ins>+ InspectorInstrumentation::addMessageToConsole(m_page, source, MessageType::Log, level, message, callStack, requestIdentifier);
</ins><span class="cx"> else
</span><span class="cx"> InspectorInstrumentation::addMessageToConsole(m_page, source, MessageType::Log, level, message, url, lineNumber, columnNumber, state, requestIdentifier);
</span><span class="cx">
</span><span class="lines">@@ -136,11 +136,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-void PageConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, RefPtr<Inspector::ScriptArguments>&& arguments)
</del><ins>+void PageConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, PassRefPtr<Inspector::ScriptArguments> prpArguments)
</ins><span class="cx"> {
</span><ins>+ RefPtr<ScriptArguments> arguments = prpArguments;
+
</ins><span class="cx"> String message;
</span><span class="cx"> bool gotMessage = arguments->getFirstArgumentAsString(message);
</span><del>- InspectorInstrumentation::addMessageToConsole(m_page, MessageSource::ConsoleAPI, type, level, message, exec, WTF::move(arguments));
</del><ins>+ InspectorInstrumentation::addMessageToConsole(m_page, MessageSource::ConsoleAPI, type, level, message, exec, arguments);
</ins><span class="cx">
</span><span class="cx"> if (m_page.usesEphemeralSession())
</span><span class="cx"> return;
</span><span class="lines">@@ -153,12 +155,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_page.settings().logsPageMessagesToSystemConsoleEnabled() || PageConsoleClient::shouldPrintExceptions())
</span><del>- ConsoleClient::printConsoleMessageWithArguments(MessageSource::ConsoleAPI, type, level, exec, WTF::move(arguments));
</del><ins>+ ConsoleClient::printConsoleMessageWithArguments(MessageSource::ConsoleAPI, type, level, exec, arguments.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PageConsoleClient::count(JSC::ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void PageConsoleClient::count(JSC::ExecState* exec, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><del>- InspectorInstrumentation::consoleCount(m_page, exec, WTF::move(arguments));
</del><ins>+ InspectorInstrumentation::consoleCount(m_page, exec, arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageConsoleClient::profile(JSC::ExecState* exec, const String& title)
</span><span class="lines">@@ -169,7 +171,7 @@
</span><span class="cx"> void PageConsoleClient::profileEnd(JSC::ExecState* exec, const String& title)
</span><span class="cx"> {
</span><span class="cx"> if (RefPtr<JSC::Profile> profile = InspectorInstrumentation::stopProfiling(m_page, exec, title))
</span><del>- m_profiles.append(WTF::move(profile));
</del><ins>+ m_profiles.append(profile.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageConsoleClient::time(JSC::ExecState*, const String& title)
</span><span class="lines">@@ -180,12 +182,12 @@
</span><span class="cx"> void PageConsoleClient::timeEnd(JSC::ExecState* exec, const String& title)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, 1));
</span><del>- InspectorInstrumentation::stopConsoleTiming(m_page.mainFrame(), title, WTF::move(callStack));
</del><ins>+ InspectorInstrumentation::stopConsoleTiming(m_page.mainFrame(), title, callStack.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PageConsoleClient::timeStamp(JSC::ExecState*, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void PageConsoleClient::timeStamp(JSC::ExecState*, PassRefPtr<ScriptArguments> arguments)
</ins><span class="cx"> {
</span><del>- InspectorInstrumentation::consoleTimeStamp(m_page.mainFrame(), WTF::move(arguments));
</del><ins>+ InspectorInstrumentation::consoleTimeStamp(m_page.mainFrame(), arguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageConsoleClient::clearProfiles()
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsoleClient.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsoleClient.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/page/PageConsoleClient.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -56,21 +56,21 @@
</span><span class="cx"> static void mute();
</span><span class="cx"> static void unmute();
</span><span class="cx">
</span><del>- void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&& = nullptr, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
- void addMessage(MessageSource, MessageLevel, const String& message, RefPtr<Inspector::ScriptCallStack>&&);
</del><ins>+ void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack> = nullptr, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
+ void addMessage(MessageSource, MessageLevel, const String& message, PassRefPtr<Inspector::ScriptCallStack>);
</ins><span class="cx"> void addMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0, Document* = nullptr);
</span><span class="cx">
</span><span class="cx"> const ProfilesArray& profiles() const { return m_profiles; }
</span><span class="cx"> void clearProfiles();
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) override;
- virtual void count(JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) override;
</del><ins>+ virtual void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>) override;
+ virtual void count(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>) override;
</ins><span class="cx"> virtual void profile(JSC::ExecState*, const String& title) override;
</span><span class="cx"> virtual void profileEnd(JSC::ExecState*, const String& title) override;
</span><span class="cx"> virtual void time(JSC::ExecState*, const String& title) override;
</span><span class="cx"> virtual void timeEnd(JSC::ExecState*, const String& title) override;
</span><del>- virtual void timeStamp(JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) override;
</del><ins>+ virtual void timeStamp(JSC::ExecState*, PassRefPtr<Inspector::ScriptArguments>) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Page& m_page;
</span></span></pre></div>
<a id="trunkSourceWebCorereplayReplayControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/ReplayController.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/ReplayController.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/replay/ReplayController.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> m_currentPosition = ReplayPosition(0, 0);
</span><span class="cx">
</span><span class="cx"> LOG(WebReplay, "%-20sSwitching sessions from %p to %p.\n", "ReplayController", m_loadedSession.get(), session.get());
</span><del>- InspectorInstrumentation::sessionLoaded(m_page, m_loadedSession.copyRef());
</del><ins>+ InspectorInstrumentation::sessionLoaded(m_page, m_loadedSession);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ReplayController::createSegment()
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> m_loadedSegment = ReplaySessionSegment::create();
</span><span class="cx">
</span><span class="cx"> LOG(WebReplay, "%-20s Created segment: %p.\n", "ReplayController", m_loadedSegment.get());
</span><del>- InspectorInstrumentation::segmentCreated(m_page, m_loadedSegment.copyRef());
</del><ins>+ InspectorInstrumentation::segmentCreated(m_page, m_loadedSegment);
</ins><span class="cx">
</span><span class="cx"> m_activeCursor = CapturingInputCursor::create(m_loadedSegment);
</span><span class="cx"> m_activeCursor->appendInput<BeginSegmentSentinel>();
</span><span class="lines">@@ -247,10 +247,10 @@
</span><span class="cx"> unloadSegment(shouldSuppressNotifications);
</span><span class="cx">
</span><span class="cx"> LOG(WebReplay, "%-20s Completed segment: %p.\n", "ReplayController", segment.get());
</span><del>- InspectorInstrumentation::segmentCompleted(m_page, segment.copyRef());
</del><ins>+ InspectorInstrumentation::segmentCompleted(m_page, segment);
</ins><span class="cx">
</span><span class="cx"> m_loadedSession->appendSegment(segment);
</span><del>- InspectorInstrumentation::sessionModified(m_page, m_loadedSession.copyRef());
</del><ins>+ InspectorInstrumentation::sessionModified(m_page, m_loadedSession);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ReplayController::loadSegmentAtIndex(size_t segmentIndex)
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> m_activeCursor = ReplayingInputCursor::create(m_loadedSegment, m_page, this);
</span><span class="cx">
</span><span class="cx"> LOG(WebReplay, "%-20sLoading segment: %p.\n", "ReplayController", segment.get());
</span><del>- InspectorInstrumentation::segmentLoaded(m_page, segment.copyRef());
</del><ins>+ InspectorInstrumentation::segmentLoaded(m_page, segment);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ReplayController::unloadSegment(bool suppressNotifications)
</span></span></pre></div>
<a id="trunkSourceWebCorereplayReplayInputCreationMethodscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/ReplayInputCreationMethods.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/ReplayInputCreationMethods.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/replay/ReplayInputCreationMethods.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> RefPtr<SecurityOrigin> originCopy = mainFrame.document()->securityOrigin()->isolatedCopy();
</span><span class="cx"> URL url = mainFrame.document()->url();
</span><span class="cx"> String referrer = mainFrame.loader().referrer();
</span><del>- return std::make_unique<InitialNavigation>(WTF::move(originCopy), url, referrer);
</del><ins>+ return std::make_unique<InitialNavigation>(originCopy, url, referrer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersSharedWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -79,10 +79,10 @@
</span><span class="cx"> return static_cast<SharedWorkerThread&>(Base::thread());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<Inspector::ScriptCallStack>&& callStack)
</del><ins>+void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack> callStack)
</ins><span class="cx"> {
</span><del>- WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber, columnNumber, callStack.copyRef());
- addMessageToWorkerConsole(MessageSource::JS, MessageLevel::Error, errorMessage, sourceURL, lineNumber, columnNumber, callStack.copyRef());
</del><ins>+ WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber, columnNumber, callStack);
+ addMessageToWorkerConsole(MessageSource::JS, MessageLevel::Error, errorMessage, sourceURL, lineNumber, columnNumber, callStack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersSharedWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> SharedWorkerGlobalScope(const String& name, const URL&, const String& userAgent, SharedWorkerThread&);
</span><del>- virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<Inspector::ScriptCallStack>&&) override;
</del><ins>+ virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack>) override;
</ins><span class="cx">
</span><span class="cx"> String m_name;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<ScriptCallStack>&&)
</del><ins>+void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>)
</ins><span class="cx"> {
</span><span class="cx"> thread().workerReportingProxy().postExceptionToWorkerObject(errorMessage, lineNumber, columnNumber, sourceURL);
</span><span class="cx"> }
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> addMessageToWorkerConsole(source, level, message, String(), 0, 0, 0, 0, requestIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerGlobalScope::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<ScriptCallStack>&& callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</del><ins>+void WorkerGlobalScope::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><span class="cx"> postTask(AddConsoleMessageTask(source, level, StringCapture(message)));
</span><span class="lines">@@ -238,14 +238,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> thread().workerReportingProxy().postConsoleMessageToWorkerObject(source, level, message, lineNumber, columnNumber, sourceURL);
</span><del>- addMessageToWorkerConsole(source, level, message, sourceURL, lineNumber, columnNumber, WTF::move(callStack), state, requestIdentifier);
</del><ins>+ addMessageToWorkerConsole(source, level, message, sourceURL, lineNumber, columnNumber, callStack, state, requestIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerGlobalScope::addMessageToWorkerConsole(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<ScriptCallStack>&& callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</del><ins>+void WorkerGlobalScope::addMessageToWorkerConsole(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isContextThread());
</span><span class="cx"> if (callStack)
</span><del>- InspectorInstrumentation::addMessageToConsole(this, source, MessageType::Log, level, message, WTF::move(callStack), requestIdentifier);
</del><ins>+ InspectorInstrumentation::addMessageToConsole(this, source, MessageType::Log, level, message, callStack, requestIdentifier);
</ins><span class="cx"> else
</span><span class="cx"> InspectorInstrumentation::addMessageToConsole(this, source, MessageType::Log, level, message, sourceURL, lineNumber, columnNumber, state, requestIdentifier);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -142,8 +142,8 @@
</span><span class="cx"> WorkerGlobalScope(const URL&, const String& userAgent, WorkerThread&, PassRefPtr<SecurityOrigin> topOrigin);
</span><span class="cx"> void applyContentSecurityPolicyFromString(const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType);
</span><span class="cx">
</span><del>- virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<Inspector::ScriptCallStack>&&) override;
- void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
</del><ins>+ virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack>) override;
+ void addMessageToWorkerConsole(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack>, JSC::ExecState* = 0, unsigned long requestIdentifier = 0);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void refScriptExecutionContext() override { ref(); }
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> virtual void refEventTarget() override final { ref(); }
</span><span class="cx"> virtual void derefEventTarget() override final { deref(); }
</span><span class="cx">
</span><del>- virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override;
</del><ins>+ virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack>, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override;
</ins><span class="cx">
</span><span class="cx"> virtual EventTarget* errorEventTarget() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebKit/ChangeLog 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-07 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r178039.
+ https://bugs.webkit.org/show_bug.cgi?id=140187
+
+ Breaks ObjC Inspector Protocol (Requested by JoePeck on
+ #webkit).
+
+ Reverted changeset:
+
+ "Web Inspector: purge PassRefPtr from Inspector code and use
+ Ref for typed and untyped protocol objects"
+ https://bugs.webkit.org/show_bug.cgi?id=140053
+ http://trac.webkit.org/changeset/178039
+
</ins><span class="cx"> 2015-01-06 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: purge PassRefPtr from Inspector code and use Ref for typed and untyped protocol objects
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (178041 => 178042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2015-01-07 18:33:52 UTC (rev 178041)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2015-01-07 19:32:05 UTC (rev 178042)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> symbolWithPointer(?item@StaticNodeList@WebCore@@UBEPAVNode@2@I@Z, ?item@StaticNodeList@WebCore@@UEBAPEAVNode@2@I@Z)
</span><span class="cx"> ?selectTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- symbolWithPointer(?buildObjectForHighlightedNode@InspectorController@WebCore@@QBE?AV?$RefPtr@VInspectorObject@Inspector@@@WTF@@XZ, ?buildObjectForHighlightedNode@InspectorController@WebCore@@QEBA?AV?$RefPtr@VInspectorObject@Inspector@@@WTF@@XZ)
</del><ins>+ symbolWithPointer(?buildObjectForHighlightedNode@InspectorController@WebCore@@QBE?AV?$PassRefPtr@VInspectorObject@Inspector@@@WTF@@XZ, ?buildObjectForHighlightedNode@InspectorController@WebCore@@QEBA?AV?$PassRefPtr@VInspectorObject@Inspector@@@WTF@@XZ)
</ins><span class="cx"> symbolWithPointer(?getHighlight@InspectorController@WebCore@@QBEXPAUHighlight@2@W4CoordinateSystem@InspectorOverlay@2@@Z, ?getHighlight@InspectorController@WebCore@@QEBAXPEAUHighlight@2@W4CoordinateSystem@InspectorOverlay@2@@Z)
</span><span class="cx"> symbolWithPointer(?instrumentingAgentsForPage@InspectorInstrumentation@WebCore@@SAPAVInstrumentingAgents@2@PAVPage@2@@Z, ?instrumentingAgentsForPage@InspectorInstrumentation@WebCore@@SAPEAVInstrumentingAgents@2@PEAVPage@2@@Z)
</span><span class="cx"> ?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
</span></span></pre>
</div>
</div>
</body>
</html>