<!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>[174140] 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/174140">174140</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-09-30 21:34:19 -0700 (Tue, 30 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: ErrorString should be passed by reference
https://bugs.webkit.org/show_bug.cgi?id=137257
Reviewed by Joseph Pecoraro.
Pass the leading ErrorString argument by reference, since it is always an out parameter.
Clean up callsites where the error message is written.
Source/JavaScriptCore:
* inspector/InjectedScript.cpp:
(Inspector::InjectedScript::evaluate):
(Inspector::InjectedScript::callFunctionOn):
(Inspector::InjectedScript::evaluateOnCallFrame):
(Inspector::InjectedScript::getFunctionDetails):
(Inspector::InjectedScript::getProperties):
(Inspector::InjectedScript::getInternalProperties):
* inspector/InjectedScript.h:
* inspector/InjectedScriptBase.cpp:
(Inspector::InjectedScriptBase::makeEvalCall):
* inspector/InjectedScriptBase.h:
* inspector/agents/InspectorAgent.cpp:
(Inspector::InspectorAgent::willDestroyFrontendAndBackend):
(Inspector::InspectorAgent::enable):
(Inspector::InspectorAgent::disable):
(Inspector::InspectorAgent::initialized):
* inspector/agents/InspectorAgent.h:
* inspector/agents/InspectorConsoleAgent.cpp:
(Inspector::InspectorConsoleAgent::willDestroyFrontendAndBackend):
(Inspector::InspectorConsoleAgent::enable):
(Inspector::InspectorConsoleAgent::disable):
(Inspector::InspectorConsoleAgent::clearMessages):
(Inspector::InspectorConsoleAgent::reset):
(Inspector::InspectorConsoleAgent::addMessageToConsole):
* inspector/agents/InspectorConsoleAgent.h:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::enable):
(Inspector::InspectorDebuggerAgent::disable):
(Inspector::InspectorDebuggerAgent::setBreakpointsActive):
(Inspector::InspectorDebuggerAgent::breakpointActionsFromProtocol):
(Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
(Inspector::parseLocation):
(Inspector::InspectorDebuggerAgent::setBreakpoint):
(Inspector::InspectorDebuggerAgent::removeBreakpoint):
(Inspector::InspectorDebuggerAgent::continueToLocation):
(Inspector::InspectorDebuggerAgent::searchInContent):
(Inspector::InspectorDebuggerAgent::getScriptSource):
(Inspector::InspectorDebuggerAgent::getFunctionDetails):
(Inspector::InspectorDebuggerAgent::pause):
(Inspector::InspectorDebuggerAgent::resume):
(Inspector::InspectorDebuggerAgent::stepOver):
(Inspector::InspectorDebuggerAgent::stepInto):
(Inspector::InspectorDebuggerAgent::stepOut):
(Inspector::InspectorDebuggerAgent::setPauseOnExceptions):
(Inspector::InspectorDebuggerAgent::evaluateOnCallFrame):
(Inspector::InspectorDebuggerAgent::setOverlayMessage):
(Inspector::InspectorDebuggerAgent::didParseSource):
(Inspector::InspectorDebuggerAgent::clearInspectorBreakpointState):
(Inspector::InspectorDebuggerAgent::assertPaused):
* inspector/agents/InspectorDebuggerAgent.h:
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::InspectorRuntimeAgent::parse):
(Inspector::InspectorRuntimeAgent::evaluate):
(Inspector::InspectorRuntimeAgent::callFunctionOn):
(Inspector::InspectorRuntimeAgent::getProperties):
(Inspector::InspectorRuntimeAgent::releaseObject):
(Inspector::InspectorRuntimeAgent::releaseObjectGroup):
(Inspector::InspectorRuntimeAgent::run):
(Inspector::InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets):
(Inspector::InspectorRuntimeAgent::enableTypeProfiler):
(Inspector::InspectorRuntimeAgent::disableTypeProfiler):
* inspector/agents/InspectorRuntimeAgent.h:
* inspector/agents/JSGlobalObjectConsoleAgent.cpp:
(Inspector::JSGlobalObjectConsoleAgent::setMonitoringXHREnabled):
(Inspector::JSGlobalObjectConsoleAgent::addInspectedNode):
* inspector/agents/JSGlobalObjectConsoleAgent.h:
* inspector/agents/JSGlobalObjectDebuggerAgent.cpp:
(Inspector::JSGlobalObjectDebuggerAgent::injectedScriptForEval):
* inspector/agents/JSGlobalObjectDebuggerAgent.h:
* inspector/agents/JSGlobalObjectRuntimeAgent.cpp:
(Inspector::JSGlobalObjectRuntimeAgent::injectedScriptForEval):
* inspector/agents/JSGlobalObjectRuntimeAgent.h:
* inspector/scripts/codegen/generate_backend_dispatcher_header.py:
(BackendDispatcherHeaderGenerator._generate_handler_declaration_for_command):
(BackendDispatcherHeaderGenerator._generate_async_handler_declaration_for_command):
* inspector/scripts/codegen/generate_backend_dispatcher_implementation.py:
(BackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command):
* inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
* inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
* inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
* inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
Source/WebCore:
No new tests, no behavior changed.
* inspector/CommandLineAPIHost.cpp:
(WebCore::CommandLineAPIHost::clearConsoleMessages):
* inspector/DOMEditor.cpp:
(WebCore::populateErrorString):
(WebCore::DOMEditor::insertBefore):
(WebCore::DOMEditor::removeChild):
(WebCore::DOMEditor::setAttribute):
(WebCore::DOMEditor::removeAttribute):
(WebCore::DOMEditor::setOuterHTML):
(WebCore::DOMEditor::replaceWholeText):
* inspector/DOMEditor.h:
* inspector/InspectorApplicationCacheAgent.cpp:
(WebCore::InspectorApplicationCacheAgent::enable):
(WebCore::InspectorApplicationCacheAgent::getFramesWithManifests):
(WebCore::InspectorApplicationCacheAgent::assertFrameWithDocumentLoader):
(WebCore::InspectorApplicationCacheAgent::getManifestForFrame):
(WebCore::InspectorApplicationCacheAgent::getApplicationCacheForFrame):
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::enable):
(WebCore::InspectorCSSAgent::disable):
(WebCore::InspectorCSSAgent::didCreateNamedFlow):
(WebCore::InspectorCSSAgent::regionOversetChanged):
(WebCore::InspectorCSSAgent::didRegisterNamedFlowContentElement):
(WebCore::InspectorCSSAgent::didUnregisterNamedFlowContentElement):
(WebCore::InspectorCSSAgent::getMatchedStylesForNode):
(WebCore::InspectorCSSAgent::getInlineStylesForNode):
(WebCore::InspectorCSSAgent::getComputedStyleForNode):
(WebCore::InspectorCSSAgent::getAllStyleSheets):
(WebCore::InspectorCSSAgent::getStyleSheet):
(WebCore::InspectorCSSAgent::getStyleSheetText):
(WebCore::InspectorCSSAgent::setStyleSheetText):
(WebCore::InspectorCSSAgent::setStyleText):
(WebCore::InspectorCSSAgent::setPropertyText):
(WebCore::InspectorCSSAgent::toggleProperty):
(WebCore::InspectorCSSAgent::setRuleSelector):
(WebCore::InspectorCSSAgent::addRule):
(WebCore::InspectorCSSAgent::getSupportedCSSProperties):
(WebCore::InspectorCSSAgent::forcePseudoState):
(WebCore::InspectorCSSAgent::getNamedFlowCollection):
(WebCore::InspectorCSSAgent::elementForId):
(WebCore::InspectorCSSAgent::assertStyleSheetForId):
(WebCore::InspectorCSSAgent::buildArrayForRegions):
(WebCore::InspectorCSSAgent::buildObjectForNamedFlow):
* inspector/InspectorCSSAgent.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::hideHighlight):
(WebCore::InspectorController::setProfilerEnabled):
(WebCore::InspectorController::resume):
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorDOMAgent::assertNode):
(WebCore::InspectorDOMAgent::assertDocument):
(WebCore::InspectorDOMAgent::assertElement):
(WebCore::InspectorDOMAgent::assertEditableNode):
(WebCore::InspectorDOMAgent::assertEditableElement):
(WebCore::InspectorDOMAgent::getDocument):
(WebCore::InspectorDOMAgent::pushNodeToFrontend):
(WebCore::InspectorDOMAgent::requestChildNodes):
(WebCore::InspectorDOMAgent::querySelector):
(WebCore::InspectorDOMAgent::querySelectorAll):
(WebCore::InspectorDOMAgent::releaseBackendNodeIds):
(WebCore::InspectorDOMAgent::setAttributeValue):
(WebCore::InspectorDOMAgent::setAttributesAsText):
(WebCore::InspectorDOMAgent::removeAttribute):
(WebCore::InspectorDOMAgent::removeNode):
(WebCore::InspectorDOMAgent::setNodeName):
(WebCore::InspectorDOMAgent::getOuterHTML):
(WebCore::InspectorDOMAgent::setOuterHTML):
(WebCore::InspectorDOMAgent::setNodeValue):
(WebCore::InspectorDOMAgent::getEventListenersForNode):
(WebCore::InspectorDOMAgent::getAccessibilityPropertiesForNode):
(WebCore::InspectorDOMAgent::performSearch):
(WebCore::InspectorDOMAgent::getSearchResults):
(WebCore::InspectorDOMAgent::discardSearchResults):
(WebCore::InspectorDOMAgent::inspect):
(WebCore::InspectorDOMAgent::setSearchingForNode):
(WebCore::InspectorDOMAgent::highlightConfigFromInspectorObject):
(WebCore::InspectorDOMAgent::setInspectModeEnabled):
(WebCore::InspectorDOMAgent::highlightRect):
(WebCore::InspectorDOMAgent::highlightQuad):
(WebCore::InspectorDOMAgent::highlightNode):
(WebCore::InspectorDOMAgent::highlightFrame):
(WebCore::InspectorDOMAgent::hideHighlight):
(WebCore::InspectorDOMAgent::moveTo):
(WebCore::InspectorDOMAgent::undo):
(WebCore::InspectorDOMAgent::redo):
(WebCore::InspectorDOMAgent::markUndoableState):
(WebCore::InspectorDOMAgent::focus):
(WebCore::InspectorDOMAgent::resolveNode):
(WebCore::InspectorDOMAgent::getAttributes):
(WebCore::InspectorDOMAgent::requestNode):
(WebCore::InspectorDOMAgent::pushNodeByPathToFrontend):
(WebCore::InspectorDOMAgent::pushNodeByBackendIdToFrontend):
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDOMDebuggerAgent.cpp:
(WebCore::InspectorDOMDebuggerAgent::setEventListenerBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::setInstrumentationBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::setBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::removeEventListenerBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::removeInstrumentationBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::removeBreakpoint):
(WebCore::domTypeForName):
(WebCore::InspectorDOMDebuggerAgent::setDOMBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::removeDOMBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::setXHRBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::removeXHRBreakpoint):
(WebCore::InspectorDOMDebuggerAgent::willSendXMLHttpRequest):
* inspector/InspectorDOMDebuggerAgent.h:
* inspector/InspectorDOMStorageAgent.cpp:
(WebCore::InspectorDOMStorageAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorDOMStorageAgent::enable):
(WebCore::InspectorDOMStorageAgent::disable):
(WebCore::InspectorDOMStorageAgent::getDOMStorageItems):
(WebCore::InspectorDOMStorageAgent::setDOMStorageItem):
(WebCore::InspectorDOMStorageAgent::removeDOMStorageItem):
(WebCore::InspectorDOMStorageAgent::findStorageArea):
* inspector/InspectorDOMStorageAgent.h:
* inspector/InspectorDatabaseAgent.cpp:
(WebCore::InspectorDatabaseAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorDatabaseAgent::enable):
(WebCore::InspectorDatabaseAgent::disable):
(WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
(WebCore::InspectorDatabaseAgent::executeSQL):
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorIndexedDBAgent.cpp:
(WebCore::InspectorIndexedDBAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorIndexedDBAgent::enable):
(WebCore::InspectorIndexedDBAgent::disable):
(WebCore::assertDocument):
(WebCore::assertIDBFactory):
(WebCore::InspectorIndexedDBAgent::requestDatabaseNames):
(WebCore::InspectorIndexedDBAgent::requestDatabase):
(WebCore::InspectorIndexedDBAgent::requestData):
(WebCore::InspectorIndexedDBAgent::clearObjectStore):
* inspector/InspectorIndexedDBAgent.h:
* inspector/InspectorLayerTreeAgent.cpp:
(WebCore::InspectorLayerTreeAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorLayerTreeAgent::enable):
(WebCore::InspectorLayerTreeAgent::disable):
(WebCore::InspectorLayerTreeAgent::layersForNode):
(WebCore::InspectorLayerTreeAgent::gatherLayersUsingRenderObjectHierarchy):
(WebCore::InspectorLayerTreeAgent::gatherLayersUsingRenderLayerHierarchy):
(WebCore::InspectorLayerTreeAgent::buildObjectForLayer):
(WebCore::InspectorLayerTreeAgent::idForNode):
(WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer):
* inspector/InspectorLayerTreeAgent.h:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::cachedResourceContent):
(WebCore::InspectorPageAgent::resourceContent):
(WebCore::InspectorPageAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorPageAgent::enable):
(WebCore::InspectorPageAgent::disable):
(WebCore::InspectorPageAgent::addScriptToEvaluateOnLoad):
(WebCore::InspectorPageAgent::removeScriptToEvaluateOnLoad):
(WebCore::InspectorPageAgent::reload):
(WebCore::InspectorPageAgent::navigate):
(WebCore::InspectorPageAgent::getCookies):
(WebCore::InspectorPageAgent::deleteCookie):
(WebCore::InspectorPageAgent::getResourceTree):
(WebCore::InspectorPageAgent::getResourceContent):
(WebCore::InspectorPageAgent::searchInResource):
(WebCore::InspectorPageAgent::searchInResources):
(WebCore::InspectorPageAgent::setDocumentContent):
(WebCore::InspectorPageAgent::setShowPaintRects):
(WebCore::InspectorPageAgent::canShowDebugBorders):
(WebCore::InspectorPageAgent::setShowDebugBorders):
(WebCore::InspectorPageAgent::canShowFPSCounter):
(WebCore::InspectorPageAgent::setShowFPSCounter):
(WebCore::InspectorPageAgent::canContinuouslyPaint):
(WebCore::InspectorPageAgent::setContinuousPaintingEnabled):
(WebCore::InspectorPageAgent::getScriptExecutionStatus):
(WebCore::InspectorPageAgent::setScriptExecutionDisabled):
(WebCore::InspectorPageAgent::assertFrame):
(WebCore::InspectorPageAgent::assertDocumentLoader):
(WebCore::InspectorPageAgent::setTouchEmulationEnabled):
(WebCore::InspectorPageAgent::setEmulatedMedia):
(WebCore::InspectorPageAgent::getCompositingBordersVisible):
(WebCore::InspectorPageAgent::setCompositingBordersVisible):
(WebCore::InspectorPageAgent::snapshotNode):
(WebCore::InspectorPageAgent::snapshotRect):
(WebCore::InspectorPageAgent::handleJavaScriptDialog):
(WebCore::InspectorPageAgent::archive):
* inspector/InspectorPageAgent.h:
* inspector/InspectorReplayAgent.cpp:
(WebCore::InspectorReplayAgent::startCapturing):
(WebCore::InspectorReplayAgent::stopCapturing):
(WebCore::InspectorReplayAgent::replayToPosition):
(WebCore::InspectorReplayAgent::replayToCompletion):
(WebCore::InspectorReplayAgent::pausePlayback):
(WebCore::InspectorReplayAgent::cancelPlayback):
(WebCore::InspectorReplayAgent::switchSession):
(WebCore::InspectorReplayAgent::insertSessionSegment):
(WebCore::InspectorReplayAgent::removeSessionSegment):
(WebCore::InspectorReplayAgent::findSession):
(WebCore::InspectorReplayAgent::findSegment):
(WebCore::InspectorReplayAgent::currentReplayState):
(WebCore::InspectorReplayAgent::getAvailableSessions):
(WebCore::InspectorReplayAgent::getSessionData):
(WebCore::InspectorReplayAgent::getSegmentData):
* inspector/InspectorReplayAgent.h:
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorResourceAgent::~InspectorResourceAgent):
(WebCore::InspectorResourceAgent::enable):
(WebCore::InspectorResourceAgent::disable):
(WebCore::InspectorResourceAgent::setExtraHTTPHeaders):
(WebCore::InspectorResourceAgent::getResponseBody):
(WebCore::InspectorResourceAgent::replayXHR):
(WebCore::InspectorResourceAgent::canClearBrowserCache):
(WebCore::InspectorResourceAgent::clearBrowserCache):
(WebCore::InspectorResourceAgent::canClearBrowserCookies):
(WebCore::InspectorResourceAgent::clearBrowserCookies):
(WebCore::InspectorResourceAgent::setCacheDisabled):
(WebCore::InspectorResourceAgent::loadResource):
* inspector/InspectorResourceAgent.h:
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyleSheet::resourceStyleSheetText):
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorTimelineAgent::start):
(WebCore::InspectorTimelineAgent::stop):
* inspector/InspectorTimelineAgent.h:
* inspector/InspectorWorkerAgent.cpp:
(WebCore::InspectorWorkerAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorWorkerAgent::enable):
(WebCore::InspectorWorkerAgent::disable):
(WebCore::InspectorWorkerAgent::canInspectWorkers):
(WebCore::InspectorWorkerAgent::connectToWorker):
(WebCore::InspectorWorkerAgent::disconnectFromWorker):
(WebCore::InspectorWorkerAgent::sendMessageToWorker):
(WebCore::InspectorWorkerAgent::setAutoconnectToWorkers):
* inspector/InspectorWorkerAgent.h:
* inspector/PageConsoleAgent.cpp:
(WebCore::PageConsoleAgent::clearMessages):
(WebCore::PageConsoleAgent::addInspectedNode):
* inspector/PageConsoleAgent.h:
* inspector/PageDebuggerAgent.cpp:
(WebCore::PageDebuggerAgent::injectedScriptForEval):
(WebCore::PageDebuggerAgent::setOverlayMessage):
* inspector/PageDebuggerAgent.h:
* inspector/PageRuntimeAgent.cpp:
(WebCore::PageRuntimeAgent::willDestroyFrontendAndBackend):
(WebCore::PageRuntimeAgent::enable):
(WebCore::PageRuntimeAgent::disable):
(WebCore::PageRuntimeAgent::injectedScriptForEval):
* inspector/PageRuntimeAgent.h:
* inspector/WebConsoleAgent.cpp:
(WebCore::WebConsoleAgent::setMonitoringXHREnabled):
* inspector/WebConsoleAgent.h:
* inspector/WorkerConsoleAgent.cpp:
(WebCore::WorkerConsoleAgent::addInspectedNode):
* inspector/WorkerConsoleAgent.h:
* inspector/WorkerDebuggerAgent.cpp:
(WebCore::WorkerDebuggerAgent::injectedScriptForEval):
* inspector/WorkerDebuggerAgent.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::resume):
* inspector/WorkerRuntimeAgent.cpp:
(WebCore::WorkerRuntimeAgent::injectedScriptForEval):
(WebCore::WorkerRuntimeAgent::run):
* inspector/WorkerRuntimeAgent.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptcpp">trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScripth">trunk/Source/JavaScriptCore/inspector/InjectedScript.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptBasecpp">trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptBaseh">trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_backend_dispatcher_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_backend_dispatcher_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py</a></li>
<li><a href="#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="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorCommandLineAPIHostcpp">trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorDOMEditorcpp">trunk/Source/WebCore/inspector/DOMEditor.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorDOMEditorh">trunk/Source/WebCore/inspector/DOMEditor.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="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</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="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgenth">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp">trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorLayerTreeAgenth">trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgenth">trunk/Source/WebCore/inspector/InspectorPageAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorReplayAgentcpp">trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorReplayAgenth">trunk/Source/WebCore/inspector/InspectorReplayAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgenth">trunk/Source/WebCore/inspector/InspectorResourceAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerAgentcpp">trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerAgenth">trunk/Source/WebCore/inspector/InspectorWorkerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageConsoleAgentcpp">trunk/Source/WebCore/inspector/PageConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageConsoleAgenth">trunk/Source/WebCore/inspector/PageConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageDebuggerAgentcpp">trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageDebuggerAgenth">trunk/Source/WebCore/inspector/PageDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageRuntimeAgentcpp">trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageRuntimeAgenth">trunk/Source/WebCore/inspector/PageRuntimeAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebConsoleAgentcpp">trunk/Source/WebCore/inspector/WebConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebConsoleAgenth">trunk/Source/WebCore/inspector/WebConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerConsoleAgentcpp">trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerConsoleAgenth">trunk/Source/WebCore/inspector/WorkerConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerDebuggerAgenth">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgenth">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -1,3 +1,95 @@
</span><ins>+2014-09-30 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: ErrorString should be passed by reference
+ https://bugs.webkit.org/show_bug.cgi?id=137257
+
+ Reviewed by Joseph Pecoraro.
+
+ Pass the leading ErrorString argument by reference, since it is always an out parameter.
+ Clean up callsites where the error message is written.
+
+ * inspector/InjectedScript.cpp:
+ (Inspector::InjectedScript::evaluate):
+ (Inspector::InjectedScript::callFunctionOn):
+ (Inspector::InjectedScript::evaluateOnCallFrame):
+ (Inspector::InjectedScript::getFunctionDetails):
+ (Inspector::InjectedScript::getProperties):
+ (Inspector::InjectedScript::getInternalProperties):
+ * inspector/InjectedScript.h:
+ * inspector/InjectedScriptBase.cpp:
+ (Inspector::InjectedScriptBase::makeEvalCall):
+ * inspector/InjectedScriptBase.h:
+ * inspector/agents/InspectorAgent.cpp:
+ (Inspector::InspectorAgent::willDestroyFrontendAndBackend):
+ (Inspector::InspectorAgent::enable):
+ (Inspector::InspectorAgent::disable):
+ (Inspector::InspectorAgent::initialized):
+ * inspector/agents/InspectorAgent.h:
+ * inspector/agents/InspectorConsoleAgent.cpp:
+ (Inspector::InspectorConsoleAgent::willDestroyFrontendAndBackend):
+ (Inspector::InspectorConsoleAgent::enable):
+ (Inspector::InspectorConsoleAgent::disable):
+ (Inspector::InspectorConsoleAgent::clearMessages):
+ (Inspector::InspectorConsoleAgent::reset):
+ (Inspector::InspectorConsoleAgent::addMessageToConsole):
+ * inspector/agents/InspectorConsoleAgent.h:
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::enable):
+ (Inspector::InspectorDebuggerAgent::disable):
+ (Inspector::InspectorDebuggerAgent::setBreakpointsActive):
+ (Inspector::InspectorDebuggerAgent::breakpointActionsFromProtocol):
+ (Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
+ (Inspector::parseLocation):
+ (Inspector::InspectorDebuggerAgent::setBreakpoint):
+ (Inspector::InspectorDebuggerAgent::removeBreakpoint):
+ (Inspector::InspectorDebuggerAgent::continueToLocation):
+ (Inspector::InspectorDebuggerAgent::searchInContent):
+ (Inspector::InspectorDebuggerAgent::getScriptSource):
+ (Inspector::InspectorDebuggerAgent::getFunctionDetails):
+ (Inspector::InspectorDebuggerAgent::pause):
+ (Inspector::InspectorDebuggerAgent::resume):
+ (Inspector::InspectorDebuggerAgent::stepOver):
+ (Inspector::InspectorDebuggerAgent::stepInto):
+ (Inspector::InspectorDebuggerAgent::stepOut):
+ (Inspector::InspectorDebuggerAgent::setPauseOnExceptions):
+ (Inspector::InspectorDebuggerAgent::evaluateOnCallFrame):
+ (Inspector::InspectorDebuggerAgent::setOverlayMessage):
+ (Inspector::InspectorDebuggerAgent::didParseSource):
+ (Inspector::InspectorDebuggerAgent::clearInspectorBreakpointState):
+ (Inspector::InspectorDebuggerAgent::assertPaused):
+ * inspector/agents/InspectorDebuggerAgent.h:
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::InspectorRuntimeAgent::parse):
+ (Inspector::InspectorRuntimeAgent::evaluate):
+ (Inspector::InspectorRuntimeAgent::callFunctionOn):
+ (Inspector::InspectorRuntimeAgent::getProperties):
+ (Inspector::InspectorRuntimeAgent::releaseObject):
+ (Inspector::InspectorRuntimeAgent::releaseObjectGroup):
+ (Inspector::InspectorRuntimeAgent::run):
+ (Inspector::InspectorRuntimeAgent::getRuntimeTypesForVariablesAtOffsets):
+ (Inspector::InspectorRuntimeAgent::enableTypeProfiler):
+ (Inspector::InspectorRuntimeAgent::disableTypeProfiler):
+ * inspector/agents/InspectorRuntimeAgent.h:
+ * inspector/agents/JSGlobalObjectConsoleAgent.cpp:
+ (Inspector::JSGlobalObjectConsoleAgent::setMonitoringXHREnabled):
+ (Inspector::JSGlobalObjectConsoleAgent::addInspectedNode):
+ * inspector/agents/JSGlobalObjectConsoleAgent.h:
+ * inspector/agents/JSGlobalObjectDebuggerAgent.cpp:
+ (Inspector::JSGlobalObjectDebuggerAgent::injectedScriptForEval):
+ * inspector/agents/JSGlobalObjectDebuggerAgent.h:
+ * inspector/agents/JSGlobalObjectRuntimeAgent.cpp:
+ (Inspector::JSGlobalObjectRuntimeAgent::injectedScriptForEval):
+ * inspector/agents/JSGlobalObjectRuntimeAgent.h:
+ * inspector/scripts/codegen/generate_backend_dispatcher_header.py:
+ (BackendDispatcherHeaderGenerator._generate_handler_declaration_for_command):
+ (BackendDispatcherHeaderGenerator._generate_async_handler_declaration_for_command):
+ * inspector/scripts/codegen/generate_backend_dispatcher_implementation.py:
+ (BackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command):
+ * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
+ * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
+ * inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
+ * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
+
</ins><span class="cx"> 2014-09-30 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Label some asserts as having security implications.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScript.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>* result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</del><ins>+void InjectedScript::evaluate(ErrorString& errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>* result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("evaluate"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(expression);
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> makeEvalCall(errorString, function, result, wasThrown);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>* result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</del><ins>+void InjectedScript::callFunctionOn(ErrorString& errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>* result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("callFunctionOn"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(objectId);
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> makeEvalCall(errorString, function, result, wasThrown);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const Deprecated::ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>* result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</del><ins>+void InjectedScript::evaluateOnCallFrame(ErrorString& errorString, const Deprecated::ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>* result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("evaluateOnCallFrame"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(callFrames);
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> makeEvalCall(errorString, function, result, wasThrown);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>* result)
</del><ins>+void InjectedScript::getFunctionDetails(ErrorString& errorString, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>* result)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getFunctionDetails"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(functionId);
</span><span class="lines">@@ -101,15 +101,15 @@
</span><span class="cx"> RefPtr<InspectorValue> resultValue;
</span><span class="cx"> makeCall(function, &resultValue);
</span><span class="cx"> if (!resultValue || resultValue->type() != InspectorValue::Type::Object) {
</span><del>- if (!resultValue->asString(*errorString))
- *errorString = ASCIILiteral("Internal error");
</del><ins>+ if (!resultValue->asString(errorString))
+ errorString = ASCIILiteral("Internal error");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> *result = BindingTraits<Inspector::Protocol::Debugger::FunctionDetails>::runtimeCast(resultValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>* properties)
</del><ins>+void InjectedScript::getProperties(ErrorString& errorString, const String& objectId, bool ownProperties, RefPtr<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>* properties)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getProperties"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(objectId);
</span><span class="lines">@@ -118,14 +118,14 @@
</span><span class="cx"> RefPtr<InspectorValue> result;
</span><span class="cx"> makeCall(function, &result);
</span><span class="cx"> if (!result || result->type() != InspectorValue::Type::Array) {
</span><del>- *errorString = ASCIILiteral("Internal error");
</del><ins>+ errorString = ASCIILiteral("Internal error");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> *properties = BindingTraits<Array<Inspector::Protocol::Runtime::PropertyDescriptor>>::runtimeCast(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, RefPtr<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>* properties)
</del><ins>+void InjectedScript::getInternalProperties(ErrorString& errorString, const String& objectId, RefPtr<Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>* properties)
</ins><span class="cx"> {
</span><span class="cx"> Deprecated::ScriptFunctionCall function(injectedScriptObject(), ASCIILiteral("getInternalProperties"), inspectorEnvironment()->functionCallHandler());
</span><span class="cx"> function.appendArgument(objectId);
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> RefPtr<InspectorValue> result;
</span><span class="cx"> makeCall(function, &result);
</span><span class="cx"> if (!result || result->type() != InspectorValue::Type::Array) {
</span><del>- *errorString = ASCIILiteral("Internal error");
</del><ins>+ errorString = ASCIILiteral("Internal error");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScript.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScript.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScript.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -56,12 +56,12 @@
</span><span class="cx"> InjectedScript(Deprecated::ScriptObject, InspectorEnvironment*);
</span><span class="cx"> virtual ~InjectedScript();
</span><span class="cx">
</span><del>- void evaluate(ErrorString*, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
- void callFunctionOn(ErrorString*, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
- void evaluateOnCallFrame(ErrorString*, const Deprecated::ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
- void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Protocol::Debugger::FunctionDetails>* result);
- void getProperties(ErrorString*, const String& objectId, bool ownProperties, RefPtr<Protocol::Array<Protocol::Runtime::PropertyDescriptor>>* result);
- void getInternalProperties(ErrorString*, const String& objectId, RefPtr<Protocol::Array<Protocol::Runtime::InternalPropertyDescriptor>>* result);
</del><ins>+ void evaluate(ErrorString&, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
+ void callFunctionOn(ErrorString&, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
+ void evaluateOnCallFrame(ErrorString&, const Deprecated::ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
+ void getFunctionDetails(ErrorString&, const String& functionId, RefPtr<Protocol::Debugger::FunctionDetails>* result);
+ void getProperties(ErrorString&, const String& objectId, bool ownProperties, RefPtr<Protocol::Array<Protocol::Runtime::PropertyDescriptor>>* result);
+ void getInternalProperties(ErrorString&, const String& objectId, RefPtr<Protocol::Array<Protocol::Runtime::InternalPropertyDescriptor>>* result);
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<Protocol::Array<Protocol::Debugger::CallFrame>> wrapCallFrames(const Deprecated::ScriptValue&);
</span><span class="cx"> PassRefPtr<Protocol::Runtime::RemoteObject> wrapObject(const Deprecated::ScriptValue&, const String& groupName, bool generatePreview = false) const;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -114,31 +114,31 @@
</span><span class="cx"> *result = InspectorString::create("Exception while making a call.");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedScriptBase::makeEvalCall(ErrorString* errorString, Deprecated::ScriptFunctionCall& function, RefPtr<Protocol::Runtime::RemoteObject>* objectResult, Protocol::OptOutput<bool>* wasThrown)
</del><ins>+void InjectedScriptBase::makeEvalCall(ErrorString& errorString, Deprecated::ScriptFunctionCall& function, RefPtr<Protocol::Runtime::RemoteObject>* objectResult, Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorValue> result;
</span><span class="cx"> makeCall(function, &result);
</span><span class="cx"> if (!result) {
</span><del>- *errorString = ASCIILiteral("Internal error: result value is empty");
</del><ins>+ errorString = ASCIILiteral("Internal error: result value is empty");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (result->type() == InspectorValue::Type::String) {
</span><del>- result->asString(*errorString);
- ASSERT(errorString->length());
</del><ins>+ result->asString(errorString);
+ ASSERT(errorString.length());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<InspectorObject> resultPair;
</span><span class="cx"> if (!result->asObject(resultPair)) {
</span><del>- *errorString = ASCIILiteral("Internal error: result is not an Object");
</del><ins>+ errorString = ASCIILiteral("Internal error: result is not an Object");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<InspectorObject> resultObject = resultPair->getObject(ASCIILiteral("result"));
</span><span class="cx"> bool wasThrownVal = false;
</span><span class="cx"> if (!resultObject || !resultPair->getBoolean(ASCIILiteral("wasThrown"), wasThrownVal)) {
</span><del>- *errorString = ASCIILiteral("Internal error: result is not a pair of value and wasThrown flag");
</del><ins>+ errorString = ASCIILiteral("Internal error: result is not a pair of value and wasThrown flag");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptBase.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> const Deprecated::ScriptObject& injectedScriptObject() const;
</span><span class="cx"> Deprecated::ScriptValue callFunctionWithEvalEnabled(Deprecated::ScriptFunctionCall&, bool& hadException) const;
</span><span class="cx"> void makeCall(Deprecated::ScriptFunctionCall&, RefPtr<InspectorValue>* result);
</span><del>- void makeEvalCall(ErrorString*, Deprecated::ScriptFunctionCall&, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
</del><ins>+ void makeEvalCall(ErrorString&, Deprecated::ScriptFunctionCall&, RefPtr<Protocol::Runtime::RemoteObject>* result, Protocol::OptOutput<bool>* wasThrown);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> String m_name;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -63,11 +63,11 @@
</span><span class="cx">
</span><span class="cx"> m_pendingEvaluateTestCommands.clear();
</span><span class="cx">
</span><del>- ErrorString error;
- disable(&error);
</del><ins>+ ErrorString unused;
+ disable(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::enable(ErrorString*)
</del><ins>+void InspectorAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_enabled = true;
</span><span class="cx">
</span><span class="lines">@@ -84,12 +84,12 @@
</span><span class="cx"> m_pendingEvaluateTestCommands.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::disable(ErrorString*)
</del><ins>+void InspectorAgent::disable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorAgent::initialized(ErrorString*)
</del><ins>+void InspectorAgent::initialized(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_environment.frontendInitialized();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -57,9 +57,9 @@
</span><span class="cx"> virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) override;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason reason) override;
</span><span class="cx">
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- virtual void initialized(ErrorString*) override;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
+ virtual void initialized(ErrorString&) override;
</ins><span class="cx">
</span><span class="cx"> void inspect(PassRefPtr<Protocol::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
</span><span class="cx"> void evaluateForTestInFrontend(const String& script);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><span class="cx"> String errorString;
</span><del>- disable(&errorString);
</del><ins>+ disable(errorString);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorConsoleAgent::enable(ErrorString*)
</del><ins>+void InspectorConsoleAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> if (m_enabled)
</span><span class="cx"> return;
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> m_consoleMessages[i]->addToFrontend(m_frontendDispatcher.get(), m_injectedScriptManager, false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorConsoleAgent::disable(ErrorString*)
</del><ins>+void InspectorConsoleAgent::disable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_enabled)
</span><span class="cx"> return;
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorConsoleAgent::clearMessages(ErrorString*)
</del><ins>+void InspectorConsoleAgent::clearMessages(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_consoleMessages.clear();
</span><span class="cx"> m_expiredConsoleMessageCount = 0;
</span><span class="lines">@@ -111,8 +111,8 @@
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::reset()
</span><span class="cx"> {
</span><del>- ErrorString error;
- clearMessages(&error);
</del><ins>+ ErrorString unused;
+ clearMessages(unused);
</ins><span class="cx">
</span><span class="cx"> m_times.clear();
</span><span class="cx"> m_counts.clear();
</span><span class="lines">@@ -124,8 +124,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (type == MessageType::Clear) {
</span><del>- ErrorString error;
- clearMessages(&error);
</del><ins>+ ErrorString unused;
+ clearMessages(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> addConsoleMessage(std::make_unique<ConsoleMessage>(source, type, level, message, callStack, requestIdentifier));
</span><span class="lines">@@ -137,8 +137,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (type == MessageType::Clear) {
</span><del>- ErrorString error;
- clearMessages(&error);
</del><ins>+ ErrorString unused;
+ clearMessages(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> addConsoleMessage(std::make_unique<ConsoleMessage>(source, type, level, message, arguments, state, requestIdentifier));
</span><span class="lines">@@ -150,8 +150,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (type == MessageType::Clear) {
</span><del>- ErrorString error;
- clearMessages(&error);
</del><ins>+ ErrorString unused;
+ clearMessages(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> addConsoleMessage(std::make_unique<ConsoleMessage>(source, type, level, message, scriptID, lineNumber, columnNumber, state, requestIdentifier));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -60,11 +60,11 @@
</span><span class="cx"> virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) override;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override;
</span><span class="cx">
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- virtual void clearMessages(ErrorString*) override;
- virtual void setMonitoringXHREnabled(ErrorString*, bool enabled) = 0;
- virtual void addInspectedNode(ErrorString*, int nodeId) = 0;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
+ virtual void clearMessages(ErrorString&) override;
+ virtual void setMonitoringXHREnabled(ErrorString&, bool enabled) = 0;
+ virtual void addInspectedNode(ErrorString&, int nodeId) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual bool isWorkerAgent() const = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -119,17 +119,17 @@
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::enable(ErrorString*)
</del><ins>+void InspectorDebuggerAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> enable();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::disable(ErrorString*)
</del><ins>+void InspectorDebuggerAgent::disable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> disable(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::setBreakpointsActive(ErrorString*, bool active)
</del><ins>+void InspectorDebuggerAgent::setBreakpointsActive(ErrorString&, bool active)
</ins><span class="cx"> {
</span><span class="cx"> if (active)
</span><span class="cx"> scriptDebugServer().activateBreakpoints();
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorDebuggerAgent::breakpointActionsFromProtocol(ErrorString* errorString, RefPtr<InspectorArray>& actions, BreakpointActions* result)
</del><ins>+bool InspectorDebuggerAgent::breakpointActionsFromProtocol(ErrorString& errorString, RefPtr<InspectorArray>& actions, BreakpointActions* result)
</ins><span class="cx"> {
</span><span class="cx"> if (!actions)
</span><span class="cx"> return true;
</span><span class="lines">@@ -209,19 +209,19 @@
</span><span class="cx"> RefPtr<InspectorValue> value = actions->get(i);
</span><span class="cx"> RefPtr<InspectorObject> object;
</span><span class="cx"> if (!value->asObject(object)) {
</span><del>- *errorString = ASCIILiteral("BreakpointAction of incorrect type, expected object");
</del><ins>+ errorString = ASCIILiteral("BreakpointAction of incorrect type, expected object");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String typeString;
</span><span class="cx"> if (!object->getString(ASCIILiteral("type"), typeString)) {
</span><del>- *errorString = ASCIILiteral("BreakpointAction had type missing");
</del><ins>+ errorString = ASCIILiteral("BreakpointAction had type missing");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScriptBreakpointActionType type;
</span><span class="cx"> if (!breakpointActionTypeForString(typeString, &type)) {
</span><del>- *errorString = ASCIILiteral("BreakpointAction had unknown type");
</del><ins>+ errorString = ASCIILiteral("BreakpointAction had unknown type");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -239,11 +239,11 @@
</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><del>- *errorString = ASCIILiteral("Either url or urlRegex must be specified.");
</del><ins>+ errorString = ASCIILiteral("Either url or urlRegex must be specified.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx">
</span><span class="cx"> String breakpointIdentifier = (isRegex ? "/" + url + "/" : url) + ':' + String::number(lineNumber) + ':' + String::number(columnNumber);
</span><span class="cx"> if (m_javaScriptBreakpoints.contains(breakpointIdentifier)) {
</span><del>- *errorString = ASCIILiteral("Breakpoint at specified location already exists.");
</del><ins>+ errorString = ASCIILiteral("Breakpoint at specified location already exists.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -285,12 +285,12 @@
</span><span class="cx"> *outBreakpointIdentifier = breakpointIdentifier;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool parseLocation(ErrorString* errorString, InspectorObject& location, JSC::SourceID& sourceID, unsigned& lineNumber, unsigned& columnNumber)
</del><ins>+static bool parseLocation(ErrorString& errorString, InspectorObject& location, JSC::SourceID& sourceID, unsigned& lineNumber, unsigned& columnNumber)
</ins><span class="cx"> {
</span><span class="cx"> String scriptIDStr;
</span><span class="cx"> if (!location.getString(ASCIILiteral("scriptId"), scriptIDStr) || !location.getInteger(ASCIILiteral("lineNumber"), lineNumber)) {
</span><span class="cx"> sourceID = JSC::noSourceID;
</span><del>- *errorString = ASCIILiteral("scriptId and lineNumber are required.");
</del><ins>+ errorString = ASCIILiteral("scriptId and lineNumber are required.");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</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">@@ -323,21 +323,21 @@
</span><span class="cx">
</span><span class="cx"> String breakpointIdentifier = String::number(sourceID) + ':' + String::number(lineNumber) + ':' + String::number(columnNumber);
</span><span class="cx"> if (m_breakpointIdentifierToDebugServerBreakpointIDs.find(breakpointIdentifier) != m_breakpointIdentifierToDebugServerBreakpointIDs.end()) {
</span><del>- *errorString = ASCIILiteral("Breakpoint at specified location already exists.");
</del><ins>+ errorString = ASCIILiteral("Breakpoint at specified location already exists.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScriptBreakpoint breakpoint(lineNumber, columnNumber, condition, breakpointActions, autoContinue);
</span><span class="cx"> actualLocation = resolveBreakpoint(breakpointIdentifier, sourceID, breakpoint);
</span><span class="cx"> if (!actualLocation) {
</span><del>- *errorString = ASCIILiteral("Could not resolve breakpoint");
</del><ins>+ errorString = ASCIILiteral("Could not resolve breakpoint");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> *outBreakpointIdentifier = breakpointIdentifier;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::removeBreakpoint(ErrorString*, const String& breakpointIdentifier)
</del><ins>+void InspectorDebuggerAgent::removeBreakpoint(ErrorString&, const String& breakpointIdentifier)
</ins><span class="cx"> {
</span><span class="cx"> m_javaScriptBreakpoints.remove(breakpointIdentifier);
</span><span class="cx">
</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">@@ -395,7 +395,7 @@
</span><span class="cx"> return location;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::searchInContent(ErrorString* error, const String& scriptIDStr, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>& results)
</del><ins>+void InspectorDebuggerAgent::searchInContent(ErrorString& error, const String& scriptIDStr, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>& results)
</ins><span class="cx"> {
</span><span class="cx"> bool isRegex = optionalIsRegex ? *optionalIsRegex : false;
</span><span class="cx"> bool caseSensitive = optionalCaseSensitive ? *optionalCaseSensitive : false;
</span><span class="lines">@@ -405,24 +405,24 @@
</span><span class="cx"> if (it != m_scripts.end())
</span><span class="cx"> results = ContentSearchUtilities::searchInTextByLines(it->value.source, query, caseSensitive, isRegex);
</span><span class="cx"> else
</span><del>- *error = "No script for id: " + scriptIDStr;
</del><ins>+ error = ASCIILiteral("No script for id: ") + scriptIDStr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::getScriptSource(ErrorString* error, const String& scriptIDStr, String* scriptSource)
</del><ins>+void InspectorDebuggerAgent::getScriptSource(ErrorString& error, const String& scriptIDStr, String* scriptSource)
</ins><span class="cx"> {
</span><span class="cx"> JSC::SourceID sourceID = scriptIDStr.toIntPtr();
</span><span class="cx"> ScriptsMap::iterator it = m_scripts.find(sourceID);
</span><span class="cx"> if (it != m_scripts.end())
</span><span class="cx"> *scriptSource = it->value.source;
</span><span class="cx"> else
</span><del>- *error = "No script for id: " + scriptIDStr;
</del><ins>+ error = ASCIILiteral("No script for id: ") + scriptIDStr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>& details)
</del><ins>+void InspectorDebuggerAgent::getFunctionDetails(ErrorString& errorString, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>& details)
</ins><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(functionId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><del>- *errorString = ASCIILiteral("Function object id is obsolete");
</del><ins>+ errorString = ASCIILiteral("Function object id is obsolete");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -448,7 +448,7 @@
</span><span class="cx"> scriptDebugServer().setPauseOnNextStatement(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::pause(ErrorString*)
</del><ins>+void InspectorDebuggerAgent::pause(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> if (m_javaScriptPauseScheduled)
</span><span class="cx"> return;
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> m_javaScriptPauseScheduled = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::resume(ErrorString* errorString)
</del><ins>+void InspectorDebuggerAgent::resume(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (!assertPaused(errorString))
</span><span class="cx"> return;
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> scriptDebugServer().continueProgram();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::stepOver(ErrorString* errorString)
</del><ins>+void InspectorDebuggerAgent::stepOver(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (!assertPaused(errorString))
</span><span class="cx"> return;
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx"> scriptDebugServer().stepOverStatement();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::stepInto(ErrorString* errorString)
</del><ins>+void InspectorDebuggerAgent::stepInto(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (!assertPaused(errorString))
</span><span class="cx"> return;
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> m_listener->stepInto();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::stepOut(ErrorString* errorString)
</del><ins>+void InspectorDebuggerAgent::stepOut(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (!assertPaused(errorString))
</span><span class="cx"> return;
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> scriptDebugServer().stepOutOfFunction();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::setPauseOnExceptions(ErrorString* errorString, const String& stringPauseState)
</del><ins>+void InspectorDebuggerAgent::setPauseOnExceptions(ErrorString& errorString, const String& stringPauseState)
</ins><span class="cx"> {
</span><span class="cx"> JSC::Debugger::PauseOnExceptionsState pauseState;
</span><span class="cx"> if (stringPauseState == "none")
</span><span class="lines">@@ -507,20 +507,20 @@
</span><span class="cx"> else if (stringPauseState == "uncaught")
</span><span class="cx"> pauseState = JSC::Debugger::PauseOnUncaughtExceptions;
</span><span class="cx"> else {
</span><del>- *errorString = "Unknown pause on exceptions mode: " + stringPauseState;
</del><ins>+ errorString = ASCIILiteral("Unknown pause on exceptions mode: ") + stringPauseState;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> scriptDebugServer().setPauseOnExceptionsState(static_cast<JSC::Debugger::PauseOnExceptionsState>(pauseState));
</span><span class="cx"> if (scriptDebugServer().pauseOnExceptionsState() != pauseState)
</span><del>- *errorString = ASCIILiteral("Internal error. Could not change pause on exceptions state");
</del><ins>+ errorString = ASCIILiteral("Internal error. Could not change pause on exceptions state");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString* errorString, const String& callFrameId, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</del><ins>+void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString& errorString, const String& callFrameId, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(callFrameId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><del>- *errorString = ASCIILiteral("Inspected frame has gone");
</del><ins>+ errorString = ASCIILiteral("Inspected frame has gone");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::setOverlayMessage(ErrorString*, const String*)
</del><ins>+void InspectorDebuggerAgent::setOverlayMessage(ErrorString&, const String*)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> breakpointObject->getBoolean(ASCIILiteral("autoContinue"), breakpoint.autoContinue);
</span><span class="cx"> ErrorString errorString;
</span><span class="cx"> RefPtr<InspectorArray> actions = breakpointObject->getArray(ASCIILiteral("actions"));
</span><del>- if (!breakpointActionsFromProtocol(&errorString, actions, &breakpoint.actions)) {
</del><ins>+ if (!breakpointActionsFromProtocol(errorString, actions, &breakpoint.actions)) {
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx"> Vector<String> breakpointIdentifiers;
</span><span class="cx"> copyKeysToVector(m_breakpointIdentifierToDebugServerBreakpointIDs, breakpointIdentifiers);
</span><span class="cx"> for (const String& identifier : breakpointIdentifiers)
</span><del>- removeBreakpoint(&dummyError, identifier);
</del><ins>+ removeBreakpoint(dummyError, identifier);
</ins><span class="cx">
</span><span class="cx"> m_javaScriptBreakpoints.clear();
</span><span class="cx">
</span><span class="lines">@@ -729,10 +729,10 @@
</span><span class="cx"> m_frontendDispatcher->globalObjectCleared();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorDebuggerAgent::assertPaused(ErrorString* errorString)
</del><ins>+bool InspectorDebuggerAgent::assertPaused(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_pausedScriptState) {
</span><del>- *errorString = ASCIILiteral("Can only perform operation while paused.");
</del><ins>+ errorString = ASCIILiteral("Can only perform operation while paused.");
</ins><span class="cx"> return false;
</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 (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -68,24 +68,24 @@
</span><span class="cx"> virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) override;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override;
</span><span class="cx">
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- virtual void setBreakpointsActive(ErrorString*, bool active) override;
- virtual void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const RefPtr<Inspector::InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations) override;
- virtual void setBreakpoint(ErrorString*, const RefPtr<Inspector::InspectorObject>& location, const RefPtr<Inspector::InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation) override;
- virtual void removeBreakpoint(ErrorString*, const String& breakpointIdentifier) override;
- virtual void continueToLocation(ErrorString*, const RefPtr<InspectorObject>& location) override;
- virtual void searchInContent(ErrorString*, const String& scriptID, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) override;
- virtual void getScriptSource(ErrorString*, const String& scriptID, String* scriptSource) override;
- virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>&) override;
- virtual void pause(ErrorString*) override;
- virtual void resume(ErrorString*) override;
- virtual void stepOver(ErrorString*) override;
- virtual void stepInto(ErrorString*) override;
- virtual void stepOut(ErrorString*) override;
- virtual void setPauseOnExceptions(ErrorString*, const String& pauseState) override;
- virtual void evaluateOnCallFrame(ErrorString*, const String& callFrameId, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override;
- virtual void setOverlayMessage(ErrorString*, const String*) override;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
+ virtual void setBreakpointsActive(ErrorString&, bool active) override;
+ virtual void setBreakpointByUrl(ErrorString&, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const RefPtr<Inspector::InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Debugger::Location>>& locations) override;
+ virtual void setBreakpoint(ErrorString&, const RefPtr<Inspector::InspectorObject>& location, const RefPtr<Inspector::InspectorObject>* options, Inspector::Protocol::Debugger::BreakpointId*, RefPtr<Inspector::Protocol::Debugger::Location>& actualLocation) override;
+ virtual void removeBreakpoint(ErrorString&, const String& breakpointIdentifier) override;
+ virtual void continueToLocation(ErrorString&, const RefPtr<InspectorObject>& location) override;
+ virtual void searchInContent(ErrorString&, const String& scriptID, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) override;
+ virtual void getScriptSource(ErrorString&, const String& scriptID, String* scriptSource) override;
+ virtual void getFunctionDetails(ErrorString&, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>&) override;
+ virtual void pause(ErrorString&) override;
+ virtual void resume(ErrorString&) override;
+ virtual void stepOver(ErrorString&) override;
+ virtual void stepInto(ErrorString&) override;
+ virtual void stepOut(ErrorString&) override;
+ virtual void setPauseOnExceptions(ErrorString&, const String& pauseState) override;
+ virtual void evaluateOnCallFrame(ErrorString&, const String& callFrameId, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override;
+ virtual void setOverlayMessage(ErrorString&, const String*) override;
</ins><span class="cx">
</span><span class="cx"> bool isPaused();
</span><span class="cx">
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> InspectorDebuggerAgent(InjectedScriptManager*);
</span><span class="cx">
</span><span class="cx"> InjectedScriptManager* injectedScriptManager() const { return m_injectedScriptManager; }
</span><del>- virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) = 0;
</del><ins>+ virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void startListeningScriptDebugServer() = 0;
</span><span class="cx"> virtual void stopListeningScriptDebugServer(bool skipRecompile) = 0;
</span><span class="lines">@@ -138,12 +138,12 @@
</span><span class="cx"> virtual void breakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, int hitCount, const Deprecated::ScriptValue& sample) override final;
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Inspector::Protocol::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
</span><del>- bool assertPaused(ErrorString*);
</del><ins>+ bool assertPaused(ErrorString&);
</ins><span class="cx"> void clearDebuggerBreakpointState();
</span><span class="cx"> void clearInspectorBreakpointState();
</span><span class="cx"> void clearBreakDetails();
</span><span class="cx">
</span><del>- bool breakpointActionsFromProtocol(ErrorString*, RefPtr<InspectorArray>& actions, BreakpointActions* result);
</del><ins>+ bool breakpointActionsFromProtocol(ErrorString&, RefPtr<InspectorArray>& actions, BreakpointActions* result);
</ins><span class="cx">
</span><span class="cx"> typedef HashMap<JSC::SourceID, Script> ScriptsMap;
</span><span class="cx"> typedef HashMap<String, Vector<JSC::BreakpointID>> BreakpointIdentifierToDebugServerBreakpointIDsMap;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::parse(ErrorString*, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>& range)
</del><ins>+void InspectorRuntimeAgent::parse(ErrorString&, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>& range)
</ins><span class="cx"> {
</span><span class="cx"> VM& vm = globalVM();
</span><span class="cx"> JSLockHolder lock(vm);
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::evaluate(ErrorString* errorString, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</del><ins>+void InspectorRuntimeAgent::evaluate(ErrorString& errorString, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</ins><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = injectedScriptForEval(errorString, executionContextId);
</span><span class="cx"> if (injectedScript.hasNoValue())
</span><span class="lines">@@ -137,11 +137,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const RefPtr<InspectorArray>* const optionalArguments, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::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><del>- *errorString = ASCIILiteral("Inspected frame has gone");
</del><ins>+ errorString = ASCIILiteral("Inspected frame has gone");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -163,11 +163,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::getProperties(ErrorString* errorString, const String& objectId, const bool* const ownProperties, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties)
</del><ins>+void InspectorRuntimeAgent::getProperties(ErrorString& errorString, const String& objectId, const bool* const ownProperties, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties)
</ins><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</span><span class="cx"> if (injectedScript.hasNoValue()) {
</span><del>- *errorString = ASCIILiteral("Inspected frame has gone");
</del><ins>+ errorString = ASCIILiteral("Inspected frame has gone");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -181,29 +181,29 @@
</span><span class="cx"> setPauseOnExceptionsState(m_scriptDebugServer, previousPauseOnExceptionsState);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::releaseObject(ErrorString*, const String& objectId)
</del><ins>+void InspectorRuntimeAgent::releaseObject(ErrorString&, const String& objectId)
</ins><span class="cx"> {
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</span><span class="cx"> if (!injectedScript.hasNoValue())
</span><span class="cx"> injectedScript.releaseObject(objectId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::releaseObjectGroup(ErrorString*, const String& objectGroup)
</del><ins>+void InspectorRuntimeAgent::releaseObjectGroup(ErrorString&, const String& objectGroup)
</ins><span class="cx"> {
</span><span class="cx"> m_injectedScriptManager->releaseObjectGroup(objectGroup);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::run(ErrorString*)
</del><ins>+void InspectorRuntimeAgent::run(ErrorString&)
</ins><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="cx"> typeDescriptions = Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>::create();
</span><span class="cx"> if (!vm.typeProfiler()) {
</span><del>- *errorString = ASCIILiteral("The VM does not currently have Type Information.");
</del><ins>+ errorString = ASCIILiteral("The VM does not currently have Type Information.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> RefPtr<Inspector::InspectorValue> value = locations->get(i);
</span><span class="cx"> RefPtr<InspectorObject> location;
</span><span class="cx"> if (!value->asObject(location)) {
</span><del>- *errorString = ASCIILiteral("Array of TypeLocation objects has an object that does not have type of TypeLocation.");
</del><ins>+ errorString = ASCIILiteral("Array of TypeLocation objects has an object that does not have type of TypeLocation.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -287,12 +287,12 @@
</span><span class="cx"> setTypeProfilerEnabledState(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::enableTypeProfiler(ErrorString*)
</del><ins>+void InspectorRuntimeAgent::enableTypeProfiler(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> setTypeProfilerEnabledState(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorRuntimeAgent::disableTypeProfiler(ErrorString*)
</del><ins>+void InspectorRuntimeAgent::disableTypeProfiler(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> setTypeProfilerEnabledState(false);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -59,18 +59,18 @@
</span><span class="cx">
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override;
</span><span class="cx">
</span><del>- virtual void enable(ErrorString*) override { m_enabled = true; }
- virtual void disable(ErrorString*) override { m_enabled = false; }
- virtual void parse(ErrorString*, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>&) override final;
- virtual void evaluate(ErrorString*, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override final;
- virtual void callFunctionOn(ErrorString*, const String& objectId, const String& expression, const RefPtr<Inspector::InspectorArray>* optionalArguments, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override final;
- virtual void releaseObject(ErrorString*, const ErrorString& objectId) override final;
- virtual void getProperties(ErrorString*, const String& objectId, const bool* ownProperties, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) override final;
- virtual void releaseObjectGroup(ErrorString*, const String& objectGroup) override final;
- virtual void run(ErrorString*) override;
- virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString*, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
- virtual void enableTypeProfiler(ErrorString*) override;
- virtual void disableTypeProfiler(ErrorString*) override;
</del><ins>+ virtual void enable(ErrorString&) override { m_enabled = true; }
+ virtual void disable(ErrorString&) override { m_enabled = false; }
+ virtual void parse(ErrorString&, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>&) override final;
+ virtual void evaluate(ErrorString&, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override final;
+ virtual void callFunctionOn(ErrorString&, const String& objectId, const String& expression, const RefPtr<Inspector::InspectorArray>* optionalArguments, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) override final;
+ virtual void releaseObject(ErrorString&, const ErrorString& objectId) override final;
+ virtual void getProperties(ErrorString&, const String& objectId, const bool* ownProperties, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) override final;
+ virtual void releaseObjectGroup(ErrorString&, const String& objectGroup) override final;
+ virtual void run(ErrorString&) override;
+ virtual void getRuntimeTypesForVariablesAtOffsets(ErrorString&, const RefPtr<Inspector::InspectorArray>& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override;
+ virtual void enableTypeProfiler(ErrorString&) override;
+ virtual void disableTypeProfiler(ErrorString&) override;
</ins><span class="cx">
</span><span class="cx"> void setScriptDebugServer(ScriptDebugServer* scriptDebugServer) { m_scriptDebugServer = scriptDebugServer; }
</span><span class="cx">
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> InjectedScriptManager* injectedScriptManager() { return m_injectedScriptManager; }
</span><span class="cx">
</span><span class="cx"> virtual JSC::VM& globalVM() = 0;
</span><del>- virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) = 0;
</del><ins>+ virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void muteConsole() = 0;
</span><span class="cx"> virtual void unmuteConsole() = 0;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -35,14 +35,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectConsoleAgent::setMonitoringXHREnabled(ErrorString* errorString, bool)
</del><ins>+void JSGlobalObjectConsoleAgent::setMonitoringXHREnabled(ErrorString& errorString, bool)
</ins><span class="cx"> {
</span><del>- *errorString = ASCIILiteral("Not supported for JavaScript context");
</del><ins>+ errorString = ASCIILiteral("Not supported for JavaScript context");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectConsoleAgent::addInspectedNode(ErrorString* errorString, int)
</del><ins>+void JSGlobalObjectConsoleAgent::addInspectedNode(ErrorString& errorString, int)
</ins><span class="cx"> {
</span><del>- *errorString = ASCIILiteral("Not supported for JavaScript context");
</del><ins>+ errorString = ASCIILiteral("Not supported for JavaScript context");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> virtual ~JSGlobalObjectConsoleAgent() { }
</span><span class="cx">
</span><span class="cx"> // FIXME: XHRs and Nodes only makes sense debugging a Web context. Can this be moved to a different agent?
</span><del>- virtual void setMonitoringXHREnabled(ErrorString*, bool enabled) override;
- virtual void addInspectedNode(ErrorString*, int nodeId) override;
</del><ins>+ virtual void setMonitoringXHREnabled(ErrorString&, bool enabled) override;
+ virtual void addInspectedNode(ErrorString&, int nodeId) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool isWorkerAgent() const override { return false; }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -56,10 +56,10 @@
</span><span class="cx"> scriptDebugServer().removeListener(this, isBeingDestroyed);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InjectedScript JSGlobalObjectDebuggerAgent::injectedScriptForEval(ErrorString* error, const int* executionContextId)
</del><ins>+InjectedScript JSGlobalObjectDebuggerAgent::injectedScriptForEval(ErrorString& error, const int* executionContextId)
</ins><span class="cx"> {
</span><span class="cx"> if (executionContextId) {
</span><del>- *error = ASCIILiteral("Execution context id is not supported for JSContext inspection as there is only one execution context.");
</del><ins>+ error = ASCIILiteral("Execution context id is not supported for JSContext inspection as there is only one execution context.");
</ins><span class="cx"> return InjectedScript();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void startListeningScriptDebugServer() override;
</span><span class="cx"> virtual void stopListeningScriptDebugServer(bool isBeingDestroyed) override;
</span><del>- virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
</del><ins>+ virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
</ins><span class="cx">
</span><span class="cx"> virtual void breakpointActionLog(JSC::ExecState*, const String&) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -61,14 +61,14 @@
</span><span class="cx"> return m_globalObject.vm();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InjectedScript JSGlobalObjectRuntimeAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
</del><ins>+InjectedScript JSGlobalObjectRuntimeAgent::injectedScriptForEval(ErrorString& errorString, const int* executionContextId)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(executionContextId, !executionContextId);
</span><span class="cx">
</span><span class="cx"> JSC::ExecState* scriptState = m_globalObject.globalExec();
</span><span class="cx"> InjectedScript injectedScript = injectedScriptManager()->injectedScriptFor(scriptState);
</span><span class="cx"> if (injectedScript.hasNoValue())
</span><del>- *errorString = ASCIILiteral("Internal error: main world execution context not found.");
</del><ins>+ errorString = ASCIILiteral("Internal error: main world execution context not found.");
</ins><span class="cx">
</span><span class="cx"> return injectedScript;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> virtual JSC::VM& globalVM() override;
</span><del>- virtual InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
</del><ins>+ virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
</ins><span class="cx">
</span><span class="cx"> // NOTE: JavaScript inspector does not yet need to mute a console because no messages
</span><span class="cx"> // are sent to the console outside of the API boundary or console object.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_backend_dispatcher_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> return self._generate_async_handler_declaration_for_command(command)
</span><span class="cx">
</span><span class="cx"> lines = []
</span><del>- parameters = ['ErrorString*']
</del><ins>+ parameters = ['ErrorString&']
</ins><span class="cx"> for _parameter in command.call_parameters:
</span><span class="cx"> parameters.append("%s in_%s" % (Generator.type_string_for_unchecked_formal_in_parameter(_parameter), _parameter.parameter_name))
</span><span class="cx">
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> def _generate_async_handler_declaration_for_command(self, command):
</span><span class="cx"> callbackName = "%sCallback" % ucfirst(command.command_name)
</span><span class="cx">
</span><del>- in_parameters = ['ErrorString*']
</del><ins>+ in_parameters = ['ErrorString&']
</ins><span class="cx"> for _parameter in command.call_parameters:
</span><span class="cx"> in_parameters.append("%s in_%s" % (Generator.type_string_for_unchecked_formal_in_parameter(_parameter), _parameter.parameter_name))
</span><span class="cx"> in_parameters.append("PassRefPtr<%s> callback" % callbackName)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_backend_dispatcher_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> in_parameter_declarations = []
</span><span class="cx"> out_parameter_declarations = []
</span><span class="cx"> out_parameter_assignments = []
</span><del>- method_parameters = ['&error']
</del><ins>+ method_parameters = ['error']
</ins><span class="cx">
</span><span class="cx"> for parameter in command.call_parameters:
</span><span class="cx"> out_success_argument = 'nullptr'
</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 (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -98,20 +98,20 @@
</span><span class="cx"> Yellow = 5,
</span><span class="cx"> Black = 6,
</span><span class="cx"> }; // enum class PrintColor
</span><del>- virtual void executeSQLSyncOptionalReturnValues(ErrorString*, int in_databaseId, const String& in_query, RefPtr<Inspector::Protocol::Array<String>>& opt_out_columnNames, Inspector::Protocol::OptOutput<String>* opt_out_notes, Inspector::Protocol::OptOutput<double>* opt_out_timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::Protocol::OptOutput<int>* opt_out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& opt_out_sqlError, Inspector::Protocol::Database::PrimaryColors* opt_out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
</del><ins>+ virtual void executeSQLSyncOptionalReturnValues(ErrorString&, int in_databaseId, const String& in_query, RefPtr<Inspector::Protocol::Array<String>>& opt_out_columnNames, Inspector::Protocol::OptOutput<String>* opt_out_notes, Inspector::Protocol::OptOutput<double>* opt_out_timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::Protocol::OptOutput<int>* opt_out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& opt_out_sqlError, Inspector::Protocol::Database::PrimaryColors* opt_out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
</ins><span class="cx"> class ExecuteSQLAsyncOptionalReturnValuesCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
</span><span class="cx"> public:
</span><span class="cx"> ExecuteSQLAsyncOptionalReturnValuesCallback(PassRefPtr<Inspector::InspectorBackendDispatcher>, int id);
</span><span class="cx"> 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);
</span><span class="cx"> };
</span><del>- virtual void executeSQLAsyncOptionalReturnValues(ErrorString*, int in_databaseId, const String& in_query, PassRefPtr<ExecuteSQLAsyncOptionalReturnValuesCallback> callback) = 0;
- virtual void executeSQLSync(ErrorString*, int in_databaseId, const String& in_query, RefPtr<Inspector::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 executeSQLAsyncOptionalReturnValues(ErrorString&, int in_databaseId, const String& in_query, PassRefPtr<ExecuteSQLAsyncOptionalReturnValuesCallback> callback) = 0;
+ virtual void executeSQLSync(ErrorString&, int in_databaseId, const String& in_query, RefPtr<Inspector::Protocol::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& out_sqlError, Inspector::Protocol::Database::PrimaryColors* out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* out_printColor) = 0;
</ins><span class="cx"> class ExecuteSQLAsyncCallback : public Inspector::InspectorBackendDispatcher::CallbackBase {
</span><span class="cx"> public:
</span><span class="cx"> ExecuteSQLAsyncCallback(PassRefPtr<Inspector::InspectorBackendDispatcher>, int id);
</span><span class="cx"> 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);
</span><span class="cx"> };
</span><del>- virtual void executeSQLAsync(ErrorString*, int in_databaseId, const String& in_query, PassRefPtr<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="lines">@@ -234,7 +234,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->executeSQLSyncOptionalReturnValues(&error, in_databaseId, in_query, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, &out_screenColor, &out_printColor);
</del><ins>+ m_agent->executeSQLSyncOptionalReturnValues(error, in_databaseId, in_query, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, &out_screenColor, &out_printColor);
</ins><span class="cx">
</span><span class="cx"> if (!error.length()) {
</span><span class="cx"> if (out_columnNames)
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><span class="cx"> RefPtr<InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback> callback = adoptRef(new InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncOptionalReturnValuesCallback(m_backendDispatcher,callId));
</span><del>- m_agent->executeSQLAsyncOptionalReturnValues(&error, in_databaseId, in_query, callback);
</del><ins>+ 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">@@ -336,7 +336,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->executeSQLSync(&error, in_databaseId, in_query, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, &out_screenColor, &out_printColor);
</del><ins>+ m_agent->executeSQLSync(error, in_databaseId, in_query, out_columnNames, &out_notes, &out_timestamp, out_values, &out_payload, &out_databaseId, out_sqlError, &out_screenColor, &out_printColor);
</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">@@ -386,7 +386,7 @@
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><span class="cx"> RefPtr<InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback> callback = adoptRef(new InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback(m_backendDispatcher,callId));
</span><del>- m_agent->executeSQLAsync(&error, in_databaseId, in_query, callback);
</del><ins>+ 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></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 (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -95,8 +95,8 @@
</span><span class="cx"> Yellow = 5,
</span><span class="cx"> Black = 6,
</span><span class="cx"> }; // enum class PrintColor
</span><del>- virtual void executeAllOptionalParameters(ErrorString*, const RefPtr<Inspector::InspectorArray>* in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>* in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>* in_sqlError, const String* in_screenColor, const String* in_printColor, RefPtr<Inspector::Protocol::Array<String>>& opt_out_columnNames, Inspector::Protocol::OptOutput<String>* opt_out_notes, Inspector::Protocol::OptOutput<double>* opt_out_timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::Protocol::OptOutput<int>* opt_out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& opt_out_sqlError, Inspector::Protocol::Database::PrimaryColors* opt_out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
- virtual void executeNoOptionalParameters(ErrorString*, const RefPtr<Inspector::InspectorArray>& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>& in_sqlError, const String& in_screenColor, const String& in_printColor, RefPtr<Inspector::Protocol::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& out_sqlError, Inspector::Protocol::Database::PrimaryColors* out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* out_printColor) = 0;
</del><ins>+ virtual void executeAllOptionalParameters(ErrorString&, const RefPtr<Inspector::InspectorArray>* in_columnNames, const String* in_notes, const double* in_timestamp, const RefPtr<Inspector::InspectorObject>* in_values, const Inspector::InspectorValue* in_payload, const int* in_databaseId, const RefPtr<Inspector::InspectorObject>* in_sqlError, const String* in_screenColor, const String* in_printColor, RefPtr<Inspector::Protocol::Array<String>>& opt_out_columnNames, Inspector::Protocol::OptOutput<String>* opt_out_notes, Inspector::Protocol::OptOutput<double>* opt_out_timestamp, Inspector::Protocol::OptOutput<Inspector::InspectorObject>* opt_out_values, Inspector::Protocol::OptOutput<Inspector::InspectorValue>* opt_out_payload, Inspector::Protocol::OptOutput<int>* opt_out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& opt_out_sqlError, Inspector::Protocol::Database::PrimaryColors* opt_out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* opt_out_printColor) = 0;
+ virtual void executeNoOptionalParameters(ErrorString&, const RefPtr<Inspector::InspectorArray>& in_columnNames, const String& in_notes, double in_timestamp, const RefPtr<Inspector::InspectorObject>& in_values, Inspector::InspectorValue in_payload, int in_databaseId, const RefPtr<Inspector::InspectorObject>& in_sqlError, const String& in_screenColor, const String& in_printColor, RefPtr<Inspector::Protocol::Array<String>>& out_columnNames, String* out_notes, double* out_timestamp, Inspector::InspectorObject* out_values, Inspector::InspectorValue* out_payload, int* out_databaseId, RefPtr<Inspector::Protocol::Database::Error>& out_sqlError, Inspector::Protocol::Database::PrimaryColors* out_screenColor, InspectorDatabaseBackendDispatcherHandler::PrintColor* out_printColor) = 0;
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~InspectorDatabaseBackendDispatcherHandler();
</span><span class="cx"> };
</span><span class="lines">@@ -229,7 +229,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 : 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);
</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">@@ -286,7 +286,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, 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);
</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></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 (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -89,20 +89,20 @@
</span><span class="cx">
</span><span class="cx"> class InspectorNetwork1BackendDispatcherHandler {
</span><span class="cx"> public:
</span><del>- virtual void loadResource1(ErrorString*) = 0;
</del><ins>+ virtual void loadResource1(ErrorString&) = 0;
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~InspectorNetwork1BackendDispatcherHandler();
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class InspectorNetwork3BackendDispatcherHandler {
</span><span class="cx"> public:
</span><del>- virtual void loadResource1(ErrorString*) = 0;
- virtual void loadResource2(ErrorString*) = 0;
- virtual void loadResource3(ErrorString*) = 0;
- virtual void loadResource4(ErrorString*) = 0;
- virtual void loadResource5(ErrorString*) = 0;
- virtual void loadResource6(ErrorString*) = 0;
- virtual void loadResource7(ErrorString*) = 0;
</del><ins>+ virtual void loadResource1(ErrorString&) = 0;
+ virtual void loadResource2(ErrorString&) = 0;
+ virtual void loadResource3(ErrorString&) = 0;
+ virtual void loadResource4(ErrorString&) = 0;
+ virtual void loadResource5(ErrorString&) = 0;
+ virtual void loadResource6(ErrorString&) = 0;
+ virtual void loadResource7(ErrorString&) = 0;
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~InspectorNetwork3BackendDispatcherHandler();
</span><span class="cx"> };
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> {
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- m_agent->loadResource1(&error);
</del><ins>+ m_agent->loadResource1(error);
</ins><span class="cx">
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, result.release(), error);
</span><span class="cx"> }
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> {
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- m_agent->loadResource1(&error);
</del><ins>+ m_agent->loadResource1(error);
</ins><span class="cx">
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, result.release(), error);
</span><span class="cx"> }
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> {
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- m_agent->loadResource2(&error);
</del><ins>+ m_agent->loadResource2(error);
</ins><span class="cx">
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, result.release(), error);
</span><span class="cx"> }
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> {
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- m_agent->loadResource3(&error);
</del><ins>+ m_agent->loadResource3(error);
</ins><span class="cx">
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, result.release(), error);
</span><span class="cx"> }
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> {
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- m_agent->loadResource4(&error);
</del><ins>+ m_agent->loadResource4(error);
</ins><span class="cx">
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, result.release(), error);
</span><span class="cx"> }
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> {
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- m_agent->loadResource5(&error);
</del><ins>+ m_agent->loadResource5(error);
</ins><span class="cx">
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, result.release(), error);
</span><span class="cx"> }
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> {
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- m_agent->loadResource6(&error);
</del><ins>+ m_agent->loadResource6(error);
</ins><span class="cx">
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, result.release(), error);
</span><span class="cx"> }
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> {
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- m_agent->loadResource7(&error);
</del><ins>+ m_agent->loadResource7(error);
</ins><span class="cx">
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, result.release(), error);
</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 (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><span class="cx"> class InspectorNetwork1BackendDispatcherHandler {
</span><span class="cx"> public:
</span><del>- virtual void loadResource(ErrorString*) = 0;
</del><ins>+ virtual void loadResource(ErrorString&) = 0;
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~InspectorNetwork1BackendDispatcherHandler();
</span><span class="cx"> };
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> {
</span><span class="cx"> ErrorString error;
</span><span class="cx"> RefPtr<InspectorObject> result = InspectorObject::create();
</span><del>- m_agent->loadResource(&error);
</del><ins>+ m_agent->loadResource(error);
</ins><span class="cx">
</span><span class="cx"> m_backendDispatcher->sendResponse(callId, result.release(), error);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/ChangeLog 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -1,3 +1,278 @@
</span><ins>+2014-09-30 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: ErrorString should be passed by reference
+ https://bugs.webkit.org/show_bug.cgi?id=137257
+
+ Reviewed by Joseph Pecoraro.
+
+ Pass the leading ErrorString argument by reference, since it is always an out parameter.
+ Clean up callsites where the error message is written.
+
+ No new tests, no behavior changed.
+
+ * inspector/CommandLineAPIHost.cpp:
+ (WebCore::CommandLineAPIHost::clearConsoleMessages):
+ * inspector/DOMEditor.cpp:
+ (WebCore::populateErrorString):
+ (WebCore::DOMEditor::insertBefore):
+ (WebCore::DOMEditor::removeChild):
+ (WebCore::DOMEditor::setAttribute):
+ (WebCore::DOMEditor::removeAttribute):
+ (WebCore::DOMEditor::setOuterHTML):
+ (WebCore::DOMEditor::replaceWholeText):
+ * inspector/DOMEditor.h:
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ (WebCore::InspectorApplicationCacheAgent::enable):
+ (WebCore::InspectorApplicationCacheAgent::getFramesWithManifests):
+ (WebCore::InspectorApplicationCacheAgent::assertFrameWithDocumentLoader):
+ (WebCore::InspectorApplicationCacheAgent::getManifestForFrame):
+ (WebCore::InspectorApplicationCacheAgent::getApplicationCacheForFrame):
+ * inspector/InspectorApplicationCacheAgent.h:
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::enable):
+ (WebCore::InspectorCSSAgent::disable):
+ (WebCore::InspectorCSSAgent::didCreateNamedFlow):
+ (WebCore::InspectorCSSAgent::regionOversetChanged):
+ (WebCore::InspectorCSSAgent::didRegisterNamedFlowContentElement):
+ (WebCore::InspectorCSSAgent::didUnregisterNamedFlowContentElement):
+ (WebCore::InspectorCSSAgent::getMatchedStylesForNode):
+ (WebCore::InspectorCSSAgent::getInlineStylesForNode):
+ (WebCore::InspectorCSSAgent::getComputedStyleForNode):
+ (WebCore::InspectorCSSAgent::getAllStyleSheets):
+ (WebCore::InspectorCSSAgent::getStyleSheet):
+ (WebCore::InspectorCSSAgent::getStyleSheetText):
+ (WebCore::InspectorCSSAgent::setStyleSheetText):
+ (WebCore::InspectorCSSAgent::setStyleText):
+ (WebCore::InspectorCSSAgent::setPropertyText):
+ (WebCore::InspectorCSSAgent::toggleProperty):
+ (WebCore::InspectorCSSAgent::setRuleSelector):
+ (WebCore::InspectorCSSAgent::addRule):
+ (WebCore::InspectorCSSAgent::getSupportedCSSProperties):
+ (WebCore::InspectorCSSAgent::forcePseudoState):
+ (WebCore::InspectorCSSAgent::getNamedFlowCollection):
+ (WebCore::InspectorCSSAgent::elementForId):
+ (WebCore::InspectorCSSAgent::assertStyleSheetForId):
+ (WebCore::InspectorCSSAgent::buildArrayForRegions):
+ (WebCore::InspectorCSSAgent::buildObjectForNamedFlow):
+ * inspector/InspectorCSSAgent.h:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::hideHighlight):
+ (WebCore::InspectorController::setProfilerEnabled):
+ (WebCore::InspectorController::resume):
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorDOMAgent::assertNode):
+ (WebCore::InspectorDOMAgent::assertDocument):
+ (WebCore::InspectorDOMAgent::assertElement):
+ (WebCore::InspectorDOMAgent::assertEditableNode):
+ (WebCore::InspectorDOMAgent::assertEditableElement):
+ (WebCore::InspectorDOMAgent::getDocument):
+ (WebCore::InspectorDOMAgent::pushNodeToFrontend):
+ (WebCore::InspectorDOMAgent::requestChildNodes):
+ (WebCore::InspectorDOMAgent::querySelector):
+ (WebCore::InspectorDOMAgent::querySelectorAll):
+ (WebCore::InspectorDOMAgent::releaseBackendNodeIds):
+ (WebCore::InspectorDOMAgent::setAttributeValue):
+ (WebCore::InspectorDOMAgent::setAttributesAsText):
+ (WebCore::InspectorDOMAgent::removeAttribute):
+ (WebCore::InspectorDOMAgent::removeNode):
+ (WebCore::InspectorDOMAgent::setNodeName):
+ (WebCore::InspectorDOMAgent::getOuterHTML):
+ (WebCore::InspectorDOMAgent::setOuterHTML):
+ (WebCore::InspectorDOMAgent::setNodeValue):
+ (WebCore::InspectorDOMAgent::getEventListenersForNode):
+ (WebCore::InspectorDOMAgent::getAccessibilityPropertiesForNode):
+ (WebCore::InspectorDOMAgent::performSearch):
+ (WebCore::InspectorDOMAgent::getSearchResults):
+ (WebCore::InspectorDOMAgent::discardSearchResults):
+ (WebCore::InspectorDOMAgent::inspect):
+ (WebCore::InspectorDOMAgent::setSearchingForNode):
+ (WebCore::InspectorDOMAgent::highlightConfigFromInspectorObject):
+ (WebCore::InspectorDOMAgent::setInspectModeEnabled):
+ (WebCore::InspectorDOMAgent::highlightRect):
+ (WebCore::InspectorDOMAgent::highlightQuad):
+ (WebCore::InspectorDOMAgent::highlightNode):
+ (WebCore::InspectorDOMAgent::highlightFrame):
+ (WebCore::InspectorDOMAgent::hideHighlight):
+ (WebCore::InspectorDOMAgent::moveTo):
+ (WebCore::InspectorDOMAgent::undo):
+ (WebCore::InspectorDOMAgent::redo):
+ (WebCore::InspectorDOMAgent::markUndoableState):
+ (WebCore::InspectorDOMAgent::focus):
+ (WebCore::InspectorDOMAgent::resolveNode):
+ (WebCore::InspectorDOMAgent::getAttributes):
+ (WebCore::InspectorDOMAgent::requestNode):
+ (WebCore::InspectorDOMAgent::pushNodeByPathToFrontend):
+ (WebCore::InspectorDOMAgent::pushNodeByBackendIdToFrontend):
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDOMDebuggerAgent.cpp:
+ (WebCore::InspectorDOMDebuggerAgent::setEventListenerBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::setInstrumentationBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::setBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::removeEventListenerBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::removeInstrumentationBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::removeBreakpoint):
+ (WebCore::domTypeForName):
+ (WebCore::InspectorDOMDebuggerAgent::setDOMBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::removeDOMBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::setXHRBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::removeXHRBreakpoint):
+ (WebCore::InspectorDOMDebuggerAgent::willSendXMLHttpRequest):
+ * inspector/InspectorDOMDebuggerAgent.h:
+ * inspector/InspectorDOMStorageAgent.cpp:
+ (WebCore::InspectorDOMStorageAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorDOMStorageAgent::enable):
+ (WebCore::InspectorDOMStorageAgent::disable):
+ (WebCore::InspectorDOMStorageAgent::getDOMStorageItems):
+ (WebCore::InspectorDOMStorageAgent::setDOMStorageItem):
+ (WebCore::InspectorDOMStorageAgent::removeDOMStorageItem):
+ (WebCore::InspectorDOMStorageAgent::findStorageArea):
+ * inspector/InspectorDOMStorageAgent.h:
+ * inspector/InspectorDatabaseAgent.cpp:
+ (WebCore::InspectorDatabaseAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorDatabaseAgent::enable):
+ (WebCore::InspectorDatabaseAgent::disable):
+ (WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
+ (WebCore::InspectorDatabaseAgent::executeSQL):
+ * inspector/InspectorDatabaseAgent.h:
+ * inspector/InspectorIndexedDBAgent.cpp:
+ (WebCore::InspectorIndexedDBAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorIndexedDBAgent::enable):
+ (WebCore::InspectorIndexedDBAgent::disable):
+ (WebCore::assertDocument):
+ (WebCore::assertIDBFactory):
+ (WebCore::InspectorIndexedDBAgent::requestDatabaseNames):
+ (WebCore::InspectorIndexedDBAgent::requestDatabase):
+ (WebCore::InspectorIndexedDBAgent::requestData):
+ (WebCore::InspectorIndexedDBAgent::clearObjectStore):
+ * inspector/InspectorIndexedDBAgent.h:
+ * inspector/InspectorLayerTreeAgent.cpp:
+ (WebCore::InspectorLayerTreeAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorLayerTreeAgent::enable):
+ (WebCore::InspectorLayerTreeAgent::disable):
+ (WebCore::InspectorLayerTreeAgent::layersForNode):
+ (WebCore::InspectorLayerTreeAgent::gatherLayersUsingRenderObjectHierarchy):
+ (WebCore::InspectorLayerTreeAgent::gatherLayersUsingRenderLayerHierarchy):
+ (WebCore::InspectorLayerTreeAgent::buildObjectForLayer):
+ (WebCore::InspectorLayerTreeAgent::idForNode):
+ (WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer):
+ * inspector/InspectorLayerTreeAgent.h:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::cachedResourceContent):
+ (WebCore::InspectorPageAgent::resourceContent):
+ (WebCore::InspectorPageAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorPageAgent::enable):
+ (WebCore::InspectorPageAgent::disable):
+ (WebCore::InspectorPageAgent::addScriptToEvaluateOnLoad):
+ (WebCore::InspectorPageAgent::removeScriptToEvaluateOnLoad):
+ (WebCore::InspectorPageAgent::reload):
+ (WebCore::InspectorPageAgent::navigate):
+ (WebCore::InspectorPageAgent::getCookies):
+ (WebCore::InspectorPageAgent::deleteCookie):
+ (WebCore::InspectorPageAgent::getResourceTree):
+ (WebCore::InspectorPageAgent::getResourceContent):
+ (WebCore::InspectorPageAgent::searchInResource):
+ (WebCore::InspectorPageAgent::searchInResources):
+ (WebCore::InspectorPageAgent::setDocumentContent):
+ (WebCore::InspectorPageAgent::setShowPaintRects):
+ (WebCore::InspectorPageAgent::canShowDebugBorders):
+ (WebCore::InspectorPageAgent::setShowDebugBorders):
+ (WebCore::InspectorPageAgent::canShowFPSCounter):
+ (WebCore::InspectorPageAgent::setShowFPSCounter):
+ (WebCore::InspectorPageAgent::canContinuouslyPaint):
+ (WebCore::InspectorPageAgent::setContinuousPaintingEnabled):
+ (WebCore::InspectorPageAgent::getScriptExecutionStatus):
+ (WebCore::InspectorPageAgent::setScriptExecutionDisabled):
+ (WebCore::InspectorPageAgent::assertFrame):
+ (WebCore::InspectorPageAgent::assertDocumentLoader):
+ (WebCore::InspectorPageAgent::setTouchEmulationEnabled):
+ (WebCore::InspectorPageAgent::setEmulatedMedia):
+ (WebCore::InspectorPageAgent::getCompositingBordersVisible):
+ (WebCore::InspectorPageAgent::setCompositingBordersVisible):
+ (WebCore::InspectorPageAgent::snapshotNode):
+ (WebCore::InspectorPageAgent::snapshotRect):
+ (WebCore::InspectorPageAgent::handleJavaScriptDialog):
+ (WebCore::InspectorPageAgent::archive):
+ * inspector/InspectorPageAgent.h:
+ * inspector/InspectorReplayAgent.cpp:
+ (WebCore::InspectorReplayAgent::startCapturing):
+ (WebCore::InspectorReplayAgent::stopCapturing):
+ (WebCore::InspectorReplayAgent::replayToPosition):
+ (WebCore::InspectorReplayAgent::replayToCompletion):
+ (WebCore::InspectorReplayAgent::pausePlayback):
+ (WebCore::InspectorReplayAgent::cancelPlayback):
+ (WebCore::InspectorReplayAgent::switchSession):
+ (WebCore::InspectorReplayAgent::insertSessionSegment):
+ (WebCore::InspectorReplayAgent::removeSessionSegment):
+ (WebCore::InspectorReplayAgent::findSession):
+ (WebCore::InspectorReplayAgent::findSegment):
+ (WebCore::InspectorReplayAgent::currentReplayState):
+ (WebCore::InspectorReplayAgent::getAvailableSessions):
+ (WebCore::InspectorReplayAgent::getSessionData):
+ (WebCore::InspectorReplayAgent::getSegmentData):
+ * inspector/InspectorReplayAgent.h:
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorResourceAgent::~InspectorResourceAgent):
+ (WebCore::InspectorResourceAgent::enable):
+ (WebCore::InspectorResourceAgent::disable):
+ (WebCore::InspectorResourceAgent::setExtraHTTPHeaders):
+ (WebCore::InspectorResourceAgent::getResponseBody):
+ (WebCore::InspectorResourceAgent::replayXHR):
+ (WebCore::InspectorResourceAgent::canClearBrowserCache):
+ (WebCore::InspectorResourceAgent::clearBrowserCache):
+ (WebCore::InspectorResourceAgent::canClearBrowserCookies):
+ (WebCore::InspectorResourceAgent::clearBrowserCookies):
+ (WebCore::InspectorResourceAgent::setCacheDisabled):
+ (WebCore::InspectorResourceAgent::loadResource):
+ * inspector/InspectorResourceAgent.h:
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyleSheet::resourceStyleSheetText):
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorTimelineAgent::start):
+ (WebCore::InspectorTimelineAgent::stop):
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/InspectorWorkerAgent.cpp:
+ (WebCore::InspectorWorkerAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorWorkerAgent::enable):
+ (WebCore::InspectorWorkerAgent::disable):
+ (WebCore::InspectorWorkerAgent::canInspectWorkers):
+ (WebCore::InspectorWorkerAgent::connectToWorker):
+ (WebCore::InspectorWorkerAgent::disconnectFromWorker):
+ (WebCore::InspectorWorkerAgent::sendMessageToWorker):
+ (WebCore::InspectorWorkerAgent::setAutoconnectToWorkers):
+ * inspector/InspectorWorkerAgent.h:
+ * inspector/PageConsoleAgent.cpp:
+ (WebCore::PageConsoleAgent::clearMessages):
+ (WebCore::PageConsoleAgent::addInspectedNode):
+ * inspector/PageConsoleAgent.h:
+ * inspector/PageDebuggerAgent.cpp:
+ (WebCore::PageDebuggerAgent::injectedScriptForEval):
+ (WebCore::PageDebuggerAgent::setOverlayMessage):
+ * inspector/PageDebuggerAgent.h:
+ * inspector/PageRuntimeAgent.cpp:
+ (WebCore::PageRuntimeAgent::willDestroyFrontendAndBackend):
+ (WebCore::PageRuntimeAgent::enable):
+ (WebCore::PageRuntimeAgent::disable):
+ (WebCore::PageRuntimeAgent::injectedScriptForEval):
+ * inspector/PageRuntimeAgent.h:
+ * inspector/WebConsoleAgent.cpp:
+ (WebCore::WebConsoleAgent::setMonitoringXHREnabled):
+ * inspector/WebConsoleAgent.h:
+ * inspector/WorkerConsoleAgent.cpp:
+ (WebCore::WorkerConsoleAgent::addInspectedNode):
+ * inspector/WorkerConsoleAgent.h:
+ * inspector/WorkerDebuggerAgent.cpp:
+ (WebCore::WorkerDebuggerAgent::injectedScriptForEval):
+ * inspector/WorkerDebuggerAgent.h:
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::resume):
+ * inspector/WorkerRuntimeAgent.cpp:
+ (WebCore::WorkerRuntimeAgent::injectedScriptForEval):
+ (WebCore::WorkerRuntimeAgent::run):
+ * inspector/WorkerRuntimeAgent.h:
+
</ins><span class="cx"> 2014-09-30 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Stack overflow with enormous SVG filter
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorCommandLineAPIHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/CommandLineAPIHost.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -114,8 +114,8 @@
</span><span class="cx"> void CommandLineAPIHost::clearConsoleMessages()
</span><span class="cx"> {
</span><span class="cx"> if (m_consoleAgent) {
</span><del>- ErrorString error;
- m_consoleAgent->clearMessages(&error);
</del><ins>+ ErrorString unused;
+ m_consoleAgent->clearMessages(unused);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorDOMEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/DOMEditor.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/DOMEditor.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/DOMEditor.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -396,15 +396,15 @@
</span><span class="cx"> return m_history->perform(std::make_unique<SetNodeValueAction>(node, value), ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void populateErrorString(const ExceptionCode& ec, ErrorString* errorString)
</del><ins>+static void populateErrorString(const ExceptionCode& ec, ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (ec) {
</span><span class="cx"> ExceptionCodeDescription description(ec);
</span><del>- *errorString = description.name;
</del><ins>+ errorString = description.name;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMEditor::insertBefore(Node* parentNode, PassRefPtr<Node> node, Node* anchorNode, ErrorString* errorString)
</del><ins>+bool DOMEditor::insertBefore(Node* parentNode, PassRefPtr<Node> node, Node* anchorNode, ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> bool result = insertBefore(parentNode, node, anchorNode, ec);
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMEditor::removeChild(Node* parentNode, Node* node, ErrorString* errorString)
</del><ins>+bool DOMEditor::removeChild(Node* parentNode, Node* node, ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> bool result = removeChild(parentNode, node, ec);
</span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMEditor::setAttribute(Element* element, const String& name, const String& value, ErrorString* errorString)
</del><ins>+bool DOMEditor::setAttribute(Element* element, const String& name, const String& value, ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> bool result = setAttribute(element, name, value, ec);
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMEditor::removeAttribute(Element* element, const String& name, ErrorString* errorString)
</del><ins>+bool DOMEditor::removeAttribute(Element* element, const String& name, ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> bool result = removeAttribute(element, name, ec);
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMEditor::setOuterHTML(Node& node, const String& html, Node** newNode, ErrorString* errorString)
</del><ins>+bool DOMEditor::setOuterHTML(Node& node, const String& html, Node** newNode, ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> bool result = setOuterHTML(node, html, newNode, ec);
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ErrorString* errorString)
</del><ins>+bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> bool result = replaceWholeText(textNode, text, ec);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorDOMEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/DOMEditor.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/DOMEditor.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/DOMEditor.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -61,12 +61,12 @@
</span><span class="cx"> bool replaceChild(Node* parentNode, PassRefPtr<Node> newNode, Node* oldNode, ExceptionCode&);
</span><span class="cx"> bool setNodeValue(Node* parentNode, const String& value, ExceptionCode&);
</span><span class="cx">
</span><del>- bool insertBefore(Node* parentNode, PassRefPtr<Node>, Node* anchorNode, ErrorString*);
- bool removeChild(Node* parentNode, Node*, ErrorString*);
- bool setAttribute(Element*, const String& name, const String& value, ErrorString*);
- bool removeAttribute(Element*, const String& name, ErrorString*);
- bool setOuterHTML(Node&, const String& html, Node** newNode, ErrorString*);
- bool replaceWholeText(Text*, const String& text, ErrorString*);
</del><ins>+ bool insertBefore(Node* parentNode, PassRefPtr<Node>, Node* anchorNode, ErrorString&);
+ bool removeChild(Node* parentNode, Node*, ErrorString&);
+ bool setAttribute(Element*, const String& name, const String& value, ErrorString&);
+ bool removeAttribute(Element*, const String& name, ErrorString&);
+ bool setOuterHTML(Node&, const String& html, Node** newNode, ErrorString&);
+ bool replaceWholeText(Text*, const String& text, ErrorString&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> class DOMAction;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> m_instrumentingAgents->setInspectorApplicationCacheAgent(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorApplicationCacheAgent::enable(ErrorString*)
</del><ins>+void InspectorApplicationCacheAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_instrumentingAgents->setInspectorApplicationCacheAgent(this);
</span><span class="cx">
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> m_frontendDispatcher->networkStateUpdated(isNowOnline);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>>& result)
</del><ins>+void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>>& result)
</ins><span class="cx"> {
</span><span class="cx"> result = Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>::create();
</span><span class="cx">
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DocumentLoader* InspectorApplicationCacheAgent::assertFrameWithDocumentLoader(ErrorString* errorString, String frameId)
</del><ins>+DocumentLoader* InspectorApplicationCacheAgent::assertFrameWithDocumentLoader(ErrorString& errorString, String frameId)
</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">@@ -126,7 +126,7 @@
</span><span class="cx"> return InspectorPageAgent::assertDocumentLoader(errorString, frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorApplicationCacheAgent::getManifestForFrame(ErrorString* errorString, const String& frameId, String* manifestURL)
</del><ins>+void InspectorApplicationCacheAgent::getManifestForFrame(ErrorString& errorString, const String& frameId, String* manifestURL)
</ins><span class="cx"> {
</span><span class="cx"> DocumentLoader* documentLoader = assertFrameWithDocumentLoader(errorString, frameId);
</span><span class="cx"> if (!documentLoader)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> *manifestURL = info.m_manifest.string();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* errorString, const String& frameId, RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache>& applicationCache)
</del><ins>+void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString& errorString, const String& frameId, RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache>& applicationCache)
</ins><span class="cx"> {
</span><span class="cx"> DocumentLoader* documentLoader = assertFrameWithDocumentLoader(errorString, frameId);
</span><span class="cx"> if (!documentLoader)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -61,17 +61,17 @@
</span><span class="cx"> void updateApplicationCacheStatus(Frame*);
</span><span class="cx"> void networkStateChanged();
</span><span class="cx">
</span><del>- virtual void enable(ErrorString*) override;
- virtual void getFramesWithManifests(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>>& result) override;
- virtual void getManifestForFrame(ErrorString*, const String& frameId, String* manifestURL) override;
- virtual void getApplicationCacheForFrame(ErrorString*, const String& frameId, RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache>&) override;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void getFramesWithManifests(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::FrameWithManifest>>& result) override;
+ virtual void getManifestForFrame(ErrorString&, const String& frameId, String* manifestURL) override;
+ virtual void getApplicationCacheForFrame(ErrorString&, const String& frameId, RefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache>&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCache> buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList&, const ApplicationCacheHost::CacheInfo&);
</span><span class="cx"> PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::ApplicationCache::ApplicationCacheResource>> buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList&);
</span><span class="cx"> PassRefPtr<Inspector::Protocol::ApplicationCache::ApplicationCacheResource> buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo&);
</span><span class="cx">
</span><del>- DocumentLoader* assertFrameWithDocumentLoader(ErrorString*, String frameId);
</del><ins>+ DocumentLoader* assertFrameWithDocumentLoader(ErrorString&, String frameId);
</ins><span class="cx">
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> std::unique_ptr<Inspector::InspectorApplicationCacheFrontendDispatcher> m_frontendDispatcher;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -485,12 +485,12 @@
</span><span class="cx"> resetPseudoStates();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::enable(ErrorString*)
</del><ins>+void InspectorCSSAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_instrumentingAgents->setInspectorCSSAgent(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::disable(ErrorString*)
</del><ins>+void InspectorCSSAgent::disable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_instrumentingAgents->setInspectorCSSAgent(nullptr);
</span><span class="cx"> }
</span><span class="lines">@@ -507,8 +507,8 @@
</span><span class="cx"> if (!documentNodeId)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ErrorString errorString;
- m_frontendDispatcher->namedFlowCreated(buildObjectForNamedFlow(&errorString, namedFlow, documentNodeId));
</del><ins>+ ErrorString unused;
+ m_frontendDispatcher->namedFlowCreated(buildObjectForNamedFlow(unused, namedFlow, documentNodeId));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorCSSAgent::willRemoveNamedFlow(Document* document, WebKitNamedFlow* namedFlow)
</span><span class="lines">@@ -539,10 +539,10 @@
</span><span class="cx"> if (namedFlow->flowState() == WebKitNamedFlow::FlowStateNull)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ErrorString errorString;
</del><ins>+ ErrorString unused;
</ins><span class="cx"> Ref<WebKitNamedFlow> protect(*namedFlow);
</span><span class="cx">
</span><del>- m_frontendDispatcher->regionOversetChanged(buildObjectForNamedFlow(&errorString, namedFlow, documentNodeId));
</del><ins>+ m_frontendDispatcher->regionOversetChanged(buildObjectForNamedFlow(unused, namedFlow, documentNodeId));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorCSSAgent::didRegisterNamedFlowContentElement(Document* document, WebKitNamedFlow* namedFlow, Node* contentElement, Node* nextContentElement)
</span><span class="lines">@@ -551,9 +551,9 @@
</span><span class="cx"> if (!documentNodeId)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ErrorString errorString;
- int contentElementNodeId = m_domAgent->pushNodeToFrontend(&errorString, documentNodeId, contentElement);
- int nextContentElementNodeId = nextContentElement ? m_domAgent->pushNodeToFrontend(&errorString, documentNodeId, nextContentElement) : 0;
</del><ins>+ ErrorString unused;
+ int contentElementNodeId = m_domAgent->pushNodeToFrontend(unused, documentNodeId, contentElement);
+ int nextContentElementNodeId = nextContentElement ? m_domAgent->pushNodeToFrontend(unused, documentNodeId, nextContentElement) : 0;
</ins><span class="cx"> m_frontendDispatcher->registeredNamedFlowContentElement(documentNodeId, namedFlow->name().string(), contentElementNodeId, nextContentElementNodeId);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -563,8 +563,8 @@
</span><span class="cx"> if (!documentNodeId)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ErrorString errorString;
- int contentElementNodeId = m_domAgent->pushNodeToFrontend(&errorString, documentNodeId, contentElement);
</del><ins>+ ErrorString unused;
+ int contentElementNodeId = m_domAgent->pushNodeToFrontend(unused, documentNodeId, contentElement);
</ins><span class="cx"> if (!contentElementNodeId) {
</span><span class="cx"> // We've already notified that the DOM node was removed from the DOM, so there's no need to send another event.
</span><span class="cx"> return;
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getMatchedStylesForNode(ErrorString* errorString, int nodeId, const bool* includePseudo, const bool* includeInherited, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>>& pseudoIdMatches, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>>& inheritedEntries)
</del><ins>+void InspectorCSSAgent::getMatchedStylesForNode(ErrorString& errorString, int nodeId, const bool* includePseudo, const bool* includeInherited, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>>& pseudoIdMatches, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>>& inheritedEntries)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = elementForId(errorString, nodeId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -650,7 +650,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getInlineStylesForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::Protocol::CSS::CSSStyle>& attributesStyle)
</del><ins>+void InspectorCSSAgent::getInlineStylesForNode(ErrorString& errorString, int nodeId, RefPtr<Inspector::Protocol::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::Protocol::CSS::CSSStyle>& attributesStyle)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = elementForId(errorString, nodeId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -665,7 +665,7 @@
</span><span class="cx"> attributesStyle = attributes ? attributes.release() : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getComputedStyleForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>>& style)
</del><ins>+void InspectorCSSAgent::getComputedStyleForNode(ErrorString& errorString, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>>& style)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = elementForId(errorString, nodeId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -676,7 +676,7 @@
</span><span class="cx"> style = inspectorStyle->buildArrayForComputedStyle();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getAllStyleSheets(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>>& styleInfos)
</del><ins>+void InspectorCSSAgent::getAllStyleSheets(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>>& styleInfos)
</ins><span class="cx"> {
</span><span class="cx"> styleInfos = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>::create();
</span><span class="cx"> Vector<Document*> documents = m_domAgent->documents();
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getStyleSheet(ErrorString* errorString, const String& styleSheetId, RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody>& styleSheetObject)
</del><ins>+void InspectorCSSAgent::getStyleSheet(ErrorString& errorString, const String& styleSheetId, RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody>& styleSheetObject)
</ins><span class="cx"> {
</span><span class="cx"> InspectorStyleSheet* inspectorStyleSheet = assertStyleSheetForId(errorString, styleSheetId);
</span><span class="cx"> if (!inspectorStyleSheet)
</span><span class="lines">@@ -699,7 +699,7 @@
</span><span class="cx"> styleSheetObject = inspectorStyleSheet->buildObjectForStyleSheet();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getStyleSheetText(ErrorString* errorString, const String& styleSheetId, String* result)
</del><ins>+void InspectorCSSAgent::getStyleSheetText(ErrorString& errorString, const String& styleSheetId, String* result)
</ins><span class="cx"> {
</span><span class="cx"> InspectorStyleSheet* inspectorStyleSheet = assertStyleSheetForId(errorString, styleSheetId);
</span><span class="cx"> if (!inspectorStyleSheet)
</span><span class="lines">@@ -708,7 +708,7 @@
</span><span class="cx"> inspectorStyleSheet->getText(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::setStyleSheetText(ErrorString* errorString, const String& styleSheetId, const String& text)
</del><ins>+void InspectorCSSAgent::setStyleSheetText(ErrorString& errorString, const String& styleSheetId, const String& text)
</ins><span class="cx"> {
</span><span class="cx"> InspectorStyleSheet* inspectorStyleSheet = assertStyleSheetForId(errorString, styleSheetId);
</span><span class="cx"> if (!inspectorStyleSheet)
</span><span class="lines">@@ -716,10 +716,10 @@
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> m_domAgent->history()->perform(std::make_unique<SetStyleSheetTextAction>(inspectorStyleSheet, text), ec);
</span><del>- *errorString = InspectorDOMAgent::toErrorString(ec);
</del><ins>+ errorString = InspectorDOMAgent::toErrorString(ec);
</ins><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><span class="cx"> InspectorCSSId compoundId(fullStyleId);
</span><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="lines">@@ -732,10 +732,10 @@
</span><span class="cx"> bool success = m_domAgent->history()->perform(std::make_unique<SetStyleTextAction>(inspectorStyleSheet, compoundId, text), ec);
</span><span class="cx"> if (success)
</span><span class="cx"> result = inspectorStyleSheet->buildObjectForStyle(inspectorStyleSheet->styleForId(compoundId));
</span><del>- *errorString = InspectorDOMAgent::toErrorString(ec);
</del><ins>+ errorString = InspectorDOMAgent::toErrorString(ec);
</ins><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><span class="cx"> InspectorCSSId compoundId(fullStyleId);
</span><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="lines">@@ -748,10 +748,10 @@
</span><span class="cx"> bool success = m_domAgent->history()->perform(std::make_unique<SetPropertyTextAction>(inspectorStyleSheet, compoundId, propertyIndex, text, overwrite), ec);
</span><span class="cx"> if (success)
</span><span class="cx"> result = inspectorStyleSheet->buildObjectForStyle(inspectorStyleSheet->styleForId(compoundId));
</span><del>- *errorString = InspectorDOMAgent::toErrorString(ec);
</del><ins>+ errorString = InspectorDOMAgent::toErrorString(ec);
</ins><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><span class="cx"> InspectorCSSId compoundId(fullStyleId);
</span><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="lines">@@ -764,10 +764,10 @@
</span><span class="cx"> bool success = m_domAgent->history()->perform(std::make_unique<TogglePropertyAction>(inspectorStyleSheet, compoundId, propertyIndex, disable), ec);
</span><span class="cx"> if (success)
</span><span class="cx"> result = inspectorStyleSheet->buildObjectForStyle(inspectorStyleSheet->styleForId(compoundId));
</span><del>- *errorString = InspectorDOMAgent::toErrorString(ec);
</del><ins>+ errorString = InspectorDOMAgent::toErrorString(ec);
</ins><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><span class="cx"> InspectorCSSId compoundId(fullRuleId);
</span><span class="cx"> ASSERT(!compoundId.isEmpty());
</span><span class="lines">@@ -781,10 +781,10 @@
</span><span class="cx">
</span><span class="cx"> if (success)
</span><span class="cx"> result = inspectorStyleSheet->buildObjectForRule(inspectorStyleSheet->ruleForId(compoundId));
</span><del>- *errorString = InspectorDOMAgent::toErrorString(ec);
</del><ins>+ errorString = InspectorDOMAgent::toErrorString(ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::addRule(ErrorString* errorString, const int contextNodeId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result)
</del><ins>+void InspectorCSSAgent::addRule(ErrorString& errorString, const int contextNodeId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = m_domAgent->assertNode(errorString, contextNodeId);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -792,7 +792,7 @@
</span><span class="cx">
</span><span class="cx"> InspectorStyleSheet* inspectorStyleSheet = viaInspectorStyleSheet(&node->document(), true);
</span><span class="cx"> if (!inspectorStyleSheet) {
</span><del>- *errorString = "No target stylesheet found";
</del><ins>+ errorString = ASCIILiteral("No target stylesheet found");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -801,7 +801,7 @@
</span><span class="cx"> AddRuleAction* rawAction = action.get();
</span><span class="cx"> bool success = m_domAgent->history()->perform(WTF::move(action), ec);
</span><span class="cx"> if (!success) {
</span><del>- *errorString = InspectorDOMAgent::toErrorString(ec);
</del><ins>+ errorString = InspectorDOMAgent::toErrorString(ec);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -810,7 +810,7 @@
</span><span class="cx"> result = inspectorStyleSheet->buildObjectForRule(rule);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getSupportedCSSProperties(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>>& cssProperties)
</del><ins>+void InspectorCSSAgent::getSupportedCSSProperties(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>>& cssProperties)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>> properties = Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>::create();
</span><span class="cx"> for (int i = firstCSSProperty; i <= lastCSSProperty; ++i) {
</span><span class="lines">@@ -834,7 +834,7 @@
</span><span class="cx"> cssProperties = properties.release();
</span><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">@@ -854,7 +854,7 @@
</span><span class="cx"> element->document().styleResolverChanged(RecalcStyleImmediately);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorCSSAgent::getNamedFlowCollection(ErrorString* errorString, int documentNodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>>& result)
</del><ins>+void InspectorCSSAgent::getNamedFlowCollection(ErrorString& errorString, int documentNodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>>& result)
</ins><span class="cx"> {
</span><span class="cx"> Document* document = m_domAgent->assertDocument(errorString, documentNodeId);
</span><span class="cx"> if (!document)
</span><span class="lines">@@ -889,15 +889,15 @@
</span><span class="cx"> return it->value.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Element* InspectorCSSAgent::elementForId(ErrorString* errorString, int nodeId)
</del><ins>+Element* InspectorCSSAgent::elementForId(ErrorString& errorString, int nodeId)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = m_domAgent->nodeForId(nodeId);
</span><span class="cx"> if (!node) {
</span><del>- *errorString = "No node with given id found";
</del><ins>+ errorString = ASCIILiteral("No node with given id found");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> if (!is<Element>(node)) {
</span><del>- *errorString = "Not an element node";
</del><ins>+ errorString = ASCIILiteral("Not an element node");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> return downcast<Element>(node);
</span><span class="lines">@@ -990,11 +990,11 @@
</span><span class="cx"> return inspectorStyleSheet.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorStyleSheet* InspectorCSSAgent::assertStyleSheetForId(ErrorString* errorString, const String& styleSheetId)
</del><ins>+InspectorStyleSheet* InspectorCSSAgent::assertStyleSheetForId(ErrorString& errorString, const String& styleSheetId)
</ins><span class="cx"> {
</span><span class="cx"> IdToInspectorStyleSheet::iterator it = m_idToInspectorStyleSheet.find(styleSheetId);
</span><span class="cx"> if (it == m_idToInspectorStyleSheet.end()) {
</span><del>- *errorString = "No style sheet with given id found";
</del><ins>+ errorString = ASCIILiteral("No style sheet with given id found");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> return it->value.get();
</span><span class="lines">@@ -1101,7 +1101,7 @@
</span><span class="cx"> return inspectorStyle->buildObjectForStyle();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> InspectorCSSAgent::buildArrayForRegions(ErrorString* errorString, PassRefPtr<NodeList> regionList, int documentNodeId)
</del><ins>+PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> InspectorCSSAgent::buildArrayForRegions(ErrorString& errorString, PassRefPtr<NodeList> regionList, int documentNodeId)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> regions = Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>::create();
</span><span class="cx">
</span><span class="lines">@@ -1136,7 +1136,7 @@
</span><span class="cx"> return regions.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<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><span class="cx"> RefPtr<Inspector::Protocol::Array<int>> content = Inspector::Protocol::Array<int>::create();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -98,8 +98,8 @@
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</span><span class="cx"> virtual void discardAgent() override;
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
</ins><span class="cx"> void reset();
</span><span class="cx"> void mediaQueryResultChanged();
</span><span class="cx"> void didCreateNamedFlow(Document*, WebKitNamedFlow*);
</span><span class="lines">@@ -109,21 +109,21 @@
</span><span class="cx"> void didRegisterNamedFlowContentElement(Document*, WebKitNamedFlow*, Node* contentElement, Node* nextContentElement = nullptr);
</span><span class="cx"> void didUnregisterNamedFlowContentElement(Document*, WebKitNamedFlow*, Node* contentElement);
</span><span class="cx">
</span><del>- virtual void getComputedStyleForNode(ErrorString*, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>>&) override;
- virtual void getInlineStylesForNode(ErrorString*, int nodeId, RefPtr<Inspector::Protocol::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::Protocol::CSS::CSSStyle>& attributes) override;
- virtual void getMatchedStylesForNode(ErrorString*, int nodeId, const bool* includePseudo, const bool* includeInherited, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>>& pseudoIdMatches, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>>& inheritedEntries) override;
- virtual void getAllStyleSheets(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>>& styleSheetInfos) override;
- virtual void getStyleSheet(ErrorString*, const String& styleSheetId, RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody>& result) override;
- virtual void getStyleSheetText(ErrorString*, const String& styleSheetId, String* result) override;
- virtual void setStyleSheetText(ErrorString*, const String& styleSheetId, const String& text) override;
- virtual void setStyleText(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, const String& text, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
- virtual void setPropertyText(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
- virtual void toggleProperty(ErrorString*, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, bool disable, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
- virtual void setRuleSelector(ErrorString*, const RefPtr<Inspector::InspectorObject>& ruleId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result) override;
- virtual void addRule(ErrorString*, int contextNodeId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result) override;
- virtual void getSupportedCSSProperties(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>>& result) override;
- virtual void forcePseudoState(ErrorString*, int nodeId, const RefPtr<Inspector::InspectorArray>& forcedPseudoClasses) override;
- virtual void getNamedFlowCollection(ErrorString*, int documentNodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>>& result) override;
</del><ins>+ virtual void getComputedStyleForNode(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSComputedStyleProperty>>&) override;
+ virtual void getInlineStylesForNode(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::CSS::CSSStyle>& inlineStyle, RefPtr<Inspector::Protocol::CSS::CSSStyle>& attributes) override;
+ virtual void getMatchedStylesForNode(ErrorString&, int nodeId, const bool* includePseudo, const bool* includeInherited, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>>& matchedCSSRules, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::PseudoIdMatches>>& pseudoIdMatches, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>>& inheritedEntries) override;
+ virtual void getAllStyleSheets(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>>& styleSheetInfos) override;
+ virtual void getStyleSheet(ErrorString&, const String& styleSheetId, RefPtr<Inspector::Protocol::CSS::CSSStyleSheetBody>& result) override;
+ virtual void getStyleSheetText(ErrorString&, const String& styleSheetId, String* result) override;
+ virtual void setStyleSheetText(ErrorString&, const String& styleSheetId, const String& text) override;
+ virtual void setStyleText(ErrorString&, const RefPtr<Inspector::InspectorObject>& styleId, const String& text, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
+ virtual void setPropertyText(ErrorString&, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, const String& text, bool overwrite, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
+ virtual void toggleProperty(ErrorString&, const RefPtr<Inspector::InspectorObject>& styleId, int propertyIndex, bool disable, RefPtr<Inspector::Protocol::CSS::CSSStyle>& result) override;
+ virtual void setRuleSelector(ErrorString&, const RefPtr<Inspector::InspectorObject>& ruleId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result) override;
+ virtual void addRule(ErrorString&, int contextNodeId, const String& selector, RefPtr<Inspector::Protocol::CSS::CSSRule>& result) override;
+ virtual void getSupportedCSSProperties(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSPropertyInfo>>& result) override;
+ virtual void forcePseudoState(ErrorString&, int nodeId, const RefPtr<Inspector::InspectorArray>& forcedPseudoClasses) override;
+ virtual void getNamedFlowCollection(ErrorString&, int documentNodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::NamedFlow>>& result) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> class StyleSheetAction;
</span><span class="lines">@@ -142,13 +142,13 @@
</span><span class="cx">
</span><span class="cx"> void resetNonPersistentData();
</span><span class="cx"> InspectorStyleSheetForInlineStyle* asInspectorStyleSheet(Element* element);
</span><del>- Element* elementForId(ErrorString*, int nodeId);
</del><ins>+ Element* elementForId(ErrorString&, int nodeId);
</ins><span class="cx"> int documentNodeWithRequestedFlowsId(Document*);
</span><span class="cx"> void collectStyleSheets(CSSStyleSheet*, Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSStyleSheetHeader>*);
</span><span class="cx">
</span><span class="cx"> InspectorStyleSheet* bindStyleSheet(CSSStyleSheet*);
</span><span class="cx"> InspectorStyleSheet* viaInspectorStyleSheet(Document*, bool createIfAbsent);
</span><del>- InspectorStyleSheet* assertStyleSheetForId(ErrorString*, const String&);
</del><ins>+ InspectorStyleSheet* assertStyleSheetForId(ErrorString&, const String&);
</ins><span class="cx"> Inspector::Protocol::CSS::StyleSheetOrigin detectOrigin(CSSStyleSheet* pageStyleSheet, Document* ownerDocument);
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Inspector::Protocol::CSS::CSSRule> buildObjectForRule(StyleRule*, StyleResolver&);
</span><span class="lines">@@ -156,8 +156,8 @@
</span><span class="cx"> PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::CSSRule>> buildArrayForRuleList(CSSRuleList*);
</span><span class="cx"> PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::RuleMatch>> buildArrayForMatchedRuleList(const Vector<RefPtr<StyleRule>>&, StyleResolver&, Element*);
</span><span class="cx"> PassRefPtr<Inspector::Protocol::CSS::CSSStyle> buildObjectForAttributesStyle(Element*);
</span><del>- PassRefPtr<Inspector::Protocol::Array<Inspector::Protocol::CSS::Region>> buildArrayForRegions(ErrorString*, PassRefPtr<NodeList>, int documentNodeId);
- PassRefPtr<Inspector::Protocol::CSS::NamedFlow> buildObjectForNamedFlow(ErrorString*, WebKitNamedFlow*, int documentNodeId);
</del><ins>+ 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="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -363,8 +363,8 @@
</span><span class="cx">
</span><span class="cx"> void InspectorController::hideHighlight()
</span><span class="cx"> {
</span><del>- ErrorString error;
- m_domAgent->hideHighlight(&error);
</del><ins>+ ErrorString unused;
+ m_domAgent->hideHighlight(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* InspectorController::highlightedNode() const
</span><span class="lines">@@ -391,20 +391,22 @@
</span><span class="cx">
</span><span class="cx"> void InspectorController::setProfilerEnabled(bool enable)
</span><span class="cx"> {
</span><ins>+ ErrorString unused;
+
</ins><span class="cx"> if (enable) {
</span><span class="cx"> m_instrumentingAgents->setPersistentInspectorTimelineAgent(m_timelineAgent);
</span><del>- m_timelineAgent->start();
</del><ins>+ m_timelineAgent->start(unused);
</ins><span class="cx"> } else {
</span><span class="cx"> m_instrumentingAgents->setPersistentInspectorTimelineAgent(nullptr);
</span><del>- m_timelineAgent->stop();
</del><ins>+ m_timelineAgent->stop(unused);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorController::resume()
</span><span class="cx"> {
</span><span class="cx"> if (m_debuggerAgent) {
</span><del>- ErrorString error;
- m_debuggerAgent->resume(&error);
</del><ins>+ ErrorString unused;
+ m_debuggerAgent->resume(unused);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -251,9 +251,9 @@
</span><span class="cx"> m_history.reset();
</span><span class="cx"> m_domEditor.reset();
</span><span class="cx">
</span><del>- ErrorString error;
- setSearchingForNode(&error, false, 0);
- hideHighlight(&error);
</del><ins>+ ErrorString unused;
+ setSearchingForNode(unused, false, 0);
+ hideHighlight(unused);
</ins><span class="cx">
</span><span class="cx"> m_instrumentingAgents->setInspectorDOMAgent(0);
</span><span class="cx"> m_documentRequested = false;
</span><span class="lines">@@ -360,70 +360,70 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Node* InspectorDOMAgent::assertNode(ErrorString* errorString, int nodeId)
</del><ins>+Node* InspectorDOMAgent::assertNode(ErrorString& errorString, int nodeId)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = nodeForId(nodeId);
</span><span class="cx"> if (!node) {
</span><del>- *errorString = "Could not find node with given id";
</del><ins>+ errorString = ASCIILiteral("Could not find node with given id");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> return node;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Document* InspectorDOMAgent::assertDocument(ErrorString* errorString, int nodeId)
</del><ins>+Document* InspectorDOMAgent::assertDocument(ErrorString& errorString, int nodeId)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (!is<Document>(node)) {
</span><del>- *errorString = "Document is not available";
</del><ins>+ errorString = ASCIILiteral("Document is not available");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> return downcast<Document>(node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Element* InspectorDOMAgent::assertElement(ErrorString* errorString, int nodeId)
</del><ins>+Element* InspectorDOMAgent::assertElement(ErrorString& errorString, int nodeId)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (!is<Element>(node)) {
</span><del>- *errorString = "Node is not an Element";
</del><ins>+ errorString = ASCIILiteral("Node is not an Element");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> return downcast<Element>(node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Node* InspectorDOMAgent::assertEditableNode(ErrorString* errorString, int nodeId)
</del><ins>+Node* InspectorDOMAgent::assertEditableNode(ErrorString& errorString, int nodeId)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (node->isInShadowTree()) {
</span><del>- *errorString = "Can not edit nodes from shadow trees";
</del><ins>+ errorString = ASCIILiteral("Can not edit nodes from shadow trees");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> return node;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Element* InspectorDOMAgent::assertEditableElement(ErrorString* errorString, int nodeId)
</del><ins>+Element* InspectorDOMAgent::assertEditableElement(ErrorString& errorString, int nodeId)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = assertElement(errorString, nodeId);
</span><span class="cx"> if (!element)
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (element->isInShadowTree()) {
</span><del>- *errorString = "Can not edit elements from shadow trees";
</del><ins>+ errorString = ASCIILiteral("Can not edit elements from shadow trees");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> return element;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::getDocument(ErrorString* errorString, RefPtr<Inspector::Protocol::DOM::Node>& root)
</del><ins>+void InspectorDOMAgent::getDocument(ErrorString& errorString, RefPtr<Inspector::Protocol::DOM::Node>& root)
</ins><span class="cx"> {
</span><span class="cx"> m_documentRequested = true;
</span><span class="cx">
</span><span class="cx"> if (!m_document) {
</span><del>- *errorString = "Document is not available";
</del><ins>+ errorString = ASCIILiteral("Document is not available");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -472,13 +472,13 @@
</span><span class="cx"> m_nodeGroupToBackendIdMap.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int InspectorDOMAgent::pushNodeToFrontend(ErrorString* errorString, int documentNodeId, Node* nodeToPush)
</del><ins>+int InspectorDOMAgent::pushNodeToFrontend(ErrorString& errorString, int documentNodeId, Node* nodeToPush)
</ins><span class="cx"> {
</span><span class="cx"> Document* document = assertDocument(errorString, documentNodeId);
</span><span class="cx"> if (!document)
</span><span class="cx"> return 0;
</span><span class="cx"> if (&nodeToPush->document() != document) {
</span><del>- *errorString = "Node is not part of the document with given id";
</del><ins>+ errorString = ASCIILiteral("Node is not part of the document with given id");
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::requestChildNodes(ErrorString* errorString, int nodeId, const int* depth)
</del><ins>+void InspectorDOMAgent::requestChildNodes(ErrorString& errorString, int nodeId, const int* depth)
</ins><span class="cx"> {
</span><span class="cx"> int sanitizedDepth;
</span><span class="cx">
</span><span class="lines">@@ -507,14 +507,14 @@
</span><span class="cx"> else if (*depth > 0)
</span><span class="cx"> sanitizedDepth = *depth;
</span><span class="cx"> else {
</span><del>- *errorString = "Please provide a positive integer as a depth or -1 for entire subtree";
</del><ins>+ errorString = ASCIILiteral("Please provide a positive integer as a depth or -1 for entire subtree");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pushChildNodesToFrontend(nodeId, sanitizedDepth);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::querySelector(ErrorString* errorString, int nodeId, const String& selectors, int* elementId)
</del><ins>+void InspectorDOMAgent::querySelector(ErrorString& errorString, int nodeId, const String& selectors, int* elementId)
</ins><span class="cx"> {
</span><span class="cx"> *elementId = 0;
</span><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="lines">@@ -528,7 +528,7 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> RefPtr<Element> element = downcast<ContainerNode>(*node).querySelector(selectors, ec);
</span><span class="cx"> if (ec) {
</span><del>- *errorString = "DOM Error while querying";
</del><ins>+ errorString = ASCIILiteral("DOM Error while querying");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -536,7 +536,7 @@
</span><span class="cx"> *elementId = pushNodePathToFrontend(element.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::querySelectorAll(ErrorString* errorString, int nodeId, const String& selectors, RefPtr<Inspector::Protocol::Array<int>>& result)
</del><ins>+void InspectorDOMAgent::querySelectorAll(ErrorString& errorString, int nodeId, const String& selectors, RefPtr<Inspector::Protocol::Array<int>>& result)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -549,7 +549,7 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> RefPtr<NodeList> nodes = downcast<ContainerNode>(*node).querySelectorAll(selectors, ec);
</span><span class="cx"> if (ec) {
</span><del>- *errorString = "DOM Error while querying";
</del><ins>+ errorString = ASCIILiteral("DOM Error while querying");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx"> return id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::releaseBackendNodeIds(ErrorString* errorString, const String& nodeGroup)
</del><ins>+void InspectorDOMAgent::releaseBackendNodeIds(ErrorString& errorString, const String& nodeGroup)
</ins><span class="cx"> {
</span><span class="cx"> if (m_nodeGroupToBackendIdMap.contains(nodeGroup)) {
</span><span class="cx"> NodeToBackendIdMap& map = m_nodeGroupToBackendIdMap.find(nodeGroup)->value;
</span><span class="lines">@@ -639,10 +639,10 @@
</span><span class="cx"> m_nodeGroupToBackendIdMap.remove(nodeGroup);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- *errorString = "Group name not found";
</del><ins>+ errorString = ASCIILiteral("Group name not found");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::setAttributeValue(ErrorString* errorString, int elementId, const String& name, const String& value)
</del><ins>+void InspectorDOMAgent::setAttributeValue(ErrorString& errorString, int elementId, const String& name, const String& value)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = assertEditableElement(errorString, elementId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> m_domEditor->setAttribute(element, name, value, errorString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::setAttributesAsText(ErrorString* errorString, int elementId, const String& text, const String* const name)
</del><ins>+void InspectorDOMAgent::setAttributesAsText(ErrorString& errorString, int elementId, const String& text, const String* const name)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = assertEditableElement(errorString, elementId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -661,13 +661,13 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> parsedElement.get()->setInnerHTML("<span " + text + "></span>", ec);
</span><span class="cx"> if (ec) {
</span><del>- *errorString = InspectorDOMAgent::toErrorString(ec);
</del><ins>+ errorString = InspectorDOMAgent::toErrorString(ec);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* child = parsedElement->firstChild();
</span><span class="cx"> if (!child) {
</span><del>- *errorString = "Could not parse value as attributes";
</del><ins>+ errorString = ASCIILiteral("Could not parse value as attributes");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -689,7 +689,7 @@
</span><span class="cx"> m_domEditor->removeAttribute(element, *name, errorString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::removeAttribute(ErrorString* errorString, int elementId, const String& name)
</del><ins>+void InspectorDOMAgent::removeAttribute(ErrorString& errorString, int elementId, const String& name)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = assertEditableElement(errorString, elementId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -698,7 +698,7 @@
</span><span class="cx"> m_domEditor->removeAttribute(element, name, errorString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::removeNode(ErrorString* errorString, int nodeId)
</del><ins>+void InspectorDOMAgent::removeNode(ErrorString& errorString, int nodeId)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = assertEditableNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -706,14 +706,14 @@
</span><span class="cx">
</span><span class="cx"> ContainerNode* parentNode = node->parentNode();
</span><span class="cx"> if (!parentNode) {
</span><del>- *errorString = "Can not remove detached node";
</del><ins>+ errorString = ASCIILiteral("Can not remove detached node");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_domEditor->removeChild(parentNode, node, errorString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::setNodeName(ErrorString* errorString, int nodeId, const String& tagName, int* newId)
</del><ins>+void InspectorDOMAgent::setNodeName(ErrorString& errorString, int nodeId, const String& tagName, int* newId)
</ins><span class="cx"> {
</span><span class="cx"> *newId = 0;
</span><span class="cx">
</span><span class="lines">@@ -748,7 +748,7 @@
</span><span class="cx"> pushChildNodesToFrontend(*newId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::getOuterHTML(ErrorString* errorString, int nodeId, WTF::String* outerHTML)
</del><ins>+void InspectorDOMAgent::getOuterHTML(ErrorString& errorString, int nodeId, WTF::String* outerHTML)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -757,7 +757,7 @@
</span><span class="cx"> *outerHTML = createMarkup(*node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::setOuterHTML(ErrorString* errorString, int nodeId, const String& outerHTML)
</del><ins>+void InspectorDOMAgent::setOuterHTML(ErrorString& errorString, int nodeId, const String& outerHTML)
</ins><span class="cx"> {
</span><span class="cx"> if (!nodeId) {
</span><span class="cx"> DOMPatchSupport domPatchSupport(m_domEditor.get(), m_document.get());
</span><span class="lines">@@ -771,7 +771,7 @@
</span><span class="cx">
</span><span class="cx"> Document& document = node->document();
</span><span class="cx"> if (!document.isHTMLDocument() && !document.isXHTMLDocument() && !document.isSVGDocument()) {
</span><del>- *errorString = "Not an HTML/XML document";
</del><ins>+ errorString = ASCIILiteral("Not an HTML/XML document");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -791,21 +791,21 @@
</span><span class="cx"> pushChildNodesToFrontend(newId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::setNodeValue(ErrorString* errorString, int nodeId, const String& value)
</del><ins>+void InspectorDOMAgent::setNodeValue(ErrorString& errorString, int nodeId, const String& value)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = assertEditableNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (node->nodeType() != Node::TEXT_NODE) {
</span><del>- *errorString = "Can only set value of text nodes";
</del><ins>+ errorString = ASCIILiteral("Can only set value of text nodes");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_domEditor->replaceWholeText(downcast<Text>(node), value, errorString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::getEventListenersForNode(ErrorString* errorString, int nodeId, const String* objectGroup, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>>& listenersArray)
</del><ins>+void InspectorDOMAgent::getEventListenersForNode(ErrorString& errorString, int nodeId, const String* objectGroup, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>>& listenersArray)
</ins><span class="cx"> {
</span><span class="cx"> listenersArray = Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>::create();
</span><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="lines">@@ -872,7 +872,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::getAccessibilityPropertiesForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::DOM::AccessibilityProperties>& axProperties)
</del><ins>+void InspectorDOMAgent::getAccessibilityPropertiesForNode(ErrorString& errorString, int nodeId, RefPtr<Inspector::Protocol::DOM::AccessibilityProperties>& axProperties)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -881,7 +881,7 @@
</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="lines">@@ -891,18 +891,18 @@
</span><span class="cx"> for (unsigned i = 0; i < nodeIdsRef->length(); ++i) {
</span><span class="cx"> RefPtr<InspectorValue> nodeValue = nodeIdsRef->get(i);
</span><span class="cx"> if (!nodeValue) {
</span><del>- *errorString = "Invalid nodeIds item.";
</del><ins>+ errorString = ASCIILiteral("Invalid nodeIds item.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> int nodeId = 0;
</span><span class="cx"> if (!nodeValue->asInteger(nodeId)) {
</span><del>- *errorString = "Invalid nodeIds item type. Expecting integer types.";
</del><ins>+ errorString = ASCIILiteral("Invalid nodeIds item type. Expecting integer types.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> Node* node = assertNode(errorString, nodeId);
</span><span class="cx"> if (!node) {
</span><span class="cx"> // assertNode should have filled the errorString for us.
</span><del>- ASSERT(errorString->length());
</del><ins>+ ASSERT(errorString.length());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> finder.performSearch(node);
</span><span class="lines">@@ -922,17 +922,17 @@
</span><span class="cx"> *resultCount = resultsVector.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::getSearchResults(ErrorString* errorString, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::Protocol::Array<int>>& nodeIds)
</del><ins>+void InspectorDOMAgent::getSearchResults(ErrorString& errorString, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::Protocol::Array<int>>& nodeIds)
</ins><span class="cx"> {
</span><span class="cx"> SearchResults::iterator it = m_searchResults.find(searchId);
</span><span class="cx"> if (it == m_searchResults.end()) {
</span><del>- *errorString = "No search session with given id found";
</del><ins>+ errorString = ASCIILiteral("No search session with given id found");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int size = it->value.size();
</span><span class="cx"> if (fromIndex < 0 || toIndex > size || fromIndex >= toIndex) {
</span><del>- *errorString = "Invalid search result range";
</del><ins>+ errorString = ASCIILiteral("Invalid search result range");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -941,7 +941,7 @@
</span><span class="cx"> nodeIds->addItem(pushNodePathToFrontend((it->value)[i].get()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::discardSearchResults(ErrorString*, const String& searchId)
</del><ins>+void InspectorDOMAgent::discardSearchResults(ErrorString&, const String& searchId)
</ins><span class="cx"> {
</span><span class="cx"> m_searchResults.remove(searchId);
</span><span class="cx"> }
</span><span class="lines">@@ -972,9 +972,9 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDOMAgent::inspect(Node* inspectedNode)
</span><span class="cx"> {
</span><del>- ErrorString error;
</del><ins>+ ErrorString unused;
</ins><span class="cx"> RefPtr<Node> node = inspectedNode;
</span><del>- setSearchingForNode(&error, false, 0);
</del><ins>+ setSearchingForNode(unused, false, 0);
</ins><span class="cx">
</span><span class="cx"> if (node->nodeType() != Node::ELEMENT_NODE && node->nodeType() != Node::DOCUMENT_NODE)
</span><span class="cx"> node = node->parentNode();
</span><span class="lines">@@ -1017,7 +1017,7 @@
</span><span class="cx"> m_overlay->highlightNode(node, *m_inspectModeHighlightConfig);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::setSearchingForNode(ErrorString* errorString, bool enabled, InspectorObject* highlightInspectorObject)
</del><ins>+void InspectorDOMAgent::setSearchingForNode(ErrorString& errorString, bool enabled, InspectorObject* highlightInspectorObject)
</ins><span class="cx"> {
</span><span class="cx"> if (m_searchingForNode == enabled)
</span><span class="cx"> return;
</span><span class="lines">@@ -1032,10 +1032,10 @@
</span><span class="cx"> m_overlay->didSetSearchingForNode(m_searchingForNode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<HighlightConfig> InspectorDOMAgent::highlightConfigFromInspectorObject(ErrorString* errorString, InspectorObject* highlightInspectorObject)
</del><ins>+std::unique_ptr<HighlightConfig> InspectorDOMAgent::highlightConfigFromInspectorObject(ErrorString& errorString, InspectorObject* highlightInspectorObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!highlightInspectorObject) {
</span><del>- *errorString = "Internal error: highlight configuration parameter is missing";
</del><ins>+ errorString = ASCIILiteral("Internal error: highlight configuration parameter is missing");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1051,22 +1051,22 @@
</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><span class="cx"> setSearchingForNode(errorString, enabled, highlightConfig ? highlightConfig->get() : 0);
</span><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><span class="cx"> innerHighlightQuad(WTF::move(quad), color, outlineColor, usePageCoordinates);
</span><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><del>- *errorString = "Invalid Quad format";
</del><ins>+ errorString = ASCIILiteral("Invalid Quad format");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> innerHighlightQuad(WTF::move(quad), color, outlineColor, usePageCoordinates);
</span><span class="lines">@@ -1081,7 +1081,7 @@
</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">@@ -1089,9 +1089,9 @@
</span><span class="cx"> } else if (objectId) {
</span><span class="cx"> node = nodeForObjectId(*objectId);
</span><span class="cx"> if (!node)
</span><del>- *errorString = "Node for given objectId not found";
</del><ins>+ errorString = ASCIILiteral("Node for given objectId not found");
</ins><span class="cx"> } else
</span><del>- *errorString = "Either nodeId or objectId must be specified";
</del><ins>+ errorString = ASCIILiteral("Either nodeId or objectId must be specified");
</ins><span class="cx">
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="lines">@@ -1103,7 +1103,7 @@
</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="lines">@@ -1115,12 +1115,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::hideHighlight(ErrorString*)
</del><ins>+void InspectorDOMAgent::hideHighlight(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_overlay->hideHighlight();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::moveTo(ErrorString* errorString, int nodeId, int targetElementId, const int* const anchorNodeId, int* newNodeId)
</del><ins>+void InspectorDOMAgent::moveTo(ErrorString& errorString, int nodeId, int targetElementId, const int* const anchorNodeId, int* newNodeId)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = assertEditableNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -1136,7 +1136,7 @@
</span><span class="cx"> if (!anchorNode)
</span><span class="cx"> return;
</span><span class="cx"> if (anchorNode->parentNode() != targetElement) {
</span><del>- *errorString = "Anchor node must be child of the target element";
</del><ins>+ errorString = ASCIILiteral("Anchor node must be child of the target element");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1147,54 +1147,54 @@
</span><span class="cx"> *newNodeId = pushNodePathToFrontend(node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::undo(ErrorString* errorString)
</del><ins>+void InspectorDOMAgent::undo(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> m_history->undo(ec);
</span><del>- *errorString = InspectorDOMAgent::toErrorString(ec);
</del><ins>+ errorString = InspectorDOMAgent::toErrorString(ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::redo(ErrorString* errorString)
</del><ins>+void InspectorDOMAgent::redo(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> m_history->redo(ec);
</span><del>- *errorString = InspectorDOMAgent::toErrorString(ec);
</del><ins>+ errorString = InspectorDOMAgent::toErrorString(ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::markUndoableState(ErrorString*)
</del><ins>+void InspectorDOMAgent::markUndoableState(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_history->markUndoableState();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::focus(ErrorString* errorString, int nodeId)
</del><ins>+void InspectorDOMAgent::focus(ErrorString& errorString, int nodeId)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = assertElement(errorString, nodeId);
</span><span class="cx"> if (!element)
</span><span class="cx"> return;
</span><span class="cx"> if (!element->isFocusable()) {
</span><del>- *errorString = "Element is not focusable";
</del><ins>+ errorString = ASCIILiteral("Element is not focusable");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> element->focus();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::resolveNode(ErrorString* errorString, int nodeId, const String* const objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result)
</del><ins>+void InspectorDOMAgent::resolveNode(ErrorString& errorString, int nodeId, const String* const objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result)
</ins><span class="cx"> {
</span><span class="cx"> String objectGroupName = objectGroup ? *objectGroup : "";
</span><span class="cx"> Node* node = nodeForId(nodeId);
</span><span class="cx"> if (!node) {
</span><del>- *errorString = "No node with given id found";
</del><ins>+ errorString = ASCIILiteral("No node with given id found");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> RefPtr<Inspector::Protocol::Runtime::RemoteObject> object = resolveNode(node, objectGroupName);
</span><span class="cx"> if (!object) {
</span><del>- *errorString = "Node with given id does not belong to the document";
</del><ins>+ errorString = ASCIILiteral("Node with given id does not belong to the document");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> result = object;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::getAttributes(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::Array<String>>& result)
</del><ins>+void InspectorDOMAgent::getAttributes(ErrorString& errorString, int nodeId, RefPtr<Inspector::Protocol::Array<String>>& result)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = assertElement(errorString, nodeId);
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -1203,7 +1203,7 @@
</span><span class="cx"> result = buildArrayForElementAttributes(element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::requestNode(ErrorString*, const String& objectId, int* nodeId)
</del><ins>+void InspectorDOMAgent::requestNode(ErrorString&, const String& objectId, int* nodeId)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = nodeForObjectId(objectId);
</span><span class="cx"> if (node)
</span><span class="lines">@@ -1956,18 +1956,18 @@
</span><span class="cx"> return InspectorDOMAgent::scriptValueAsNode(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::pushNodeByPathToFrontend(ErrorString* errorString, const String& path, int* nodeId)
</del><ins>+void InspectorDOMAgent::pushNodeByPathToFrontend(ErrorString& errorString, const String& path, int* nodeId)
</ins><span class="cx"> {
</span><span class="cx"> if (Node* node = nodeForPath(path))
</span><span class="cx"> *nodeId = pushNodePathToFrontend(node);
</span><span class="cx"> else
</span><del>- *errorString = "No node with given path found";
</del><ins>+ errorString = ASCIILiteral("No node with given path found");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMAgent::pushNodeByBackendIdToFrontend(ErrorString* errorString, BackendNodeId backendNodeId, int* nodeId)
</del><ins>+void InspectorDOMAgent::pushNodeByBackendIdToFrontend(ErrorString& errorString, BackendNodeId backendNodeId, int* nodeId)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_backendIdToNode.contains(backendNodeId)) {
</span><del>- *errorString = "No node with given backend id found";
</del><ins>+ errorString = ASCIILiteral("No node with given backend id found");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -118,41 +118,41 @@
</span><span class="cx"> void reset();
</span><span class="cx">
</span><span class="cx"> // Methods called from the frontend for DOM nodes inspection.
</span><del>- virtual void querySelector(ErrorString*, int nodeId, const String& selectors, int* elementId) override;
- virtual void querySelectorAll(ErrorString*, int nodeId, const String& selectors, RefPtr<Inspector::Protocol::Array<int>>& result) override;
- virtual void getDocument(ErrorString*, RefPtr<Inspector::Protocol::DOM::Node>& root) override;
- virtual void requestChildNodes(ErrorString*, int nodeId, const int* depth) override;
- virtual void setAttributeValue(ErrorString*, int elementId, const String& name, const String& value) override;
- virtual void setAttributesAsText(ErrorString*, int elementId, const String& text, const String* name) override;
- virtual void removeAttribute(ErrorString*, int elementId, const String& name) override;
- virtual void removeNode(ErrorString*, int nodeId) override;
- virtual void setNodeName(ErrorString*, int nodeId, const String& name, int* newId) override;
- virtual void getOuterHTML(ErrorString*, int nodeId, WTF::String* outerHTML) override;
- virtual void setOuterHTML(ErrorString*, int nodeId, const String& outerHTML) override;
- virtual void setNodeValue(ErrorString*, int nodeId, const String& value) override;
- virtual void getEventListenersForNode(ErrorString*, int nodeId, const WTF::String* objectGroup, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>>& listenersArray) override;
- virtual void getAccessibilityPropertiesForNode(ErrorString*, int nodeId, RefPtr<Inspector::Protocol::DOM::AccessibilityProperties>& axProperties) override;
- virtual void performSearch(ErrorString*, const String& whitespaceTrimmedQuery, const RefPtr<Inspector::InspectorArray>* nodeIds, String* searchId, int* resultCount) override;
- virtual void getSearchResults(ErrorString*, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::Protocol::Array<int>>&) override;
- virtual void discardSearchResults(ErrorString*, const String& searchId) override;
- virtual void resolveNode(ErrorString*, int nodeId, const String* objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result) override;
- virtual void getAttributes(ErrorString*, int nodeId, RefPtr<Inspector::Protocol::Array<String>>& result) override;
- virtual void setInspectModeEnabled(ErrorString*, bool enabled, const RefPtr<Inspector::InspectorObject>* highlightConfig) override;
- virtual void requestNode(ErrorString*, const String& objectId, int* nodeId) override;
- virtual void pushNodeByPathToFrontend(ErrorString*, const String& path, int* nodeId) override;
- virtual void pushNodeByBackendIdToFrontend(ErrorString*, BackendNodeId, int* nodeId) override;
- virtual void releaseBackendNodeIds(ErrorString*, const String& nodeGroup) override;
- virtual void hideHighlight(ErrorString*) override;
- 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 querySelector(ErrorString&, int nodeId, const String& selectors, int* elementId) override;
+ virtual void querySelectorAll(ErrorString&, int nodeId, const String& selectors, RefPtr<Inspector::Protocol::Array<int>>& result) override;
+ virtual void getDocument(ErrorString&, RefPtr<Inspector::Protocol::DOM::Node>& root) override;
+ virtual void requestChildNodes(ErrorString&, int nodeId, const int* depth) override;
+ virtual void setAttributeValue(ErrorString&, int elementId, const String& name, const String& value) override;
+ virtual void setAttributesAsText(ErrorString&, int elementId, const String& text, const String* name) override;
+ virtual void removeAttribute(ErrorString&, int elementId, const String& name) override;
+ virtual void removeNode(ErrorString&, int nodeId) override;
+ virtual void setNodeName(ErrorString&, int nodeId, const String& name, int* newId) override;
+ virtual void getOuterHTML(ErrorString&, int nodeId, WTF::String* outerHTML) override;
+ virtual void setOuterHTML(ErrorString&, int nodeId, const String& outerHTML) override;
+ virtual void setNodeValue(ErrorString&, int nodeId, const String& value) override;
+ virtual void getEventListenersForNode(ErrorString&, int nodeId, const WTF::String* objectGroup, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::DOM::EventListener>>& listenersArray) override;
+ virtual void getAccessibilityPropertiesForNode(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::DOM::AccessibilityProperties>& axProperties) override;
+ virtual void performSearch(ErrorString&, const String& whitespaceTrimmedQuery, const RefPtr<Inspector::InspectorArray>* nodeIds, String* searchId, int* resultCount) override;
+ virtual void getSearchResults(ErrorString&, const String& searchId, int fromIndex, int toIndex, RefPtr<Inspector::Protocol::Array<int>>&) override;
+ virtual void discardSearchResults(ErrorString&, const String& searchId) override;
+ virtual void resolveNode(ErrorString&, int nodeId, const String* objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result) override;
+ virtual void getAttributes(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::Array<String>>& result) override;
+ virtual void setInspectModeEnabled(ErrorString&, bool enabled, const RefPtr<Inspector::InspectorObject>* highlightConfig) override;
+ virtual void requestNode(ErrorString&, const String& objectId, int* nodeId) override;
+ virtual void pushNodeByPathToFrontend(ErrorString&, const String& path, int* nodeId) override;
+ virtual void pushNodeByBackendIdToFrontend(ErrorString&, BackendNodeId, int* nodeId) override;
+ virtual void releaseBackendNodeIds(ErrorString&, const String& nodeGroup) override;
+ virtual void hideHighlight(ErrorString&) override;
+ 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><del>- virtual void moveTo(ErrorString*, int nodeId, int targetNodeId, const int* anchorNodeId, int* newNodeId) override;
- virtual void undo(ErrorString*) override;
- virtual void redo(ErrorString*) override;
- virtual void markUndoableState(ErrorString*) override;
- virtual void focus(ErrorString*, int nodeId) override;
</del><ins>+ virtual void moveTo(ErrorString&, int nodeId, int targetNodeId, const int* anchorNodeId, int* newNodeId) override;
+ virtual void undo(ErrorString&) override;
+ virtual void redo(ErrorString&) override;
+ virtual void markUndoableState(ErrorString&) override;
+ virtual void focus(ErrorString&, int nodeId) override;
</ins><span class="cx">
</span><span class="cx"> void getEventListeners(Node*, Vector<EventListenerInfo>& listenersArray, bool includeAncestors);
</span><span class="cx">
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> void willPopShadowRoot(Element* host, ShadowRoot*);
</span><span class="cx"> void frameDocumentUpdated(Frame*);
</span><span class="cx">
</span><del>- int pushNodeToFrontend(ErrorString*, int documentNodeId, Node*);
</del><ins>+ int pushNodeToFrontend(ErrorString&, int documentNodeId, Node*);
</ins><span class="cx"> Node* nodeForId(int nodeId);
</span><span class="cx"> int boundNodeId(Node*);
</span><span class="cx"> void setDOMListener(DOMListener*);
</span><span class="lines">@@ -201,9 +201,9 @@
</span><span class="cx"> static Node* innerParentNode(Node*);
</span><span class="cx"> static bool isWhitespace(Node*);
</span><span class="cx">
</span><del>- Node* assertNode(ErrorString*, int nodeId);
- Element* assertElement(ErrorString*, int nodeId);
- Document* assertDocument(ErrorString*, int nodeId);
</del><ins>+ Node* assertNode(ErrorString&, int nodeId);
+ Element* assertElement(ErrorString&, int nodeId);
+ Document* assertDocument(ErrorString&, int nodeId);
</ins><span class="cx">
</span><span class="cx"> static Node* scriptValueAsNode(Deprecated::ScriptValue);
</span><span class="cx"> static Deprecated::ScriptValue nodeAsScriptValue(JSC::ExecState*, Node*);
</span><span class="lines">@@ -212,16 +212,16 @@
</span><span class="cx"> InspectorPageAgent* pageAgent() { return m_pageAgent; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void setSearchingForNode(ErrorString*, bool enabled, Inspector::InspectorObject* highlightConfig);
- std::unique_ptr<HighlightConfig> highlightConfigFromInspectorObject(ErrorString*, Inspector::InspectorObject* highlightInspectorObject);
</del><ins>+ void setSearchingForNode(ErrorString&, bool enabled, Inspector::InspectorObject* highlightConfig);
+ std::unique_ptr<HighlightConfig> highlightConfigFromInspectorObject(ErrorString&, Inspector::InspectorObject* highlightInspectorObject);
</ins><span class="cx">
</span><span class="cx"> // Node-related methods.
</span><span class="cx"> typedef HashMap<RefPtr<Node>, int> NodeToIdMap;
</span><span class="cx"> int bind(Node*, NodeToIdMap*);
</span><span class="cx"> void unbind(Node*, NodeToIdMap*);
</span><span class="cx">
</span><del>- Node* assertEditableNode(ErrorString*, int nodeId);
- Element* assertEditableElement(ErrorString*, int nodeId);
</del><ins>+ Node* assertEditableNode(ErrorString&, int nodeId);
+ Element* assertEditableElement(ErrorString&, int nodeId);
</ins><span class="cx">
</span><span class="cx"> int pushNodePathToFrontend(Node*);
</span><span class="cx"> void pushChildNodesToFrontend(int nodeId, int depth = 1);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -128,40 +128,40 @@
</span><span class="cx"> m_domBreakpoints.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::setEventListenerBreakpoint(ErrorString* error, const String& eventName)
</del><ins>+void InspectorDOMDebuggerAgent::setEventListenerBreakpoint(ErrorString& error, const String& eventName)
</ins><span class="cx"> {
</span><span class="cx"> setBreakpoint(error, String(listenerEventCategoryType) + eventName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::setInstrumentationBreakpoint(ErrorString* error, const String& eventName)
</del><ins>+void InspectorDOMDebuggerAgent::setInstrumentationBreakpoint(ErrorString& error, const String& eventName)
</ins><span class="cx"> {
</span><span class="cx"> setBreakpoint(error, String(instrumentationEventCategoryType) + eventName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::setBreakpoint(ErrorString* error, const String& eventName)
</del><ins>+void InspectorDOMDebuggerAgent::setBreakpoint(ErrorString& error, const String& eventName)
</ins><span class="cx"> {
</span><span class="cx"> if (eventName.isEmpty()) {
</span><del>- *error = "Event name is empty";
</del><ins>+ error = ASCIILiteral("Event name is empty");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_eventListenerBreakpoints.add(eventName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::removeEventListenerBreakpoint(ErrorString* error, const String& eventName)
</del><ins>+void InspectorDOMDebuggerAgent::removeEventListenerBreakpoint(ErrorString& error, const String& eventName)
</ins><span class="cx"> {
</span><span class="cx"> removeBreakpoint(error, String(listenerEventCategoryType) + eventName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::removeInstrumentationBreakpoint(ErrorString* error, const String& eventName)
</del><ins>+void InspectorDOMDebuggerAgent::removeInstrumentationBreakpoint(ErrorString& error, const String& eventName)
</ins><span class="cx"> {
</span><span class="cx"> removeBreakpoint(error, String(instrumentationEventCategoryType) + eventName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::removeBreakpoint(ErrorString* error, const String& eventName)
</del><ins>+void InspectorDOMDebuggerAgent::removeBreakpoint(ErrorString& error, const String& eventName)
</ins><span class="cx"> {
</span><span class="cx"> if (eventName.isEmpty()) {
</span><del>- *error = "Event name is empty";
</del><ins>+ error = ASCIILiteral("Event name is empty");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static int domTypeForName(ErrorString* errorString, const String& typeString)
</del><ins>+static int domTypeForName(ErrorString& errorString, const String& typeString)
</ins><span class="cx"> {
</span><span class="cx"> if (typeString == "subtree-modified")
</span><span class="cx"> return SubtreeModified;
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> return AttributeModified;
</span><span class="cx"> if (typeString == "node-removed")
</span><span class="cx"> return NodeRemoved;
</span><del>- *errorString = makeString("Unknown DOM breakpoint type: ", typeString);
</del><ins>+ errorString = makeString("Unknown DOM breakpoint type: ", typeString);
</ins><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::setDOMBreakpoint(ErrorString* errorString, int nodeId, const String& typeString)
</del><ins>+void InspectorDOMDebuggerAgent::setDOMBreakpoint(ErrorString& errorString, int nodeId, const String& typeString)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = m_domAgent->assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::removeDOMBreakpoint(ErrorString* errorString, int nodeId, const String& typeString)
</del><ins>+void InspectorDOMDebuggerAgent::removeDOMBreakpoint(ErrorString& errorString, int nodeId, const String& typeString)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = m_domAgent->assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> m_debuggerAgent->schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason::EventListener, eventData.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::setXHRBreakpoint(ErrorString*, const String& url)
</del><ins>+void InspectorDOMDebuggerAgent::setXHRBreakpoint(ErrorString&, const String& url)
</ins><span class="cx"> {
</span><span class="cx"> if (url.isEmpty()) {
</span><span class="cx"> m_pauseOnAllXHRsEnabled = true;
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> m_xhrBreakpoints.add(url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMDebuggerAgent::removeXHRBreakpoint(ErrorString*, const String& url)
</del><ins>+void InspectorDOMDebuggerAgent::removeXHRBreakpoint(ErrorString&, const String& url)
</ins><span class="cx"> {
</span><span class="cx"> if (url.isEmpty()) {
</span><span class="cx"> m_pauseOnAllXHRsEnabled = false;
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> {
</span><span class="cx"> String breakpointURL;
</span><span class="cx"> if (m_pauseOnAllXHRsEnabled)
</span><del>- breakpointURL = "";
</del><ins>+ breakpointURL = emptyString();
</ins><span class="cx"> else {
</span><span class="cx"> for (auto it = m_xhrBreakpoints.begin(), end = m_xhrBreakpoints.end(); it != end; ++it) {
</span><span class="cx"> if (url.contains(*it)) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -61,14 +61,14 @@
</span><span class="cx"> virtual ~InspectorDOMDebuggerAgent();
</span><span class="cx">
</span><span class="cx"> // DOMDebugger API
</span><del>- virtual void setXHRBreakpoint(ErrorString*, const String& url) override;
- virtual void removeXHRBreakpoint(ErrorString*, const String& url) override;
- virtual void setEventListenerBreakpoint(ErrorString*, const String& eventName) override;
- virtual void removeEventListenerBreakpoint(ErrorString*, const String& eventName) override;
- virtual void setInstrumentationBreakpoint(ErrorString*, const String& eventName) override;
- virtual void removeInstrumentationBreakpoint(ErrorString*, const String& eventName) override;
- virtual void setDOMBreakpoint(ErrorString*, int nodeId, const String& type) override;
- virtual void removeDOMBreakpoint(ErrorString*, int nodeId, const String& type) override;
</del><ins>+ virtual void setXHRBreakpoint(ErrorString&, const String& url) override;
+ virtual void removeXHRBreakpoint(ErrorString&, const String& url) override;
+ virtual void setEventListenerBreakpoint(ErrorString&, const String& eventName) override;
+ virtual void removeEventListenerBreakpoint(ErrorString&, const String& eventName) override;
+ virtual void setInstrumentationBreakpoint(ErrorString&, const String& eventName) override;
+ virtual void removeInstrumentationBreakpoint(ErrorString&, const String& eventName) override;
+ virtual void setDOMBreakpoint(ErrorString&, int nodeId, const String& type) override;
+ virtual void removeDOMBreakpoint(ErrorString&, int nodeId, const String& type) override;
</ins><span class="cx">
</span><span class="cx"> // InspectorInstrumentation API
</span><span class="cx"> void willInsertDOMNode(Node* parent);
</span><span class="lines">@@ -96,8 +96,8 @@
</span><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><del>- void setBreakpoint(ErrorString*, const String& eventName);
- void removeBreakpoint(ErrorString*, const String& eventName);
</del><ins>+ void setBreakpoint(ErrorString&, const String& eventName);
+ void removeBreakpoint(ErrorString&, const String& eventName);
</ins><span class="cx">
</span><span class="cx"> void clear();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -81,26 +81,26 @@
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><del>- disable(nullptr);
</del><ins>+ ErrorString unused;
+ disable(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMStorageAgent::enable(ErrorString*)
</del><ins>+void InspectorDOMStorageAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_enabled = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDOMStorageAgent::disable(ErrorString*)
</del><ins>+void InspectorDOMStorageAgent::disable(ErrorString&)
</ins><span class="cx"> {
</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><span class="cx"> RefPtr<StorageArea> storageArea = findStorageArea(errorString, storageId, frame);
</span><span class="cx"> if (!storageArea) {
</span><del>- if (errorString)
- *errorString = "No StorageArea for given storageId";
</del><ins>+ errorString = ASCIILiteral("No StorageArea for given storageId");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -119,27 +119,27 @@
</span><span class="cx"> items = storageItems.release();
</span><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(nullptr, storageId, frame);
</del><ins>+ RefPtr<StorageArea> storageArea = findStorageArea(errorString, storageId, frame);
</ins><span class="cx"> if (!storageArea) {
</span><del>- *errorString = "Storage not found";
</del><ins>+ errorString = ASCIILiteral("Storage not found");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool quotaException = false;
</span><span class="cx"> storageArea->setItem(frame, key, value, quotaException);
</span><span class="cx"> if (quotaException)
</span><del>- *errorString = ExceptionCodeDescription(QUOTA_EXCEEDED_ERR).name;
</del><ins>+ errorString = ExceptionCodeDescription(QUOTA_EXCEEDED_ERR).name;
</ins><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(nullptr, storageId, frame);
</del><ins>+ RefPtr<StorageArea> storageArea = findStorageArea(errorString, storageId, frame);
</ins><span class="cx"> if (!storageArea) {
</span><del>- *errorString = "Storage not found";
</del><ins>+ errorString = ASCIILiteral("Storage not found");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -182,24 +182,22 @@
</span><span class="cx"> m_frontendDispatcher->domStorageItemUpdated(id, key, oldValue, newValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<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><del>- bool success = storageId->getString("securityOrigin", securityOrigin);
</del><ins>+ bool success = storageId->getString(ASCIILiteral("securityOrigin"), securityOrigin);
</ins><span class="cx"> if (success)
</span><del>- success = storageId->getBoolean("isLocalStorage", isLocalStorage);
</del><ins>+ success = storageId->getBoolean(ASCIILiteral("isLocalStorage"), isLocalStorage);
</ins><span class="cx"> if (!success) {
</span><del>- if (errorString)
- *errorString = "Invalid storageId format";
</del><ins>+ errorString = ASCIILiteral("Invalid storageId format");
</ins><span class="cx"> targetFrame = nullptr;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> targetFrame = m_pageAgent->findFrameWithSecurityOrigin(securityOrigin);
</span><span class="cx"> if (!targetFrame) {
</span><del>- if (errorString)
- *errorString = "Frame not found for the given security origin";
</del><ins>+ errorString = ASCIILiteral("Frame not found for the given security origin");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -61,11 +61,11 @@
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> // Called from the front-end.
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- 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 enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
+ 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><span class="lines">@@ -75,7 +75,7 @@
</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>- PassRefPtr<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 (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -233,10 +233,11 @@
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><del>- disable(nullptr);
</del><ins>+ ErrorString unused;
+ disable(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseAgent::enable(ErrorString*)
</del><ins>+void InspectorDatabaseAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> if (m_enabled)
</span><span class="cx"> return;
</span><span class="lines">@@ -247,17 +248,17 @@
</span><span class="cx"> it->value->bind(m_frontendDispatcher.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseAgent::disable(ErrorString*)
</del><ins>+void InspectorDatabaseAgent::disable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_enabled)
</span><span class="cx"> return;
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString* error, const String& databaseId, RefPtr<Inspector::Protocol::Array<String>>& names)
</del><ins>+void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString& error, const String& databaseId, RefPtr<Inspector::Protocol::Array<String>>& names)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_enabled) {
</span><del>- *error = "Database agent is not enabled";
</del><ins>+ error = ASCIILiteral("Database agent is not enabled");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -272,7 +273,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDatabaseAgent::executeSQL(ErrorString*, const String& databaseId, const String& query, PassRefPtr<ExecuteSQLCallback> prpRequestCallback)
</del><ins>+void InspectorDatabaseAgent::executeSQL(ErrorString&, const String& databaseId, const String& query, PassRefPtr<ExecuteSQLCallback> prpRequestCallback)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ExecuteSQLCallback> requestCallback = prpRequestCallback;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -61,10 +61,10 @@
</span><span class="cx"> void clearResources();
</span><span class="cx">
</span><span class="cx"> // Called from the front-end.
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- virtual void getDatabaseTableNames(ErrorString*, const String& databaseId, RefPtr<Inspector::Protocol::Array<String>>& names) override;
- virtual void executeSQL(ErrorString*, const String& databaseId, const String& query, PassRefPtr<ExecuteSQLCallback>) override;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
+ virtual void getDatabaseTableNames(ErrorString&, const String& databaseId, RefPtr<Inspector::Protocol::Array<String>>& names) override;
+ 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="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -570,41 +570,42 @@
</span><span class="cx"> {
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><del>- disable(nullptr);
</del><ins>+ ErrorString unused;
+ disable(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::enable(ErrorString*)
</del><ins>+void InspectorIndexedDBAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::disable(ErrorString*)
</del><ins>+void InspectorIndexedDBAgent::disable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Document* assertDocument(ErrorString* errorString, Frame* frame)
</del><ins>+static Document* assertDocument(ErrorString& errorString, Frame* frame)
</ins><span class="cx"> {
</span><span class="cx"> Document* document = frame ? frame->document() : nullptr;
</span><span class="cx"> if (!document)
</span><del>- *errorString = "No document for given frame found";
</del><ins>+ errorString = ASCIILiteral("No document for given frame found");
</ins><span class="cx"> return document;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static IDBFactory* assertIDBFactory(ErrorString* errorString, Document* document)
</del><ins>+static IDBFactory* assertIDBFactory(ErrorString& errorString, Document* document)
</ins><span class="cx"> {
</span><span class="cx"> DOMWindow* domWindow = document->domWindow();
</span><span class="cx"> if (!domWindow) {
</span><del>- *errorString = "No IndexedDB factory for given frame found";
</del><ins>+ errorString = ASCIILiteral("No IndexedDB factory for given frame found");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBFactory* idbFactory = DOMWindowIndexedDatabase::indexedDB(domWindow);
</span><span class="cx"> if (!idbFactory)
</span><del>- *errorString = "No IndexedDB factory for given frame found";
</del><ins>+ errorString = ASCIILiteral("No IndexedDB factory for given frame found");
</ins><span class="cx">
</span><span class="cx"> return idbFactory;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::requestDatabaseNames(ErrorString* errorString, const String& securityOrigin, PassRefPtr<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">@@ -625,7 +626,7 @@
</span><span class="cx"> idbRequest->addEventListener(eventNames().successEvent, GetDatabaseNamesCallback::create(requestCallback, document->securityOrigin()->toRawString()), false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::requestDatabase(ErrorString* errorString, const String& securityOrigin, const String& databaseName, PassRefPtr<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">@@ -640,7 +641,7 @@
</span><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, PassRefPtr<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">@@ -655,7 +656,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBKeyRange> idbKeyRange = keyRange ? idbKeyRangeFromKeyRange(keyRange->get()) : nullptr;
</span><span class="cx"> if (keyRange && !idbKeyRange) {
</span><del>- *errorString = "Can not parse key range.";
</del><ins>+ errorString = ASCIILiteral("Can not parse key range.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -746,7 +747,7 @@
</span><span class="cx"> RefPtr<ClearObjectStoreCallback> m_requestCallback;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void InspectorIndexedDBAgent::clearObjectStore(ErrorString* errorString, const String& securityOrigin, const String& databaseName, const String& objectStoreName, PassRefPtr<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></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -56,12 +56,12 @@
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</span><span class="cx">
</span><span class="cx"> // Called from the front-end.
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- 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;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
+ 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="trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -70,7 +70,8 @@
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><del>- disable(nullptr);
</del><ins>+ ErrorString unused;
+ disable(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorLayerTreeAgent::reset()
</span><span class="lines">@@ -81,12 +82,12 @@
</span><span class="cx"> m_idToPseudoElement.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::enable(ErrorString*)
</del><ins>+void InspectorLayerTreeAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_instrumentingAgents->setInspectorLayerTreeAgent(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::disable(ErrorString*)
</del><ins>+void InspectorLayerTreeAgent::disable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_instrumentingAgents->setInspectorLayerTreeAgent(nullptr);
</span><span class="cx"> }
</span><span class="lines">@@ -106,26 +107,26 @@
</span><span class="cx"> unbindPseudoElement(pseudoElement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::layersForNode(ErrorString* errorString, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>& layers)
</del><ins>+void InspectorLayerTreeAgent::layersForNode(ErrorString& errorString, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>& layers)
</ins><span class="cx"> {
</span><span class="cx"> layers = Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>::create();
</span><span class="cx">
</span><span class="cx"> Node* node = m_instrumentingAgents->inspectorDOMAgent()->nodeForId(nodeId);
</span><span class="cx"> if (!node) {
</span><del>- *errorString = "Provided node id doesn't match any known node";
</del><ins>+ errorString = ASCIILiteral("Provided node id doesn't match any known node");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderObject* renderer = node->renderer();
</span><span class="cx"> if (!renderer) {
</span><del>- *errorString = "Node for provided node id doesn't have a renderer";
</del><ins>+ errorString = ASCIILiteral("Node for provided node id doesn't have a renderer");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gatherLayersUsingRenderObjectHierarchy(errorString, renderer, layers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::gatherLayersUsingRenderObjectHierarchy(ErrorString* errorString, RenderObject* renderer, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>& layers)
</del><ins>+void InspectorLayerTreeAgent::gatherLayersUsingRenderObjectHierarchy(ErrorString& errorString, RenderObject* renderer, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>& layers)
</ins><span class="cx"> {
</span><span class="cx"> if (renderer->hasLayer()) {
</span><span class="cx"> gatherLayersUsingRenderLayerHierarchy(errorString, toRenderLayerModelObject(renderer)->layer(), layers);
</span><span class="lines">@@ -136,7 +137,7 @@
</span><span class="cx"> gatherLayersUsingRenderObjectHierarchy(errorString, renderer, layers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::gatherLayersUsingRenderLayerHierarchy(ErrorString* errorString, RenderLayer* renderLayer, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>& layers)
</del><ins>+void InspectorLayerTreeAgent::gatherLayersUsingRenderLayerHierarchy(ErrorString& errorString, RenderLayer* renderLayer, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>& layers)
</ins><span class="cx"> {
</span><span class="cx"> if (renderLayer->isComposited())
</span><span class="cx"> layers->addItem(buildObjectForLayer(errorString, renderLayer));
</span><span class="lines">@@ -145,7 +146,7 @@
</span><span class="cx"> gatherLayersUsingRenderLayerHierarchy(errorString, renderLayer, layers);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<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">@@ -203,7 +204,7 @@
</span><span class="cx"> return layerObject;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int InspectorLayerTreeAgent::idForNode(ErrorString* errorString, Node* node)
</del><ins>+int InspectorLayerTreeAgent::idForNode(ErrorString& errorString, Node* node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -226,12 +227,12 @@
</span><span class="cx"> .setHeight(rect.height()).release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorLayerTreeAgent::reasonsForCompositingLayer(ErrorString* errorString, const String& layerId, RefPtr<Inspector::Protocol::LayerTree::CompositingReasons>& compositingReasons)
</del><ins>+void InspectorLayerTreeAgent::reasonsForCompositingLayer(ErrorString& errorString, const String& layerId, RefPtr<Inspector::Protocol::LayerTree::CompositingReasons>& compositingReasons)
</ins><span class="cx"> {
</span><span class="cx"> const RenderLayer* renderLayer = m_idToLayer.get(layerId);
</span><span class="cx">
</span><span class="cx"> if (!renderLayer) {
</span><del>- *errorString = "Could not find a bound layer for the provided id";
</del><ins>+ errorString = ASCIILiteral("Could not find a bound layer for the provided id");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -61,23 +61,23 @@
</span><span class="cx"> void pseudoElementDestroyed(PseudoElement*);
</span><span class="cx">
</span><span class="cx"> // Called from the front-end.
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- virtual void layersForNode(ErrorString*, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>&) override;
- virtual void reasonsForCompositingLayer(ErrorString*, const String& layerId, RefPtr<Inspector::Protocol::LayerTree::CompositingReasons>&) override;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
+ virtual void layersForNode(ErrorString&, int nodeId, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>&) override;
+ virtual void reasonsForCompositingLayer(ErrorString&, const String& layerId, RefPtr<Inspector::Protocol::LayerTree::CompositingReasons>&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // RenderLayer-related methods.
</span><span class="cx"> String bind(const RenderLayer*);
</span><span class="cx"> void unbind(const RenderLayer*);
</span><span class="cx">
</span><del>- void gatherLayersUsingRenderObjectHierarchy(ErrorString*, RenderObject*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>&);
- void gatherLayersUsingRenderLayerHierarchy(ErrorString*, RenderLayer*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>&);
</del><ins>+ void gatherLayersUsingRenderObjectHierarchy(ErrorString&, RenderObject*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>&);
+ void gatherLayersUsingRenderLayerHierarchy(ErrorString&, RenderLayer*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>>&);
</ins><span class="cx">
</span><del>- PassRefPtr<Inspector::Protocol::LayerTree::Layer> buildObjectForLayer(ErrorString*, RenderLayer*);
</del><ins>+ PassRefPtr<Inspector::Protocol::LayerTree::Layer> buildObjectForLayer(ErrorString&, RenderLayer*);
</ins><span class="cx"> PassRefPtr<Inspector::Protocol::LayerTree::IntRect> buildObjectForIntRect(const IntRect&);
</span><span class="cx">
</span><del>- int idForNode(ErrorString*, Node*);
</del><ins>+ int idForNode(ErrorString&, Node*);
</ins><span class="cx">
</span><span class="cx"> String bindPseudoElement(PseudoElement*);
</span><span class="cx"> void unbindPseudoElement(PseudoElement*);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (hasZeroSize) {
</span><del>- *result = "";
</del><ins>+ *result = emptyString();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // static
</span><del>-void InspectorPageAgent::resourceContent(ErrorString* errorString, Frame* frame, const URL& url, String* result, bool* base64Encoded)
</del><ins>+void InspectorPageAgent::resourceContent(ErrorString& errorString, Frame* frame, const URL& url, String* result, bool* base64Encoded)
</ins><span class="cx"> {
</span><span class="cx"> DocumentLoader* loader = assertDocumentLoader(errorString, frame);
</span><span class="cx"> if (!loader)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> success = cachedResourceContent(cachedResource(frame, url), result, base64Encoded);
</span><span class="cx">
</span><span class="cx"> if (!success)
</span><del>- *errorString = "No resource with given URL found";
</del><ins>+ errorString = ASCIILiteral("No resource with given URL found");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //static
</span><span class="lines">@@ -354,14 +354,14 @@
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><del>- ErrorString error;
- disable(&error);
</del><ins>+ ErrorString unused;
+ disable(unused);
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> updateTouchEventEmulationInPage(false);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::enable(ErrorString*)
</del><ins>+void InspectorPageAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_enabled = true;
</span><span class="cx"> m_instrumentingAgents->setInspectorPageAgent(this);
</span><span class="lines">@@ -370,21 +370,22 @@
</span><span class="cx"> m_originalScriptExecutionDisabled = !frame->settings().isScriptEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::disable(ErrorString*)
</del><ins>+void InspectorPageAgent::disable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> m_scriptsToEvaluateOnLoad.clear();
</span><span class="cx"> m_instrumentingAgents->setInspectorPageAgent(nullptr);
</span><span class="cx">
</span><del>- setScriptExecutionDisabled(nullptr, m_originalScriptExecutionDisabled);
- setShowPaintRects(nullptr, false);
- setShowDebugBorders(nullptr, false);
- setShowFPSCounter(nullptr, false);
- setEmulatedMedia(nullptr, "");
- setContinuousPaintingEnabled(nullptr, false);
</del><ins>+ ErrorString unused;
+ setScriptExecutionDisabled(unused, m_originalScriptExecutionDisabled);
+ setShowPaintRects(unused, false);
+ setShowDebugBorders(unused, false);
+ setShowFPSCounter(unused, false);
+ setEmulatedMedia(unused, emptyString());
+ setContinuousPaintingEnabled(unused, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::addScriptToEvaluateOnLoad(ErrorString*, const String& source, String* identifier)
</del><ins>+void InspectorPageAgent::addScriptToEvaluateOnLoad(ErrorString&, const String& source, String* identifier)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_scriptsToEvaluateOnLoad)
</span><span class="cx"> m_scriptsToEvaluateOnLoad = InspectorObject::create();
</span><span class="lines">@@ -398,23 +399,23 @@
</span><span class="cx"> m_scriptsToEvaluateOnLoad->setString(*identifier, source);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::removeScriptToEvaluateOnLoad(ErrorString* error, const String& identifier)
</del><ins>+void InspectorPageAgent::removeScriptToEvaluateOnLoad(ErrorString& error, const String& identifier)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_scriptsToEvaluateOnLoad || m_scriptsToEvaluateOnLoad->find(identifier) == m_scriptsToEvaluateOnLoad->end()) {
</span><del>- *error = "Script not found";
</del><ins>+ error = ASCIILiteral("Script not found");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_scriptsToEvaluateOnLoad->remove(identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::reload(ErrorString*, const bool* const optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad)
</del><ins>+void InspectorPageAgent::reload(ErrorString&, const bool* const optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad)
</ins><span class="cx"> {
</span><span class="cx"> m_pendingScriptToEvaluateOnLoadOnce = optionalScriptToEvaluateOnLoad ? *optionalScriptToEvaluateOnLoad : "";
</span><span class="cx"> m_page->mainFrame().loader().reload(optionalIgnoreCache ? *optionalIgnoreCache : false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::navigate(ErrorString*, const String& url)
</del><ins>+void InspectorPageAgent::navigate(ErrorString&, const String& url)
</ins><span class="cx"> {
</span><span class="cx"> UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
</span><span class="cx"> Frame& frame = m_page->mainFrame();
</span><span class="lines">@@ -486,7 +487,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::getCookies(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>>& cookies)
</del><ins>+void InspectorPageAgent::getCookies(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>>& cookies)
</ins><span class="cx"> {
</span><span class="cx"> // If we can get raw cookies.
</span><span class="cx"> ListHashSet<Cookie> rawCookiesList;
</span><span class="lines">@@ -528,19 +529,19 @@
</span><span class="cx"> cookies = Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>::create();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::deleteCookie(ErrorString*, const String& cookieName, const String& url)
</del><ins>+void InspectorPageAgent::deleteCookie(ErrorString&, const String& cookieName, const String& url)
</ins><span class="cx"> {
</span><span class="cx"> URL parsedURL(ParsedURLString, url);
</span><span class="cx"> for (Frame* frame = &m_page->mainFrame(); frame; frame = frame->tree().traverseNext(&m_page->mainFrame()))
</span><span class="cx"> WebCore::deleteCookie(frame->document(), parsedURL, cookieName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::getResourceTree(ErrorString*, RefPtr<Inspector::Protocol::Page::FrameResourceTree>& object)
</del><ins>+void InspectorPageAgent::getResourceTree(ErrorString&, RefPtr<Inspector::Protocol::Page::FrameResourceTree>& object)
</ins><span class="cx"> {
</span><span class="cx"> object = buildObjectForFrameTree(&m_page->mainFrame());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::getResourceContent(ErrorString* errorString, const String& frameId, const String& url, String* content, bool* base64Encoded)
</del><ins>+void InspectorPageAgent::getResourceContent(ErrorString& errorString, const String& frameId, const String& url, String* content, bool* base64Encoded)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = assertFrame(errorString, frameId);
</span><span class="cx"> if (!frame)
</span><span class="lines">@@ -562,7 +563,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>& results)
</del><ins>+void InspectorPageAgent::searchInResource(ErrorString&, const String& frameId, const String& url, const String& query, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>& results)
</ins><span class="cx"> {
</span><span class="cx"> results = Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>::create();
</span><span class="cx">
</span><span class="lines">@@ -605,7 +606,7 @@
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::searchInResources(ErrorString*, const String& text, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>>& results)
</del><ins>+void InspectorPageAgent::searchInResources(ErrorString&, const String& text, const bool* const optionalCaseSensitive, const bool* const optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>>& results)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>> searchResults = Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>::create();
</span><span class="cx">
</span><span class="lines">@@ -634,7 +635,7 @@
</span><span class="cx"> results = searchResults;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::setDocumentContent(ErrorString* errorString, const String& frameId, const String& html)
</del><ins>+void InspectorPageAgent::setDocumentContent(ErrorString& errorString, const String& frameId, const String& html)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = assertFrame(errorString, frameId);
</span><span class="cx"> if (!frame)
</span><span class="lines">@@ -642,41 +643,41 @@
</span><span class="cx">
</span><span class="cx"> Document* document = frame->document();
</span><span class="cx"> if (!document) {
</span><del>- *errorString = "No Document instance to set HTML for";
</del><ins>+ errorString = ASCIILiteral("No Document instance to set HTML for");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> DOMPatchSupport::patchDocument(document, html);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::setShowPaintRects(ErrorString*, bool show)
</del><ins>+void InspectorPageAgent::setShowPaintRects(ErrorString&, bool show)
</ins><span class="cx"> {
</span><span class="cx"> m_showPaintRects = show;
</span><span class="cx"> m_client->setShowPaintRects(show);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (m_client->overridesShowPaintRects())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_overlay->setShowingPaintRects(show);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::canShowDebugBorders(ErrorString*, bool* outParam)
</del><ins>+void InspectorPageAgent::canShowDebugBorders(ErrorString&, bool* outParam)
</ins><span class="cx"> {
</span><span class="cx"> *outParam = m_client->canShowDebugBorders();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::setShowDebugBorders(ErrorString*, bool show)
</del><ins>+void InspectorPageAgent::setShowDebugBorders(ErrorString&, bool show)
</ins><span class="cx"> {
</span><span class="cx"> m_client->setShowDebugBorders(show);
</span><span class="cx"> if (mainFrame() && mainFrame()->view())
</span><span class="cx"> mainFrame()->view()->invalidate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::canShowFPSCounter(ErrorString*, bool* outParam)
</del><ins>+void InspectorPageAgent::canShowFPSCounter(ErrorString&, bool* outParam)
</ins><span class="cx"> {
</span><span class="cx"> *outParam = m_client->canShowFPSCounter();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::setShowFPSCounter(ErrorString*, bool show)
</del><ins>+void InspectorPageAgent::setShowFPSCounter(ErrorString&, bool show)
</ins><span class="cx"> {
</span><span class="cx"> m_client->setShowFPSCounter(show);
</span><span class="cx">
</span><span class="lines">@@ -684,12 +685,12 @@
</span><span class="cx"> mainFrame()->view()->invalidate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::canContinuouslyPaint(ErrorString*, bool* outParam)
</del><ins>+void InspectorPageAgent::canContinuouslyPaint(ErrorString&, bool* outParam)
</ins><span class="cx"> {
</span><span class="cx"> *outParam = m_client->canContinuouslyPaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::setContinuousPaintingEnabled(ErrorString*, bool enabled)
</del><ins>+void InspectorPageAgent::setContinuousPaintingEnabled(ErrorString&, bool enabled)
</ins><span class="cx"> {
</span><span class="cx"> m_client->setContinuousPaintingEnabled(enabled);
</span><span class="cx">
</span><span class="lines">@@ -697,7 +698,7 @@
</span><span class="cx"> mainFrame()->view()->invalidate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::getScriptExecutionStatus(ErrorString*, InspectorPageBackendDispatcherHandler::Result* status)
</del><ins>+void InspectorPageAgent::getScriptExecutionStatus(ErrorString&, InspectorPageBackendDispatcherHandler::Result* status)
</ins><span class="cx"> {
</span><span class="cx"> bool disabledByScriptController = false;
</span><span class="cx"> bool disabledInSettings = false;
</span><span class="lines">@@ -718,7 +719,7 @@
</span><span class="cx"> *status = InspectorPageBackendDispatcherHandler::Result::Forbidden;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::setScriptExecutionDisabled(ErrorString*, bool value)
</del><ins>+void InspectorPageAgent::setScriptExecutionDisabled(ErrorString&, bool value)
</ins><span class="cx"> {
</span><span class="cx"> if (!mainFrame())
</span><span class="cx"> return;
</span><span class="lines">@@ -829,21 +830,21 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Frame* InspectorPageAgent::assertFrame(ErrorString* errorString, const String& frameId)
</del><ins>+Frame* InspectorPageAgent::assertFrame(ErrorString& errorString, const String& frameId)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = frameForId(frameId);
</span><span class="cx"> if (!frame)
</span><del>- *errorString = "No frame for given id found";
</del><ins>+ errorString = ASCIILiteral("No frame for given id found");
</ins><span class="cx"> return frame;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // static
</span><del>-DocumentLoader* InspectorPageAgent::assertDocumentLoader(ErrorString* errorString, Frame* frame)
</del><ins>+DocumentLoader* InspectorPageAgent::assertDocumentLoader(ErrorString& errorString, Frame* frame)
</ins><span class="cx"> {
</span><span class="cx"> FrameLoader& frameLoader = frame->loader();
</span><span class="cx"> DocumentLoader* documentLoader = frameLoader.documentLoader();
</span><span class="cx"> if (!documentLoader)
</span><del>- *errorString = "No documentLoader for given frame found";
</del><ins>+ errorString = ASCIILiteral("No documentLoader for given frame found");
</ins><span class="cx"> return documentLoader;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -998,18 +999,18 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void InspectorPageAgent::setTouchEmulationEnabled(ErrorString* error, bool enabled)
</del><ins>+void InspectorPageAgent::setTouchEmulationEnabled(ErrorString& error, bool enabled)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> UNUSED_PARAM(error);
</span><span class="cx"> updateTouchEventEmulationInPage(enabled);
</span><span class="cx"> #else
</span><del>- *error = "Touch events emulation not supported";
</del><ins>+ error = ASCIILiteral("Touch events emulation not supported");
</ins><span class="cx"> UNUSED_PARAM(enabled);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::setEmulatedMedia(ErrorString*, const String& media)
</del><ins>+void InspectorPageAgent::setEmulatedMedia(ErrorString&, const String& media)
</ins><span class="cx"> {
</span><span class="cx"> if (media == m_emulatedMedia)
</span><span class="cx"> return;
</span><span class="lines">@@ -1028,18 +1029,18 @@
</span><span class="cx"> *media = m_emulatedMedia;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::getCompositingBordersVisible(ErrorString*, bool* outParam)
</del><ins>+void InspectorPageAgent::getCompositingBordersVisible(ErrorString&, bool* outParam)
</ins><span class="cx"> {
</span><span class="cx"> *outParam = m_page->settings().showDebugBorders() || m_page->settings().showRepaintCounter();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::setCompositingBordersVisible(ErrorString*, bool visible)
</del><ins>+void InspectorPageAgent::setCompositingBordersVisible(ErrorString&, bool visible)
</ins><span class="cx"> {
</span><span class="cx"> m_page->settings().setShowDebugBorders(visible);
</span><span class="cx"> m_page->settings().setShowRepaintCounter(visible);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::snapshotNode(ErrorString* errorString, int nodeId, String* outDataURL)
</del><ins>+void InspectorPageAgent::snapshotNode(ErrorString& errorString, int nodeId, String* outDataURL)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = mainFrame();
</span><span class="cx"> ASSERT(frame);
</span><span class="lines">@@ -1052,14 +1053,14 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ImageBuffer> snapshot = WebCore::snapshotNode(*frame, *node);
</span><span class="cx"> if (!snapshot) {
</span><del>- *errorString = ASCIILiteral("Could not capture snapshot");
</del><ins>+ errorString = ASCIILiteral("Could not capture snapshot");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> *outDataURL = snapshot->toDataURL(ASCIILiteral("image/png"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::snapshotRect(ErrorString* errorString, int x, int y, int width, int height, const String& coordinateSystem, String* outDataURL)
</del><ins>+void InspectorPageAgent::snapshotRect(ErrorString& errorString, int x, int y, int width, int height, const String& coordinateSystem, String* outDataURL)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = mainFrame();
</span><span class="cx"> ASSERT(frame);
</span><span class="lines">@@ -1072,31 +1073,31 @@
</span><span class="cx"> std::unique_ptr<ImageBuffer> snapshot = snapshotFrameRect(*frame, rectangle, options);
</span><span class="cx">
</span><span class="cx"> if (!snapshot) {
</span><del>- *errorString = ASCIILiteral("Could not capture snapshot");
</del><ins>+ errorString = ASCIILiteral("Could not capture snapshot");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> *outDataURL = snapshot->toDataURL(ASCIILiteral("image/png"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::handleJavaScriptDialog(ErrorString* errorString, bool accept, const String* promptText)
</del><ins>+void InspectorPageAgent::handleJavaScriptDialog(ErrorString& errorString, bool accept, const String* promptText)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client->handleJavaScriptDialog(accept, promptText))
</span><del>- *errorString = "Could not handle JavaScript dialog";
</del><ins>+ errorString = ASCIILiteral("Could not handle JavaScript dialog");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorPageAgent::archive(ErrorString* errorString, String* data)
</del><ins>+void InspectorPageAgent::archive(ErrorString& errorString, String* data)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = mainFrame();
</span><span class="cx"> if (!frame) {
</span><del>- *errorString = "No main frame";
</del><ins>+ errorString = ASCIILiteral("No main frame");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) && USE(CF)
</span><span class="cx"> RefPtr<LegacyWebArchive> archive = LegacyWebArchive::create(frame);
</span><span class="cx"> if (!archive) {
</span><del>- *errorString = "Could not create web archive for main frame";
</del><ins>+ errorString = ASCIILiteral("Could not create web archive for main frame");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1104,7 +1105,7 @@
</span><span class="cx"> *data = base64Encode(CFDataGetBytePtr(buffer.get()), CFDataGetLength(buffer.get()));
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(data);
</span><del>- *errorString = "No support for creating archives";
</del><ins>+ errorString = ASCIILiteral("No support for creating archives");
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> static bool cachedResourceContent(CachedResource*, String* result, bool* base64Encoded);
</span><span class="cx"> static bool sharedBufferContent(PassRefPtr<SharedBuffer>, const String& textEncodingName, bool withBase64Encode, String* result);
</span><del>- static void resourceContent(ErrorString*, Frame*, const URL&, String* result, bool* base64Encoded);
</del><ins>+ static void resourceContent(ErrorString&, Frame*, const URL&, String* result, bool* base64Encoded);
</ins><span class="cx"> static String sourceMapURLForResource(CachedResource*);
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<SharedBuffer> resourceData(Frame*, const URL&, String* textEncodingName);
</span><span class="lines">@@ -95,36 +95,36 @@
</span><span class="cx"> static Inspector::Protocol::Page::ResourceType cachedResourceTypeJson(const CachedResource&);
</span><span class="cx">
</span><span class="cx"> // Page API for InspectorFrontend
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- virtual void addScriptToEvaluateOnLoad(ErrorString*, const String& source, String* result) override;
- virtual void removeScriptToEvaluateOnLoad(ErrorString*, const String& identifier) override;
- virtual void reload(ErrorString*, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad) override;
- virtual void navigate(ErrorString*, const String& url) override;
- virtual void getCookies(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>>& cookies) override;
- virtual void deleteCookie(ErrorString*, const String& cookieName, const String& url) override;
- virtual void getResourceTree(ErrorString*, RefPtr<Inspector::Protocol::Page::FrameResourceTree>&) override;
- virtual void getResourceContent(ErrorString*, const String& frameId, const String& url, String* content, bool* base64Encoded) override;
- virtual void searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) override;
- virtual void searchInResources(ErrorString*, const String&, const bool* caseSensitive, const bool* isRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>>&) override;
- virtual void setDocumentContent(ErrorString*, const String& frameId, const String& html) override;
- virtual void setShowPaintRects(ErrorString*, bool show) override;
- virtual void canShowDebugBorders(ErrorString*, bool*) override;
- virtual void setShowDebugBorders(ErrorString*, bool show) override;
- virtual void canShowFPSCounter(ErrorString*, bool*) override;
- virtual void setShowFPSCounter(ErrorString*, bool show) override;
- virtual void canContinuouslyPaint(ErrorString*, bool*) override;
- virtual void setContinuousPaintingEnabled(ErrorString*, bool enabled) override;
- virtual void getScriptExecutionStatus(ErrorString*, Inspector::InspectorPageBackendDispatcherHandler::Result*) override;
- virtual void setScriptExecutionDisabled(ErrorString*, bool) override;
- virtual void setTouchEmulationEnabled(ErrorString*, bool) override;
- virtual void setEmulatedMedia(ErrorString*, const String&) override;
- virtual void getCompositingBordersVisible(ErrorString*, bool* out_param) override;
- virtual void setCompositingBordersVisible(ErrorString*, bool) override;
- virtual void snapshotNode(ErrorString*, int nodeId, String* outDataURL) override;
- virtual void snapshotRect(ErrorString*, int x, int y, int width, int height, const String& coordinateSystem, String* outDataURL) override;
- virtual void handleJavaScriptDialog(ErrorString*, bool accept, const String* promptText) override;
- virtual void archive(ErrorString*, String* data) override;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
+ virtual void addScriptToEvaluateOnLoad(ErrorString&, const String& source, String* result) override;
+ virtual void removeScriptToEvaluateOnLoad(ErrorString&, const String& identifier) override;
+ virtual void reload(ErrorString&, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad) override;
+ virtual void navigate(ErrorString&, const String& url) override;
+ virtual void getCookies(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::Cookie>>& cookies) override;
+ virtual void deleteCookie(ErrorString&, const String& cookieName, const String& url) override;
+ virtual void getResourceTree(ErrorString&, RefPtr<Inspector::Protocol::Page::FrameResourceTree>&) override;
+ virtual void getResourceContent(ErrorString&, const String& frameId, const String& url, String* content, bool* base64Encoded) override;
+ virtual void searchInResource(ErrorString&, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::GenericTypes::SearchMatch>>&) override;
+ virtual void searchInResources(ErrorString&, const String&, const bool* caseSensitive, const bool* isRegex, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Page::SearchResult>>&) override;
+ virtual void setDocumentContent(ErrorString&, const String& frameId, const String& html) override;
+ virtual void setShowPaintRects(ErrorString&, bool show) override;
+ virtual void canShowDebugBorders(ErrorString&, bool*) override;
+ virtual void setShowDebugBorders(ErrorString&, bool show) override;
+ virtual void canShowFPSCounter(ErrorString&, bool*) override;
+ virtual void setShowFPSCounter(ErrorString&, bool show) override;
+ virtual void canContinuouslyPaint(ErrorString&, bool*) override;
+ virtual void setContinuousPaintingEnabled(ErrorString&, bool enabled) override;
+ virtual void getScriptExecutionStatus(ErrorString&, Inspector::InspectorPageBackendDispatcherHandler::Result*) override;
+ virtual void setScriptExecutionDisabled(ErrorString&, bool) override;
+ virtual void setTouchEmulationEnabled(ErrorString&, bool) override;
+ virtual void setEmulatedMedia(ErrorString&, const String&) override;
+ virtual void getCompositingBordersVisible(ErrorString&, bool* out_param) override;
+ virtual void setCompositingBordersVisible(ErrorString&, bool) override;
+ virtual void snapshotNode(ErrorString&, int nodeId, String* outDataURL) override;
+ virtual void snapshotRect(ErrorString&, int x, int y, int width, int height, const String& coordinateSystem, String* outDataURL) override;
+ virtual void handleJavaScriptDialog(ErrorString&, bool accept, const String* promptText) override;
+ virtual void archive(ErrorString&, String* data) override;
</ins><span class="cx">
</span><span class="cx"> // InspectorInstrumentation API
</span><span class="cx"> void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld&);
</span><span class="lines">@@ -159,8 +159,8 @@
</span><span class="cx"> bool hasIdForFrame(Frame*) const;
</span><span class="cx"> String loaderId(DocumentLoader*);
</span><span class="cx"> Frame* findFrameWithSecurityOrigin(const String& originRawString);
</span><del>- Frame* assertFrame(ErrorString*, const String& frameId);
- static DocumentLoader* assertDocumentLoader(ErrorString*, Frame*);
</del><ins>+ Frame* assertFrame(ErrorString&, const String& frameId);
+ static DocumentLoader* assertDocumentLoader(ErrorString&, Frame*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -317,83 +317,83 @@
</span><span class="cx"> m_frontendDispatcher->playbackFinished();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::startCapturing(ErrorString* errorString)
</del><ins>+void InspectorReplayAgent::startCapturing(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (sessionState() != WebCore::SessionState::Inactive) {
</span><del>- *errorString = ASCIILiteral("Can't start capturing if the session is already capturing or replaying.");
</del><ins>+ errorString = ASCIILiteral("Can't start capturing if the session is already capturing or replaying.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_page.replayController().startCapturing();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::stopCapturing(ErrorString* errorString)
</del><ins>+void InspectorReplayAgent::stopCapturing(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (sessionState() != WebCore::SessionState::Capturing) {
</span><del>- *errorString = ASCIILiteral("Can't stop capturing if capture is not in progress.");
</del><ins>+ errorString = ASCIILiteral("Can't stop capturing if capture is not in progress.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</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><del>- *errorString = ASCIILiteral("Couldn't decode ReplayPosition segment offset provided to ReplayAgent.replayToPosition.");
</del><ins>+ errorString = ASCIILiteral("Couldn't decode ReplayPosition segment offset provided to ReplayAgent.replayToPosition.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!positionObject->getInteger(ASCIILiteral("inputOffset"), position.inputOffset)) {
</span><del>- *errorString = ASCIILiteral("Couldn't decode ReplayPosition input offset provided to ReplayAgent.replayToPosition.");
</del><ins>+ errorString = ASCIILiteral("Couldn't decode ReplayPosition input offset provided to ReplayAgent.replayToPosition.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (sessionState() == WebCore::SessionState::Capturing) {
</span><del>- *errorString = ASCIILiteral("Can't start replay while capture is in progress.");
</del><ins>+ errorString = ASCIILiteral("Can't start replay while capture is in progress.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_page.replayController().replayToPosition(position, (fastReplay) ? DispatchSpeed::FastForward : DispatchSpeed::RealTime);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::replayToCompletion(ErrorString* errorString, bool fastReplay)
</del><ins>+void InspectorReplayAgent::replayToCompletion(ErrorString& errorString, bool fastReplay)
</ins><span class="cx"> {
</span><span class="cx"> if (sessionState() == WebCore::SessionState::Capturing) {
</span><del>- *errorString = ASCIILiteral("Can't start replay while capture is in progress.");
</del><ins>+ errorString = ASCIILiteral("Can't start replay while capture is in progress.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_page.replayController().replayToCompletion((fastReplay) ? DispatchSpeed::FastForward : DispatchSpeed::RealTime);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::pausePlayback(ErrorString* errorString)
</del><ins>+void InspectorReplayAgent::pausePlayback(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (sessionState() != WebCore::SessionState::Replaying) {
</span><del>- *errorString = ASCIILiteral("Can't pause playback if playback is not in progress.");
</del><ins>+ errorString = ASCIILiteral("Can't pause playback if playback is not in progress.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_page.replayController().pausePlayback();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::cancelPlayback(ErrorString* errorString)
</del><ins>+void InspectorReplayAgent::cancelPlayback(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (sessionState() == WebCore::SessionState::Capturing) {
</span><del>- *errorString = ASCIILiteral("Can't cancel playback if capture is in progress.");
</del><ins>+ errorString = ASCIILiteral("Can't cancel playback if capture is in progress.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_page.replayController().cancelPlayback();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::switchSession(ErrorString* errorString, Inspector::Protocol::Replay::SessionIdentifier identifier)
</del><ins>+void InspectorReplayAgent::switchSession(ErrorString& errorString, Inspector::Protocol::Replay::SessionIdentifier identifier)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(identifier > 0);
</span><span class="cx">
</span><span class="cx"> if (sessionState() != WebCore::SessionState::Inactive) {
</span><del>- *errorString = ASCIILiteral("Can't switch sessions unless the session is neither capturing or replaying.");
</del><ins>+ errorString = ASCIILiteral("Can't switch sessions unless the session is neither capturing or replaying.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> m_page.replayController().switchSession(session);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::insertSessionSegment(ErrorString* errorString, Inspector::Protocol::Replay::SessionIdentifier sessionIdentifier, SegmentIdentifier segmentIdentifier, int segmentIndex)
</del><ins>+void InspectorReplayAgent::insertSessionSegment(ErrorString& errorString, Inspector::Protocol::Replay::SessionIdentifier sessionIdentifier, SegmentIdentifier segmentIdentifier, int segmentIndex)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(sessionIdentifier > 0);
</span><span class="cx"> ASSERT(segmentIdentifier > 0);
</span><span class="lines">@@ -417,12 +417,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (static_cast<size_t>(segmentIndex) > session->size()) {
</span><del>- *errorString = ASCIILiteral("Invalid segment index.");
</del><ins>+ errorString = ASCIILiteral("Invalid segment index.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (session == m_page.replayController().loadedSession() && sessionState() != WebCore::SessionState::Inactive) {
</span><del>- *errorString = ASCIILiteral("Can't modify a loaded session unless the session is inactive.");
</del><ins>+ errorString = ASCIILiteral("Can't modify a loaded session unless the session is inactive.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> sessionModified(session);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::removeSessionSegment(ErrorString* errorString, Inspector::Protocol::Replay::SessionIdentifier identifier, int segmentIndex)
</del><ins>+void InspectorReplayAgent::removeSessionSegment(ErrorString& errorString, Inspector::Protocol::Replay::SessionIdentifier identifier, int segmentIndex)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(identifier > 0);
</span><span class="cx"> ASSERT(segmentIndex >= 0);
</span><span class="lines">@@ -441,12 +441,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (static_cast<size_t>(segmentIndex) >= session->size()) {
</span><del>- *errorString = ASCIILiteral("Invalid segment index.");
</del><ins>+ errorString = ASCIILiteral("Invalid segment index.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (session == m_page.replayController().loadedSession() && sessionState() != WebCore::SessionState::Inactive) {
</span><del>- *errorString = ASCIILiteral("Can't modify a loaded session unless the session is inactive.");
</del><ins>+ errorString = ASCIILiteral("Can't modify a loaded session unless the session is inactive.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -454,33 +454,33 @@
</span><span class="cx"> sessionModified(session);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ReplaySession> InspectorReplayAgent::findSession(ErrorString* errorString, SessionIdentifier identifier)
</del><ins>+PassRefPtr<ReplaySession> InspectorReplayAgent::findSession(ErrorString& errorString, SessionIdentifier identifier)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(identifier > 0);
</span><span class="cx">
</span><span class="cx"> auto it = m_sessionsMap.find(identifier);
</span><span class="cx"> if (it == m_sessionsMap.end()) {
</span><del>- *errorString = ASCIILiteral("Couldn't find session with specified identifier");
</del><ins>+ errorString = ASCIILiteral("Couldn't find session with specified identifier");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return it->value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ReplaySessionSegment> InspectorReplayAgent::findSegment(ErrorString* errorString, SegmentIdentifier identifier)
</del><ins>+PassRefPtr<ReplaySessionSegment> InspectorReplayAgent::findSegment(ErrorString& errorString, SegmentIdentifier identifier)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(identifier > 0);
</span><span class="cx">
</span><span class="cx"> auto it = m_segmentsMap.find(identifier);
</span><span class="cx"> if (it == m_segmentsMap.end()) {
</span><del>- *errorString = ASCIILiteral("Couldn't find segment with specified identifier");
</del><ins>+ errorString = ASCIILiteral("Couldn't find segment with specified identifier");
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return it->value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::currentReplayState(ErrorString*, Inspector::Protocol::Replay::SessionIdentifier* sessionIdentifier, Inspector::Protocol::OptOutput<Inspector::Protocol::Replay::SegmentIdentifier>* segmentIdentifier, Inspector::Protocol::Replay::SessionState* sessionState, Inspector::Protocol::Replay::SegmentState* segmentState, RefPtr<Inspector::Protocol::Replay::ReplayPosition>& replayPosition)
</del><ins>+void InspectorReplayAgent::currentReplayState(ErrorString&, Inspector::Protocol::Replay::SessionIdentifier* sessionIdentifier, Inspector::Protocol::OptOutput<Inspector::Protocol::Replay::SegmentIdentifier>* segmentIdentifier, Inspector::Protocol::Replay::SessionState* sessionState, Inspector::Protocol::Replay::SegmentState* segmentState, RefPtr<Inspector::Protocol::Replay::ReplayPosition>& replayPosition)
</ins><span class="cx"> {
</span><span class="cx"> *sessionState = buildInspectorObjectForSessionState(m_page.replayController().sessionState());
</span><span class="cx"> *segmentState = buildInspectorObjectForSegmentState(m_page.replayController().segmentState());
</span><span class="lines">@@ -492,29 +492,29 @@
</span><span class="cx"> replayPosition = buildInspectorObjectForPosition(m_page.replayController().currentPosition());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::getAvailableSessions(ErrorString*, RefPtr<Inspector::Protocol::Array<SessionIdentifier>>& sessionsList)
</del><ins>+void InspectorReplayAgent::getAvailableSessions(ErrorString&, RefPtr<Inspector::Protocol::Array<SessionIdentifier>>& sessionsList)
</ins><span class="cx"> {
</span><span class="cx"> sessionsList = Inspector::Protocol::Array<Inspector::Protocol::Replay::SessionIdentifier>::create();
</span><span class="cx"> for (auto& pair : m_sessionsMap)
</span><span class="cx"> sessionsList->addItem(pair.key);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::getSessionData(ErrorString* errorString, Inspector::Protocol::Replay::SessionIdentifier identifier, RefPtr<Inspector::Protocol::Replay::ReplaySession>& serializedObject)
</del><ins>+void InspectorReplayAgent::getSessionData(ErrorString& errorString, Inspector::Protocol::Replay::SessionIdentifier identifier, RefPtr<Inspector::Protocol::Replay::ReplaySession>& serializedObject)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ReplaySession> session = findSession(errorString, identifier);
</span><span class="cx"> if (!session) {
</span><del>- *errorString = ASCIILiteral("Couldn't find the specified session.");
</del><ins>+ errorString = ASCIILiteral("Couldn't find the specified session.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> serializedObject = buildInspectorObjectForSession(session);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorReplayAgent::getSegmentData(ErrorString* errorString, Inspector::Protocol::Replay::SegmentIdentifier identifier, RefPtr<Inspector::Protocol::Replay::SessionSegment>& serializedObject)
</del><ins>+void InspectorReplayAgent::getSegmentData(ErrorString& errorString, Inspector::Protocol::Replay::SegmentIdentifier identifier, RefPtr<Inspector::Protocol::Replay::SessionSegment>& serializedObject)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ReplaySessionSegment> segment = findSegment(errorString, identifier);
</span><span class="cx"> if (!segment) {
</span><del>- *errorString = ASCIILiteral("Couldn't find the specified segment.");
</del><ins>+ errorString = ASCIILiteral("Couldn't find the specified segment.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -92,26 +92,26 @@
</span><span class="cx"> void playbackFinished();
</span><span class="cx">
</span><span class="cx"> // Calls from the Inspector frontend.
</span><del>- virtual void startCapturing(ErrorString*) override;
- virtual void stopCapturing(ErrorString*) override;
</del><ins>+ virtual void startCapturing(ErrorString&) override;
+ virtual void stopCapturing(ErrorString&) override;
</ins><span class="cx">
</span><del>- virtual void replayToPosition(ErrorString*, const RefPtr<Inspector::InspectorObject>&, bool shouldFastForward) override;
- virtual void replayToCompletion(ErrorString*, bool shouldFastForward) override;
- virtual void pausePlayback(ErrorString*) override;
- virtual void cancelPlayback(ErrorString*) override;
</del><ins>+ virtual void replayToPosition(ErrorString&, const RefPtr<Inspector::InspectorObject>&, bool shouldFastForward) override;
+ virtual void replayToCompletion(ErrorString&, bool shouldFastForward) override;
+ virtual void pausePlayback(ErrorString&) override;
+ virtual void cancelPlayback(ErrorString&) override;
</ins><span class="cx">
</span><del>- virtual void switchSession(ErrorString*, SessionIdentifier) override;
- virtual void insertSessionSegment(ErrorString*, Inspector::Protocol::Replay::SessionIdentifier, Inspector::Protocol::Replay::SegmentIdentifier, int segmentIndex) override;
- virtual void removeSessionSegment(ErrorString*, Inspector::Protocol::Replay::SessionIdentifier, int segmentIndex) override;
</del><ins>+ virtual void switchSession(ErrorString&, SessionIdentifier) override;
+ virtual void insertSessionSegment(ErrorString&, Inspector::Protocol::Replay::SessionIdentifier, Inspector::Protocol::Replay::SegmentIdentifier, int segmentIndex) override;
+ virtual void removeSessionSegment(ErrorString&, Inspector::Protocol::Replay::SessionIdentifier, int segmentIndex) override;
</ins><span class="cx">
</span><del>- virtual void currentReplayState(ErrorString*, Inspector::Protocol::Replay::SessionIdentifier*, Inspector::Protocol::OptOutput<Inspector::Protocol::Replay::SegmentIdentifier>*, Inspector::Protocol::Replay::SessionState*, Inspector::Protocol::Replay::SegmentState* segmentState, RefPtr<Inspector::Protocol::Replay::ReplayPosition>&) override;
- virtual void getAvailableSessions(ErrorString*, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::SessionIdentifier>>&) override;
- virtual void getSessionData(ErrorString*, Inspector::Protocol::Replay::SessionIdentifier, RefPtr<Inspector::Protocol::Replay::ReplaySession>&) override;
- virtual void getSegmentData(ErrorString*, Inspector::Protocol::Replay::SegmentIdentifier, RefPtr<Inspector::Protocol::Replay::SessionSegment>&) override;
</del><ins>+ virtual void currentReplayState(ErrorString&, Inspector::Protocol::Replay::SessionIdentifier*, Inspector::Protocol::OptOutput<Inspector::Protocol::Replay::SegmentIdentifier>*, Inspector::Protocol::Replay::SessionState*, Inspector::Protocol::Replay::SegmentState* segmentState, RefPtr<Inspector::Protocol::Replay::ReplayPosition>&) override;
+ virtual void getAvailableSessions(ErrorString&, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Replay::SessionIdentifier>>&) override;
+ virtual void getSessionData(ErrorString&, Inspector::Protocol::Replay::SessionIdentifier, RefPtr<Inspector::Protocol::Replay::ReplaySession>&) override;
+ virtual void getSegmentData(ErrorString&, Inspector::Protocol::Replay::SegmentIdentifier, RefPtr<Inspector::Protocol::Replay::SessionSegment>&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- PassRefPtr<ReplaySession> findSession(ErrorString*, SessionIdentifier);
- PassRefPtr<ReplaySessionSegment> findSegment(ErrorString*, SegmentIdentifier);
</del><ins>+ PassRefPtr<ReplaySession> findSession(ErrorString&, SessionIdentifier);
+ PassRefPtr<ReplaySessionSegment> findSegment(ErrorString&, SegmentIdentifier);
</ins><span class="cx"> WebCore::SessionState sessionState() const;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Inspector::InspectorReplayFrontendDispatcher> m_frontendDispatcher;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -188,8 +188,8 @@
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><del>- ErrorString error;
- disable(&error);
</del><ins>+ ErrorString unused;
+ disable(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<InspectorObject> buildObjectForHeaders(const HTTPHeaderMap& headers)
</span><span class="lines">@@ -270,8 +270,8 @@
</span><span class="cx"> InspectorResourceAgent::~InspectorResourceAgent()
</span><span class="cx"> {
</span><span class="cx"> if (m_enabled) {
</span><del>- ErrorString error;
- disable(&error);
</del><ins>+ ErrorString unused;
+ disable(unused);
</ins><span class="cx"> }
</span><span class="cx"> ASSERT(!m_instrumentingAgents->inspectorResourceAgent());
</span><span class="cx"> }
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_SOCKETS)
</span><span class="cx">
</span><del>-void InspectorResourceAgent::enable(ErrorString*)
</del><ins>+void InspectorResourceAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> enable();
</span><span class="cx"> }
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx"> m_instrumentingAgents->setInspectorResourceAgent(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::disable(ErrorString*)
</del><ins>+void InspectorResourceAgent::disable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> m_instrumentingAgents->setInspectorResourceAgent(nullptr);
</span><span class="lines">@@ -651,16 +651,16 @@
</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><span class="cx"> m_extraRequestHeaders = headers;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::getResponseBody(ErrorString* errorString, const String& requestId, String* content, bool* base64Encoded)
</del><ins>+void InspectorResourceAgent::getResponseBody(ErrorString& errorString, const String& requestId, String* content, bool* base64Encoded)
</ins><span class="cx"> {
</span><span class="cx"> NetworkResourcesData::ResourceData const* resourceData = m_resourcesData->data(requestId);
</span><span class="cx"> if (!resourceData) {
</span><del>- *errorString = "No resource with given identifier found";
</del><ins>+ errorString = ASCIILiteral("No resource with given identifier found");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -671,7 +671,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (resourceData->isContentEvicted()) {
</span><del>- *errorString = "Request content was evicted from inspector cache";
</del><ins>+ errorString = ASCIILiteral("Request content was evicted from inspector cache");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -686,10 +686,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- *errorString = "No data found for resource with given identifier";
</del><ins>+ errorString = ASCIILiteral("No data found for resource with given identifier");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::replayXHR(ErrorString*, const String& requestId)
</del><ins>+void InspectorResourceAgent::replayXHR(ErrorString&, const String& requestId)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<XMLHttpRequest> xhr = XMLHttpRequest::create(*m_pageAgent->mainFrame()->document());
</span><span class="cx"> String actualRequestId = requestId;
</span><span class="lines">@@ -713,34 +713,34 @@
</span><span class="cx"> xhr->sendForInspectorXHRReplay(xhrReplayData->formData(), IGNORE_EXCEPTION);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::canClearBrowserCache(ErrorString*, bool* result)
</del><ins>+void InspectorResourceAgent::canClearBrowserCache(ErrorString&, bool* result)
</ins><span class="cx"> {
</span><span class="cx"> *result = m_client->canClearBrowserCache();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::clearBrowserCache(ErrorString*)
</del><ins>+void InspectorResourceAgent::clearBrowserCache(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_client->clearBrowserCache();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::canClearBrowserCookies(ErrorString*, bool* result)
</del><ins>+void InspectorResourceAgent::canClearBrowserCookies(ErrorString&, bool* result)
</ins><span class="cx"> {
</span><span class="cx"> *result = m_client->canClearBrowserCookies();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::clearBrowserCookies(ErrorString*)
</del><ins>+void InspectorResourceAgent::clearBrowserCookies(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_client->clearBrowserCookies();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorResourceAgent::setCacheDisabled(ErrorString*, bool cacheDisabled)
</del><ins>+void InspectorResourceAgent::setCacheDisabled(ErrorString&, bool cacheDisabled)
</ins><span class="cx"> {
</span><span class="cx"> m_cacheDisabled = cacheDisabled;
</span><span class="cx"> if (cacheDisabled)
</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, PassRefPtr<LoadResourceCallback> prpCallback)
</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">@@ -748,7 +748,7 @@
</span><span class="cx">
</span><span class="cx"> Document* document = frame->document();
</span><span class="cx"> if (!document) {
</span><del>- *errorString = ASCIILiteral("No Document instance for the specified frame");
</del><ins>+ errorString = ASCIILiteral("No Document instance for the specified frame");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -123,17 +123,17 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Called from frontend.
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- virtual void setExtraHTTPHeaders(ErrorString*, const RefPtr<Inspector::InspectorObject>&) override;
- virtual void getResponseBody(ErrorString*, const String& requestId, String* content, bool* base64Encoded) override;
- virtual void replayXHR(ErrorString*, const String& requestId) override;
- virtual void canClearBrowserCache(ErrorString*, bool*) override;
- virtual void clearBrowserCache(ErrorString*) override;
- virtual void canClearBrowserCookies(ErrorString*, bool*) override;
- virtual void clearBrowserCookies(ErrorString*) override;
- virtual void setCacheDisabled(ErrorString*, bool cacheDisabled) override;
- virtual void loadResource(ErrorString*, const String& frameId, const String& url, PassRefPtr<LoadResourceCallback>) override;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
+ virtual void setExtraHTTPHeaders(ErrorString&, const RefPtr<Inspector::InspectorObject>&) override;
+ virtual void getResponseBody(ErrorString&, const String& requestId, String* content, bool* base64Encoded) override;
+ virtual void replayXHR(ErrorString&, const String& requestId) override;
+ virtual void canClearBrowserCache(ErrorString&, bool*) override;
+ virtual void clearBrowserCache(ErrorString&) override;
+ virtual void canClearBrowserCookies(ErrorString&, bool*) override;
+ virtual void clearBrowserCookies(ErrorString&) override;
+ virtual void setCacheDisabled(ErrorString&, bool cacheDisabled) override;
+ 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 (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -1378,7 +1378,7 @@
</span><span class="cx">
</span><span class="cx"> String error;
</span><span class="cx"> bool base64Encoded;
</span><del>- InspectorPageAgent::resourceContent(&error, ownerDocument()->frame(), URL(ParsedURLString, m_pageStyleSheet->href()), result, &base64Encoded);
</del><ins>+ InspectorPageAgent::resourceContent(error, ownerDocument()->frame(), URL(ParsedURLString, m_pageStyleSheet->href()), result, &base64Encoded);
</ins><span class="cx"> return error.isEmpty() && !base64Encoded;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -93,18 +93,18 @@
</span><span class="cx"> m_scriptDebugServer->recompileAllJSFunctions();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ErrorString error;
- stop(&error);
</del><ins>+ ErrorString unused;
+ stop(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::start(ErrorString*, const int* maxCallStackDepth)
</del><ins>+void InspectorTimelineAgent::start(ErrorString&, const int* maxCallStackDepth)
</ins><span class="cx"> {
</span><span class="cx"> m_enabledFromFrontend = true;
</span><span class="cx">
</span><span class="cx"> internalStart(maxCallStackDepth);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::stop(ErrorString*)
</del><ins>+void InspectorTimelineAgent::stop(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> internalStop();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -141,8 +141,8 @@
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</span><span class="cx">
</span><del>- virtual void start(ErrorString* = nullptr, const int* maxCallStackDepth = nullptr) override;
- virtual void stop(ErrorString* = nullptr) override;
</del><ins>+ virtual void start(ErrorString&, const int* maxCallStackDepth = nullptr) override;
+ virtual void stop(ErrorString&) override;
</ins><span class="cx">
</span><span class="cx"> int id() const { return m_id; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -126,13 +126,14 @@
</span><span class="cx"> void InspectorWorkerAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
</span><span class="cx"> {
</span><span class="cx"> m_shouldPauseDedicatedWorkerOnStart = false;
</span><del>- disable(nullptr);
</del><ins>+ ErrorString unused;
+ disable(unused);
</ins><span class="cx">
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorWorkerAgent::enable(ErrorString*)
</del><ins>+void InspectorWorkerAgent::enable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_enabled = true;
</span><span class="cx"> if (!m_frontendDispatcher)
</span><span class="lines">@@ -141,7 +142,7 @@
</span><span class="cx"> createWorkerFrontendChannelsForExistingWorkers();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorWorkerAgent::disable(ErrorString*)
</del><ins>+void InspectorWorkerAgent::disable(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> if (!m_frontendDispatcher)
</span><span class="lines">@@ -150,39 +151,39 @@
</span><span class="cx"> destroyWorkerFrontendChannels();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorWorkerAgent::canInspectWorkers(ErrorString*, bool* result)
</del><ins>+void InspectorWorkerAgent::canInspectWorkers(ErrorString&, bool* result)
</ins><span class="cx"> {
</span><span class="cx"> *result = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorWorkerAgent::connectToWorker(ErrorString* error, int workerId)
</del><ins>+void InspectorWorkerAgent::connectToWorker(ErrorString& error, int workerId)
</ins><span class="cx"> {
</span><span class="cx"> WorkerFrontendChannel* channel = m_idToChannel.get(workerId);
</span><span class="cx"> if (channel)
</span><span class="cx"> channel->connectToWorkerGlobalScope();
</span><span class="cx"> else
</span><del>- *error = "Worker is gone";
</del><ins>+ error = ASCIILiteral("Worker is gone");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorWorkerAgent::disconnectFromWorker(ErrorString* error, int workerId)
</del><ins>+void InspectorWorkerAgent::disconnectFromWorker(ErrorString& error, int workerId)
</ins><span class="cx"> {
</span><span class="cx"> WorkerFrontendChannel* channel = m_idToChannel.get(workerId);
</span><span class="cx"> if (channel)
</span><span class="cx"> channel->disconnectFromWorkerGlobalScope();
</span><span class="cx"> else
</span><del>- *error = "Worker is gone";
</del><ins>+ error = ASCIILiteral("Worker is gone");
</ins><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 class="cx"> channel->proxy()->sendMessageToInspector(message->toJSONString());
</span><span class="cx"> else
</span><del>- *error = "Worker is gone";
</del><ins>+ error = ASCIILiteral("Worker is gone");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorWorkerAgent::setAutoconnectToWorkers(ErrorString*, bool value)
</del><ins>+void InspectorWorkerAgent::setAutoconnectToWorkers(ErrorString&, bool value)
</ins><span class="cx"> {
</span><span class="cx"> m_shouldPauseDedicatedWorkerOnStart = value;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -63,13 +63,13 @@
</span><span class="cx"> void workerGlobalScopeTerminated(WorkerGlobalScopeProxy*);
</span><span class="cx">
</span><span class="cx"> // Called from InspectorBackendDispatcher
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
- virtual void canInspectWorkers(ErrorString*, bool*) override;
- virtual void connectToWorker(ErrorString*, int workerId) override;
- virtual void disconnectFromWorker(ErrorString*, int workerId) override;
- virtual void sendMessageToWorker(ErrorString*, int workerId, const RefPtr<Inspector::InspectorObject>& message) override;
- virtual void setAutoconnectToWorkers(ErrorString*, bool value) override;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
+ virtual void canInspectWorkers(ErrorString&, bool*) override;
+ virtual void connectToWorker(ErrorString&, int workerId) override;
+ virtual void disconnectFromWorker(ErrorString&, int workerId) override;
+ virtual void sendMessageToWorker(ErrorString&, int workerId, const RefPtr<Inspector::InspectorObject>& message) override;
+ virtual void setAutoconnectToWorkers(ErrorString&, bool value) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void createWorkerFrontendChannelsForExistingWorkers();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageConsoleAgent::clearMessages(ErrorString* errorString)
</del><ins>+void PageConsoleAgent::clearMessages(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> m_inspectorDOMAgent->releaseDanglingNodes();
</span><span class="cx">
</span><span class="lines">@@ -66,11 +66,11 @@
</span><span class="cx"> RefPtr<Node> m_node;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void PageConsoleAgent::addInspectedNode(ErrorString* errorString, int nodeId)
</del><ins>+void PageConsoleAgent::addInspectedNode(ErrorString& errorString, int nodeId)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = m_inspectorDOMAgent->nodeForId(nodeId);
</span><span class="cx"> if (!node || node->isInShadowTree()) {
</span><del>- *errorString = ASCIILiteral("nodeId is not valid");
</del><ins>+ errorString = ASCIILiteral("nodeId is not valid");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -49,8 +49,8 @@
</span><span class="cx"> virtual bool isWorkerAgent() const override { return false; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void clearMessages(ErrorString*) override;
- virtual void addInspectedNode(ErrorString*, int nodeId) override;
</del><ins>+ virtual void clearMessages(ErrorString&) override;
+ virtual void addInspectedNode(ErrorString&, int nodeId) override;
</ins><span class="cx">
</span><span class="cx"> InspectorDOMAgent* m_inspectorDOMAgent;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> m_pageAgent->page()->console().addMessage(MessageSource::JS, MessageLevel::Log, message, createScriptCallStack(exec, ScriptCallStack::maxCallStackSizeToCapture));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InjectedScript PageDebuggerAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
</del><ins>+InjectedScript PageDebuggerAgent::injectedScriptForEval(ErrorString& errorString, const int* executionContextId)
</ins><span class="cx"> {
</span><span class="cx"> if (!executionContextId) {
</span><span class="cx"> JSC::ExecState* scriptState = mainWorldExecState(m_pageAgent->mainFrame());
</span><span class="lines">@@ -130,12 +130,12 @@
</span><span class="cx">
</span><span class="cx"> InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
</span><span class="cx"> if (injectedScript.hasNoValue())
</span><del>- *errorString = ASCIILiteral("Execution context with given id not found.");
</del><ins>+ errorString = ASCIILiteral("Execution context with given id not found.");
</ins><span class="cx">
</span><span class="cx"> return injectedScript;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageDebuggerAgent::setOverlayMessage(ErrorString*, const String* message)
</del><ins>+void PageDebuggerAgent::setOverlayMessage(ErrorString&, const String* message)
</ins><span class="cx"> {
</span><span class="cx"> m_overlay->setPausedInDebuggerMessage(message);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageDebuggerAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageDebuggerAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/PageDebuggerAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void breakpointActionLog(JSC::ExecState*, const String&) override;
</span><span class="cx">
</span><del>- virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
- virtual void setOverlayMessage(ErrorString*, const String*) override;
</del><ins>+ virtual Inspector::InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
+ virtual void setOverlayMessage(ErrorString&, const String*) override;
</ins><span class="cx">
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> InspectorOverlay* m_overlay;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -72,13 +72,13 @@
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher.clear();
</span><span class="cx">
</span><del>- String errorString;
- disable(&errorString);
</del><ins>+ String unused;
+ disable(unused);
</ins><span class="cx">
</span><span class="cx"> InspectorRuntimeAgent::willDestroyFrontendAndBackend(reason);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageRuntimeAgent::enable(ErrorString* errorString)
</del><ins>+void PageRuntimeAgent::enable(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (enabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> reportExecutionContextCreation();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageRuntimeAgent::disable(ErrorString* errorString)
</del><ins>+void PageRuntimeAgent::disable(ErrorString& errorString)
</ins><span class="cx"> {
</span><span class="cx"> if (!enabled())
</span><span class="cx"> return;
</span><span class="lines">@@ -128,19 +128,19 @@
</span><span class="cx"> return JSDOMWindowBase::commonVM();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InjectedScript PageRuntimeAgent::injectedScriptForEval(ErrorString* errorString, const int* executionContextId)
</del><ins>+InjectedScript PageRuntimeAgent::injectedScriptForEval(ErrorString& errorString, const int* executionContextId)
</ins><span class="cx"> {
</span><span class="cx"> if (!executionContextId) {
</span><span class="cx"> JSC::ExecState* scriptState = mainWorldExecState(&m_inspectedPage->mainFrame());
</span><span class="cx"> InjectedScript result = injectedScriptManager()->injectedScriptFor(scriptState);
</span><span class="cx"> if (result.hasNoValue())
</span><del>- *errorString = ASCIILiteral("Internal error: main world execution context not found.");
</del><ins>+ errorString = ASCIILiteral("Internal error: main world execution context not found.");
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
</span><span class="cx"> if (injectedScript.hasNoValue())
</span><del>- *errorString = ASCIILiteral("Execution context with given id not found.");
</del><ins>+ errorString = ASCIILiteral("Execution context with given id not found.");
</ins><span class="cx"> return injectedScript;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -60,15 +60,15 @@
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</span><del>- virtual void enable(ErrorString*) override;
- virtual void disable(ErrorString*) override;
</del><ins>+ virtual void enable(ErrorString&) override;
+ virtual void disable(ErrorString&) override;
</ins><span class="cx">
</span><span class="cx"> void didCreateMainWorldContext(Frame*);
</span><span class="cx"> void didCreateIsolatedContext(Frame*, JSC::ExecState*, SecurityOrigin*);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual JSC::VM& globalVM() override;
</span><del>- virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
</del><ins>+ virtual Inspector::InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
</ins><span class="cx"> virtual void muteConsole() override;
</span><span class="cx"> virtual void unmuteConsole() override;
</span><span class="cx"> void reportExecutionContextCreation();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebConsoleAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebConsoleAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/WebConsoleAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebConsoleAgent::setMonitoringXHREnabled(ErrorString*, bool enabled)
</del><ins>+void WebConsoleAgent::setMonitoringXHREnabled(ErrorString&, bool enabled)
</ins><span class="cx"> {
</span><span class="cx"> m_monitoringXHREnabled = enabled;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebConsoleAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebConsoleAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/WebConsoleAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> WebConsoleAgent(WebInjectedScriptManager*);
</span><span class="cx"> virtual ~WebConsoleAgent() { }
</span><span class="cx">
</span><del>- virtual void setMonitoringXHREnabled(ErrorString*, bool enabled) override final;
</del><ins>+ virtual void setMonitoringXHREnabled(ErrorString&, bool enabled) override final;
</ins><span class="cx">
</span><span class="cx"> void frameWindowDiscarded(DOMWindow*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerConsoleAgent::addInspectedNode(ErrorString* error, int)
</del><ins>+void WorkerConsoleAgent::addInspectedNode(ErrorString& error, int)
</ins><span class="cx"> {
</span><del>- *error = ASCIILiteral("addInspectedNode is not supported for workers");
</del><ins>+ error = ASCIILiteral("addInspectedNode is not supported for workers");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> virtual bool isWorkerAgent() const override { return true; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void addInspectedNode(ErrorString*, int nodeId) override;
</del><ins>+ virtual void addInspectedNode(ErrorString&, int nodeId) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -137,10 +137,10 @@
</span><span class="cx"> return m_scriptDebugServer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InjectedScript WorkerDebuggerAgent::injectedScriptForEval(ErrorString* error, const int* executionContextId)
</del><ins>+InjectedScript WorkerDebuggerAgent::injectedScriptForEval(ErrorString& error, const int* executionContextId)
</ins><span class="cx"> {
</span><span class="cx"> if (executionContextId) {
</span><del>- *error = ASCIILiteral("Execution context id is not supported for workers as there is only one execution context.");
</del><ins>+ error = ASCIILiteral("Execution context id is not supported for workers as there is only one execution context.");
</ins><span class="cx"> return InjectedScript();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> virtual void startListeningScriptDebugServer() override;
</span><span class="cx"> virtual void stopListeningScriptDebugServer(bool isBeingDestroyed) override;
</span><span class="cx"> virtual WorkerScriptDebugServer& scriptDebugServer() override;
</span><del>- virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
</del><ins>+ virtual Inspector::InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
</ins><span class="cx"> virtual void muteConsole() override;
</span><span class="cx"> virtual void unmuteConsole() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> void WorkerInspectorController::resume()
</span><span class="cx"> {
</span><span class="cx"> ErrorString unused;
</span><del>- m_runtimeAgent->run(&unused);
</del><ins>+ m_runtimeAgent->run(unused);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorFunctionCallHandler WorkerInspectorController::functionCallHandler() const
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -66,10 +66,10 @@
</span><span class="cx"> InspectorRuntimeAgent::willDestroyFrontendAndBackend(reason);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InjectedScript WorkerRuntimeAgent::injectedScriptForEval(ErrorString* error, const int* executionContextId)
</del><ins>+InjectedScript WorkerRuntimeAgent::injectedScriptForEval(ErrorString& error, const int* executionContextId)
</ins><span class="cx"> {
</span><span class="cx"> if (executionContextId) {
</span><del>- *error = ASCIILiteral("Execution context id is not supported for workers as there is only one execution context.");
</del><ins>+ error = ASCIILiteral("Execution context id is not supported for workers as there is only one execution context.");
</ins><span class="cx"> return InjectedScript();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> // We don't need to mute console for workers.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerRuntimeAgent::run(ErrorString*)
</del><ins>+void WorkerRuntimeAgent::run(ErrorString&)
</ins><span class="cx"> {
</span><span class="cx"> m_paused = false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h (174139 => 174140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2014-10-01 01:51:43 UTC (rev 174139)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2014-10-01 04:34:19 UTC (rev 174140)
</span><span class="lines">@@ -48,13 +48,13 @@
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</span><span class="cx">
</span><del>- virtual void run(ErrorString*) override;
</del><ins>+ virtual void run(ErrorString&) override;
</ins><span class="cx">
</span><span class="cx"> void pauseWorkerGlobalScope(WorkerGlobalScope*);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual JSC::VM& globalVM() override;
</span><del>- virtual Inspector::InjectedScript injectedScriptForEval(ErrorString*, const int* executionContextId) override;
</del><ins>+ virtual Inspector::InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
</ins><span class="cx"> virtual void muteConsole() override;
</span><span class="cx"> virtual void unmuteConsole() override;
</span><span class="cx"> WorkerGlobalScope* m_workerGlobalScope;
</span></span></pre>
</div>
</div>
</body>
</html>