<!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>[212448] 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/212448">212448</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-02-16 10:49:40 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Drop PassRefPtr in inspector/
https://bugs.webkit.org/show_bug.cgi?id=168420
Reviewed by Alex Christensen.
Source/JavaScriptCore:
Drop PassRefPtr uses.
And use Ref<Inspector::ScriptArguments> and Ref<ScriptCallStack> as much as possible.
It drops some unnecessary null checks.
* debugger/Debugger.cpp:
(JSC::Debugger::hasBreakpoint):
(JSC::Debugger::currentDebuggerCallFrame):
* debugger/Debugger.h:
* inspector/AsyncStackTrace.cpp:
(Inspector::AsyncStackTrace::create):
(Inspector::AsyncStackTrace::AsyncStackTrace):
(Inspector::AsyncStackTrace::buildInspectorObject):
(Inspector::AsyncStackTrace::truncate):
* inspector/AsyncStackTrace.h:
* inspector/ConsoleMessage.cpp:
(Inspector::ConsoleMessage::ConsoleMessage):
* inspector/ConsoleMessage.h:
* inspector/InjectedScriptManager.cpp:
(Inspector::InjectedScriptManager::InjectedScriptManager):
(Inspector::InjectedScriptManager::injectedScriptHost):
* inspector/InjectedScriptManager.h:
* inspector/JSGlobalObjectConsoleClient.cpp:
(Inspector::JSGlobalObjectConsoleClient::messageWithTypeAndLevel):
(Inspector::JSGlobalObjectConsoleClient::count):
(Inspector::JSGlobalObjectConsoleClient::timeEnd):
(Inspector::JSGlobalObjectConsoleClient::timeStamp):
(Inspector::JSGlobalObjectConsoleClient::warnUnimplemented):
* inspector/JSGlobalObjectConsoleClient.h:
ConsoleClient now takes Ref<ScriptArgument>&& instead of RefPtr<ScriptArgument>&&.
* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::appendAPIBacktrace):
(Inspector::JSGlobalObjectInspectorController::reportAPIException):
* inspector/JSGlobalObjectInspectorController.h:
* inspector/JSJavaScriptCallFrame.cpp:
(Inspector::JSJavaScriptCallFrame::JSJavaScriptCallFrame):
(Inspector::toJS):
* inspector/JSJavaScriptCallFrame.h:
(Inspector::JSJavaScriptCallFrame::create):
* inspector/JavaScriptCallFrame.cpp:
(Inspector::JavaScriptCallFrame::JavaScriptCallFrame):
(Inspector::JavaScriptCallFrame::caller):
* inspector/JavaScriptCallFrame.h:
(Inspector::JavaScriptCallFrame::create):
* inspector/ScriptDebugServer.cpp:
(Inspector::ScriptDebugServer::evaluateBreakpointAction):
(Inspector::ScriptDebugServer::dispatchDidPause):
(Inspector::ScriptDebugServer::exceptionOrCaughtValue):
* inspector/agents/InspectorConsoleAgent.cpp:
(Inspector::InspectorConsoleAgent::stopTiming):
(Inspector::InspectorConsoleAgent::count):
* inspector/agents/InspectorConsoleAgent.h:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::didScheduleAsyncCall):
* runtime/ConsoleClient.cpp:
(JSC::ConsoleClient::printConsoleMessageWithArguments):
(JSC::ConsoleClient::internalMessageWithTypeAndLevel):
(JSC::ConsoleClient::logWithLevel):
(JSC::ConsoleClient::dir):
(JSC::ConsoleClient::dirXML):
(JSC::ConsoleClient::table):
(JSC::ConsoleClient::trace):
(JSC::ConsoleClient::assertion):
(JSC::ConsoleClient::group):
(JSC::ConsoleClient::groupCollapsed):
(JSC::ConsoleClient::groupEnd):
* runtime/ConsoleClient.h:
* runtime/ConsoleObject.cpp:
(JSC::consoleLogWithLevel):
(JSC::consoleProtoFuncDir):
(JSC::consoleProtoFuncDirXML):
(JSC::consoleProtoFuncTable):
(JSC::consoleProtoFuncTrace):
(JSC::consoleProtoFuncAssert):
(JSC::consoleProtoFuncCount):
(JSC::consoleProtoFuncTimeStamp):
(JSC::consoleProtoFuncGroup):
(JSC::consoleProtoFuncGroupCollapsed):
(JSC::consoleProtoFuncGroupEnd):
Source/WebCore:
Use Ref<Inspector::ScriptArguments> and Ref<ScriptCallStack> as much as possible.
It drops some unnecessary null checks.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateCallWith):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjPrototypeFunctionWithScriptArgumentsAndCallStackCaller):
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::PendingException::PendingException):
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::consoleCountImpl):
(WebCore::InspectorInstrumentation::stopConsoleTimingImpl):
(WebCore::InspectorInstrumentation::consoleTimeStampImpl):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::consoleCount):
(WebCore::InspectorInstrumentation::stopConsoleTiming):
(WebCore::InspectorInstrumentation::consoleTimeStamp):
* inspector/InspectorNetworkAgent.cpp:
(WebCore::InspectorNetworkAgent::buildInitiatorObject):
* inspector/TimelineRecordFactory.cpp:
(WebCore::TimelineRecordFactory::createGenericRecord):
* inspector/WebInjectedScriptManager.cpp:
(WebCore::WebInjectedScriptManager::WebInjectedScriptManager):
* inspector/WebInjectedScriptManager.h:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::postMessageTimerFired):
We dispatch appropriate addMessage function according to whether
`timer.stackTrace()` is nullptr.
* page/PageConsoleClient.cpp:
(WebCore::PageConsoleClient::addMessage):
(WebCore::PageConsoleClient::messageWithTypeAndLevel):
(WebCore::PageConsoleClient::count):
(WebCore::PageConsoleClient::timeEnd):
(WebCore::PageConsoleClient::timeStamp):
* page/PageConsoleClient.h:
* workers/WorkerConsoleClient.cpp:
(WebCore::WorkerConsoleClient::messageWithTypeAndLevel):
(WebCore::WorkerConsoleClient::count):
(WebCore::WorkerConsoleClient::timeEnd):
(WebCore::WorkerConsoleClient::timeStamp):
* workers/WorkerConsoleClient.h:
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::addMessage):
Source/WebKit/mac:
* WebView/WebScriptDebugger.mm:
(WebScriptDebugger::handlePause):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerh">trunk/Source/JavaScriptCore/debugger/Debugger.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorAsyncStackTracecpp">trunk/Source/JavaScriptCore/inspector/AsyncStackTrace.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorAsyncStackTraceh">trunk/Source/JavaScriptCore/inspector/AsyncStackTrace.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleMessagecpp">trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleMessageh">trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptManagercpp">trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptManagerh">trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClientcpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClienth">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllerh">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFrameh">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJavaScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJavaScriptCallFrameh">trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServercpp">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp</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="#trunkSourceJavaScriptCoreruntimeConsoleClientcpp">trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConsoleClienth">trunk/Source/JavaScriptCore/runtime/ConsoleClient.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConsoleObjectcpp">trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorNetworkAgentcpp">trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorTimelineRecordFactorycpp">trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebInjectedScriptManagercpp">trunk/Source/WebCore/inspector/WebInjectedScriptManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebInjectedScriptManagerh">trunk/Source/WebCore/inspector/WebInjectedScriptManager.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsoleClientcpp">trunk/Source/WebCore/page/PageConsoleClient.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageConsoleClienth">trunk/Source/WebCore/page/PageConsoleClient.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerConsoleClientcpp">trunk/Source/WebCore/workers/WorkerConsoleClient.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerConsoleClienth">trunk/Source/WebCore/workers/WorkerConsoleClient.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebScriptDebuggermm">trunk/Source/WebKit/mac/WebView/WebScriptDebugger.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -1,3 +1,90 @@
</span><ins>+2017-02-16 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [JSC] Drop PassRefPtr in inspector/
+ https://bugs.webkit.org/show_bug.cgi?id=168420
+
+ Reviewed by Alex Christensen.
+
+ Drop PassRefPtr uses.
+ And use Ref<Inspector::ScriptArguments> and Ref<ScriptCallStack> as much as possible.
+ It drops some unnecessary null checks.
+
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::hasBreakpoint):
+ (JSC::Debugger::currentDebuggerCallFrame):
+ * debugger/Debugger.h:
+ * inspector/AsyncStackTrace.cpp:
+ (Inspector::AsyncStackTrace::create):
+ (Inspector::AsyncStackTrace::AsyncStackTrace):
+ (Inspector::AsyncStackTrace::buildInspectorObject):
+ (Inspector::AsyncStackTrace::truncate):
+ * inspector/AsyncStackTrace.h:
+ * inspector/ConsoleMessage.cpp:
+ (Inspector::ConsoleMessage::ConsoleMessage):
+ * inspector/ConsoleMessage.h:
+ * inspector/InjectedScriptManager.cpp:
+ (Inspector::InjectedScriptManager::InjectedScriptManager):
+ (Inspector::InjectedScriptManager::injectedScriptHost):
+ * inspector/InjectedScriptManager.h:
+ * inspector/JSGlobalObjectConsoleClient.cpp:
+ (Inspector::JSGlobalObjectConsoleClient::messageWithTypeAndLevel):
+ (Inspector::JSGlobalObjectConsoleClient::count):
+ (Inspector::JSGlobalObjectConsoleClient::timeEnd):
+ (Inspector::JSGlobalObjectConsoleClient::timeStamp):
+ (Inspector::JSGlobalObjectConsoleClient::warnUnimplemented):
+ * inspector/JSGlobalObjectConsoleClient.h:
+ ConsoleClient now takes Ref<ScriptArgument>&& instead of RefPtr<ScriptArgument>&&.
+
+ * inspector/JSGlobalObjectInspectorController.cpp:
+ (Inspector::JSGlobalObjectInspectorController::appendAPIBacktrace):
+ (Inspector::JSGlobalObjectInspectorController::reportAPIException):
+ * inspector/JSGlobalObjectInspectorController.h:
+ * inspector/JSJavaScriptCallFrame.cpp:
+ (Inspector::JSJavaScriptCallFrame::JSJavaScriptCallFrame):
+ (Inspector::toJS):
+ * inspector/JSJavaScriptCallFrame.h:
+ (Inspector::JSJavaScriptCallFrame::create):
+ * inspector/JavaScriptCallFrame.cpp:
+ (Inspector::JavaScriptCallFrame::JavaScriptCallFrame):
+ (Inspector::JavaScriptCallFrame::caller):
+ * inspector/JavaScriptCallFrame.h:
+ (Inspector::JavaScriptCallFrame::create):
+ * inspector/ScriptDebugServer.cpp:
+ (Inspector::ScriptDebugServer::evaluateBreakpointAction):
+ (Inspector::ScriptDebugServer::dispatchDidPause):
+ (Inspector::ScriptDebugServer::exceptionOrCaughtValue):
+ * inspector/agents/InspectorConsoleAgent.cpp:
+ (Inspector::InspectorConsoleAgent::stopTiming):
+ (Inspector::InspectorConsoleAgent::count):
+ * inspector/agents/InspectorConsoleAgent.h:
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::didScheduleAsyncCall):
+ * runtime/ConsoleClient.cpp:
+ (JSC::ConsoleClient::printConsoleMessageWithArguments):
+ (JSC::ConsoleClient::internalMessageWithTypeAndLevel):
+ (JSC::ConsoleClient::logWithLevel):
+ (JSC::ConsoleClient::dir):
+ (JSC::ConsoleClient::dirXML):
+ (JSC::ConsoleClient::table):
+ (JSC::ConsoleClient::trace):
+ (JSC::ConsoleClient::assertion):
+ (JSC::ConsoleClient::group):
+ (JSC::ConsoleClient::groupCollapsed):
+ (JSC::ConsoleClient::groupEnd):
+ * runtime/ConsoleClient.h:
+ * runtime/ConsoleObject.cpp:
+ (JSC::consoleLogWithLevel):
+ (JSC::consoleProtoFuncDir):
+ (JSC::consoleProtoFuncDirXML):
+ (JSC::consoleProtoFuncTable):
+ (JSC::consoleProtoFuncTrace):
+ (JSC::consoleProtoFuncAssert):
+ (JSC::consoleProtoFuncCount):
+ (JSC::consoleProtoFuncTimeStamp):
+ (JSC::consoleProtoFuncGroup):
+ (JSC::consoleProtoFuncGroupCollapsed):
+ (JSC::consoleProtoFuncGroupEnd):
+
</ins><span class="cx"> 2017-02-15 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Weak should not use jsCast in its accessors
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -502,9 +502,9 @@
</span><span class="cx"> TemporaryPausedState pausedState(*this);
</span><span class="cx">
</span><span class="cx"> NakedPtr<Exception> exception;
</span><del>- DebuggerCallFrame* debuggerCallFrame = currentDebuggerCallFrame();
</del><ins>+ DebuggerCallFrame& debuggerCallFrame = currentDebuggerCallFrame();
</ins><span class="cx"> JSObject* scopeExtensionObject = nullptr;
</span><del>- JSValue result = debuggerCallFrame->evaluateWithScopeExtension(breakpoint->condition, scopeExtensionObject, exception);
</del><ins>+ JSValue result = debuggerCallFrame.evaluateWithScopeExtension(breakpoint->condition, scopeExtensionObject, exception);
</ins><span class="cx">
</span><span class="cx"> // We can lose the debugger while executing JavaScript.
</span><span class="cx"> if (!m_currentCallFrame)
</span><span class="lines">@@ -911,11 +911,11 @@
</span><span class="cx"> updateCallFrame(callFrame, AttemptPause);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DebuggerCallFrame* Debugger::currentDebuggerCallFrame()
</del><ins>+DebuggerCallFrame& Debugger::currentDebuggerCallFrame()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_currentDebuggerCallFrame)
</span><span class="cx"> m_currentDebuggerCallFrame = DebuggerCallFrame::create(m_currentCallFrame);
</span><del>- return m_currentDebuggerCallFrame.get();
</del><ins>+ return *m_currentDebuggerCallFrame;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Debugger::isBlacklisted(SourceID sourceID) const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> VM& vm() { return m_vm; }
</span><span class="cx">
</span><del>- JSC::DebuggerCallFrame* currentDebuggerCallFrame();
</del><ins>+ JSC::DebuggerCallFrame& currentDebuggerCallFrame();
</ins><span class="cx"> bool hasHandlerForExceptionCallback() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_reasonForPause == PausedForException);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorAsyncStackTracecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/AsyncStackTrace.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/AsyncStackTrace.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/AsyncStackTrace.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -31,14 +31,14 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-RefPtr<AsyncStackTrace> AsyncStackTrace::create(RefPtr<ScriptCallStack> callStack, bool singleShot, RefPtr<AsyncStackTrace> parent)
</del><ins>+RefPtr<AsyncStackTrace> AsyncStackTrace::create(Ref<ScriptCallStack>&& callStack, bool singleShot, RefPtr<AsyncStackTrace> parent)
</ins><span class="cx"> {
</span><del>- ASSERT(callStack && callStack->size());
</del><ins>+ ASSERT(callStack->size());
</ins><span class="cx"> return adoptRef(*new AsyncStackTrace(WTFMove(callStack), singleShot, WTFMove(parent)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AsyncStackTrace::AsyncStackTrace(RefPtr<ScriptCallStack> callStack, bool singleShot, RefPtr<AsyncStackTrace> parent)
- : m_callStack(callStack)
</del><ins>+AsyncStackTrace::AsyncStackTrace(Ref<ScriptCallStack>&& callStack, bool singleShot, RefPtr<AsyncStackTrace> parent)
+ : m_callStack(WTFMove(callStack))
</ins><span class="cx"> , m_parent(parent)
</span><span class="cx"> , m_singleShot(singleShot)
</span><span class="cx"> {
</span><span class="lines">@@ -104,8 +104,8 @@
</span><span class="cx">
</span><span class="cx"> auto* stackTrace = this;
</span><span class="cx"> while (stackTrace) {
</span><del>- auto callStack = stackTrace->m_callStack;
- ASSERT(callStack && callStack->size());
</del><ins>+ auto& callStack = stackTrace->m_callStack;
+ ASSERT(callStack->size());
</ins><span class="cx">
</span><span class="cx"> RefPtr<Inspector::Protocol::Console::StackTrace> protocolObject = Inspector::Protocol::Console::StackTrace::create()
</span><span class="cx"> .setCallFrames(callStack->buildInspectorArray())
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> auto* currentNode = lastUnlockedAncestor;
</span><span class="cx"> while (currentNode->m_parent) {
</span><span class="cx"> auto& parentNode = currentNode->m_parent;
</span><del>- currentNode->m_parent = AsyncStackTrace::create(parentNode->m_callStack, true, parentNode->m_parent);
</del><ins>+ currentNode->m_parent = AsyncStackTrace::create(parentNode->m_callStack.copyRef(), true, parentNode->m_parent);
</ins><span class="cx"> currentNode = currentNode->m_parent.get();
</span><span class="cx">
</span><span class="cx"> if (parentNode.get() == newStackTraceRoot)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorAsyncStackTraceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/AsyncStackTrace.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/AsyncStackTrace.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/AsyncStackTrace.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> Canceled,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static RefPtr<AsyncStackTrace> create(RefPtr<ScriptCallStack>, bool singleShot, RefPtr<AsyncStackTrace> parent);
</del><ins>+ static RefPtr<AsyncStackTrace> create(Ref<ScriptCallStack>&&, bool singleShot, RefPtr<AsyncStackTrace> parent);
</ins><span class="cx">
</span><span class="cx"> bool isPending() const;
</span><span class="cx"> bool isLocked() const;
</span><span class="lines">@@ -56,12 +56,12 @@
</span><span class="cx"> ~AsyncStackTrace();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- AsyncStackTrace(RefPtr<ScriptCallStack>, bool, RefPtr<AsyncStackTrace>);
</del><ins>+ AsyncStackTrace(Ref<ScriptCallStack>&&, bool, RefPtr<AsyncStackTrace>);
</ins><span class="cx">
</span><span class="cx"> void truncate(size_t maxDepth);
</span><span class="cx"> void remove();
</span><span class="cx">
</span><del>- RefPtr<ScriptCallStack> m_callStack;
</del><ins>+ Ref<ScriptCallStack> m_callStack;
</ins><span class="cx"> RefPtr<AsyncStackTrace> m_parent;
</span><span class="cx"> unsigned m_childCount { 0 };
</span><span class="cx"> State m_state { State::Pending };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleMessagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -66,16 +66,15 @@
</span><span class="cx"> autogenerateMetadata(state);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ConsoleMessage::ConsoleMessage(MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
</del><ins>+ConsoleMessage::ConsoleMessage(MessageSource source, MessageType type, MessageLevel level, const String& message, Ref<ScriptCallStack>&& callStack, unsigned long requestIdentifier)
</ins><span class="cx"> : m_source(source)
</span><span class="cx"> , m_type(type)
</span><span class="cx"> , m_level(level)
</span><span class="cx"> , m_message(message)
</span><ins>+ , m_callStack(WTFMove(callStack))
</ins><span class="cx"> , m_url()
</span><span class="cx"> , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
</span><span class="cx"> {
</span><del>- m_callStack = callStack;
-
</del><span class="cx"> const ScriptCallFrame* frame = m_callStack ? m_callStack->firstNonNativeCallFrame() : nullptr;
</span><span class="cx"> if (frame) {
</span><span class="cx"> m_url = frame->sourceURL();
</span><span class="lines">@@ -84,12 +83,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ConsoleMessage::ConsoleMessage(MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptArguments> arguments, JSC::ExecState* state, unsigned long requestIdentifier)
</del><ins>+ConsoleMessage::ConsoleMessage(MessageSource source, MessageType type, MessageLevel level, const String& message, Ref<ScriptArguments>&& arguments, JSC::ExecState* state, unsigned long requestIdentifier)
</ins><span class="cx"> : m_source(source)
</span><span class="cx"> , m_type(type)
</span><span class="cx"> , m_level(level)
</span><span class="cx"> , m_message(message)
</span><del>- , m_arguments(arguments)
</del><ins>+ , m_arguments(WTFMove(arguments))
</ins><span class="cx"> , m_url()
</span><span class="cx"> , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleMessageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> public:
</span><span class="cx"> ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& message, unsigned long requestIdentifier = 0);
</span><span class="cx"> ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& message, const String& url, unsigned line, unsigned column, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
</span><del>- ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptCallStack>, unsigned long requestIdentifier = 0);
- ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, JSC::ExecState*, unsigned long requestIdentifier = 0);
</del><ins>+ ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& message, Ref<ScriptCallStack>&&, unsigned long requestIdentifier = 0);
+ ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& message, Ref<ScriptArguments>&&, JSC::ExecState*, unsigned long requestIdentifier = 0);
</ins><span class="cx"> ~ConsoleMessage();
</span><span class="cx">
</span><span class="cx"> void addToFrontend(ConsoleFrontendDispatcher&, InjectedScriptManager&, bool generatePreview);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-InjectedScriptManager::InjectedScriptManager(InspectorEnvironment& environment, PassRefPtr<InjectedScriptHost> injectedScriptHost)
</del><ins>+InjectedScriptManager::InjectedScriptManager(InspectorEnvironment& environment, Ref<InjectedScriptHost>&& injectedScriptHost)
</ins><span class="cx"> : m_environment(environment)
</span><del>- , m_injectedScriptHost(injectedScriptHost)
</del><ins>+ , m_injectedScriptHost(WTFMove(injectedScriptHost))
</ins><span class="cx"> , m_nextInjectedScriptId(1)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> m_scriptStateToId.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InjectedScriptHost* InjectedScriptManager::injectedScriptHost()
</del><ins>+InjectedScriptHost& InjectedScriptManager::injectedScriptHost()
</ins><span class="cx"> {
</span><span class="cx"> return m_injectedScriptHost.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -49,13 +49,13 @@
</span><span class="cx"> class JS_EXPORT_PRIVATE InjectedScriptManager {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InjectedScriptManager); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- InjectedScriptManager(InspectorEnvironment&, PassRefPtr<InjectedScriptHost>);
</del><ins>+ InjectedScriptManager(InspectorEnvironment&, Ref<InjectedScriptHost>&&);
</ins><span class="cx"> virtual ~InjectedScriptManager();
</span><span class="cx">
</span><span class="cx"> virtual void disconnect();
</span><span class="cx"> virtual void discardInjectedScripts();
</span><span class="cx">
</span><del>- InjectedScriptHost* injectedScriptHost();
</del><ins>+ InjectedScriptHost& injectedScriptHost();
</ins><span class="cx"> InspectorEnvironment& inspectorEnvironment() const { return m_environment; }
</span><span class="cx">
</span><span class="cx"> InjectedScript injectedScriptFor(JSC::ExecState*);
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> JSC::JSObject* createInjectedScript(const String& source, JSC::ExecState*, int id);
</span><span class="cx">
</span><span class="cx"> InspectorEnvironment& m_environment;
</span><del>- RefPtr<InjectedScriptHost> m_injectedScriptHost;
</del><ins>+ Ref<InjectedScriptHost> m_injectedScriptHost;
</ins><span class="cx"> int m_nextInjectedScriptId;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void JSGlobalObjectConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> if (JSGlobalObjectConsoleClient::logToSystemConsole())
</span><span class="cx"> ConsoleClient::printConsoleMessageWithArguments(MessageSource::ConsoleAPI, type, level, exec, arguments.copyRef());
</span><span class="lines">@@ -72,9 +72,9 @@
</span><span class="cx"> m_consoleAgent->addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::ConsoleAPI, type, level, message, WTFMove(arguments), exec));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectConsoleClient::count(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void JSGlobalObjectConsoleClient::count(ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><del>- m_consoleAgent->count(exec, arguments);
</del><ins>+ m_consoleAgent->count(exec, WTFMove(arguments));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectConsoleClient::profile(JSC::ExecState*, const String& title)
</span><span class="lines">@@ -156,11 +156,10 @@
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectConsoleClient::timeEnd(ExecState* exec, const String& title)
</span><span class="cx"> {
</span><del>- RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, 1));
- m_consoleAgent->stopTiming(title, WTFMove(callStack));
</del><ins>+ m_consoleAgent->stopTiming(title, createScriptCallStackForConsole(exec, 1));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectConsoleClient::timeStamp(ExecState*, RefPtr<ScriptArguments>&&)
</del><ins>+void JSGlobalObjectConsoleClient::timeStamp(ExecState*, Ref<ScriptArguments>&&)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: JSContext inspection needs a timeline.
</span><span class="cx"> warnUnimplemented(ASCIILiteral("console.timeStamp"));
</span><span class="lines">@@ -169,7 +168,7 @@
</span><span class="cx"> void JSGlobalObjectConsoleClient::warnUnimplemented(const String& method)
</span><span class="cx"> {
</span><span class="cx"> String message = method + " is currently ignored in JavaScript context inspection.";
</span><del>- m_consoleAgent->addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::Log, MessageLevel::Warning, message, nullptr, nullptr));
</del><ins>+ m_consoleAgent->addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::Log, MessageLevel::Warning, message));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -45,18 +45,18 @@
</span><span class="cx"> static void setLogToSystemConsole(bool);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
- void count(JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
</del><ins>+ void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, Ref<ScriptArguments>&&) override;
+ void count(JSC::ExecState*, Ref<ScriptArguments>&&) override;
</ins><span class="cx"> void profile(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void profileEnd(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void takeHeapSnapshot(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void time(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void timeEnd(JSC::ExecState*, const String& title) override;
</span><del>- void timeStamp(JSC::ExecState*, RefPtr<ScriptArguments>&&) override;
</del><ins>+ void timeStamp(JSC::ExecState*, Ref<ScriptArguments>&&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void warnUnimplemented(const String& method);
</span><del>- void internalAddMessage(MessageType, MessageLevel, JSC::ExecState*, RefPtr<ScriptArguments>&&);
</del><ins>+ void internalAddMessage(MessageType, MessageLevel, JSC::ExecState*, Ref<ScriptArguments>&&);
</ins><span class="cx">
</span><span class="cx"> void startConsoleProfile();
</span><span class="cx"> void stopConsoleProfile();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> m_debuggerAgent->pause(dummyError);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSGlobalObjectInspectorController::appendAPIBacktrace(ScriptCallStack* callStack)
</del><ins>+void JSGlobalObjectInspectorController::appendAPIBacktrace(ScriptCallStack& callStack)
</ins><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
</span><span class="cx"> static const int framesToShow = 31;
</span><span class="lines">@@ -208,9 +208,9 @@
</span><span class="cx"> if (mangledName)
</span><span class="cx"> cxaDemangled = abi::__cxa_demangle(mangledName, nullptr, nullptr, nullptr);
</span><span class="cx"> if (mangledName || cxaDemangled)
</span><del>- callStack->append(ScriptCallFrame(cxaDemangled ? cxaDemangled : mangledName, ASCIILiteral("[native code]"), noSourceID, 0, 0));
</del><ins>+ callStack.append(ScriptCallFrame(cxaDemangled ? cxaDemangled : mangledName, ASCIILiteral("[native code]"), noSourceID, 0, 0));
</ins><span class="cx"> else
</span><del>- callStack->append(ScriptCallFrame(ASCIILiteral("?"), ASCIILiteral("[native code]"), noSourceID, 0, 0));
</del><ins>+ callStack.append(ScriptCallFrame(ASCIILiteral("?"), ASCIILiteral("[native code]"), noSourceID, 0, 0));
</ins><span class="cx"> free(cxaDemangled);
</span><span class="cx"> }
</span><span class="cx"> #else
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> auto scope = DECLARE_CATCH_SCOPE(vm);
</span><span class="cx"> ErrorHandlingScope errorScope(vm);
</span><span class="cx">
</span><del>- RefPtr<ScriptCallStack> callStack = createScriptCallStackFromException(exec, exception, ScriptCallStack::maxCallStackSizeToCapture);
</del><ins>+ Ref<ScriptCallStack> callStack = createScriptCallStackFromException(exec, exception, ScriptCallStack::maxCallStackSizeToCapture);
</ins><span class="cx"> if (includesNativeCallStackWhenReportingExceptions())
</span><span class="cx"> appendAPIBacktrace(callStack.get());
</span><span class="cx">
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> ConsoleClient::printConsoleMessage(MessageSource::JS, MessageType::Log, MessageLevel::Error, errorMessage, String(), 0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_consoleAgent->addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::JS, MessageType::Log, MessageLevel::Error, errorMessage, callStack));
</del><ins>+ m_consoleAgent->addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::JS, MessageType::Log, MessageLevel::Error, errorMessage, WTFMove(callStack)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ConsoleClient* JSGlobalObjectInspectorController::consoleClient() const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void appendAPIBacktrace(ScriptCallStack* callStack);
</del><ins>+ void appendAPIBacktrace(ScriptCallStack&);
</ins><span class="cx">
</span><span class="cx"> JSC::JSGlobalObject& m_globalObject;
</span><span class="cx"> std::unique_ptr<InjectedScriptManager> m_injectedScriptManager;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -39,9 +39,9 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo JSJavaScriptCallFrame::s_info = { "JavaScriptCallFrame", &Base::s_info, 0, CREATE_METHOD_TABLE(JSJavaScriptCallFrame) };
</span><span class="cx">
</span><del>-JSJavaScriptCallFrame::JSJavaScriptCallFrame(VM& vm, Structure* structure, PassRefPtr<JavaScriptCallFrame> impl)
</del><ins>+JSJavaScriptCallFrame::JSJavaScriptCallFrame(VM& vm, Structure* structure, Ref<JavaScriptCallFrame>&& impl)
</ins><span class="cx"> : JSDestructibleObject(vm, structure)
</span><del>- , m_impl(impl.leakRef())
</del><ins>+ , m_impl(&impl.leakRef())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx">
</span><span class="cx"> JSObject* prototype = JSJavaScriptCallFrame::createPrototype(exec->vm(), globalObject);
</span><span class="cx"> Structure* structure = JSJavaScriptCallFrame::createStructure(exec->vm(), globalObject, prototype);
</span><del>- JSJavaScriptCallFrame* javaScriptCallFrame = JSJavaScriptCallFrame::create(exec->vm(), structure, impl);
</del><ins>+ JSJavaScriptCallFrame* javaScriptCallFrame = JSJavaScriptCallFrame::create(exec->vm(), structure, *impl);
</ins><span class="cx">
</span><span class="cx"> return javaScriptCallFrame;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static JSJavaScriptCallFrame* create(JSC::VM& vm, JSC::Structure* structure, PassRefPtr<JavaScriptCallFrame> impl)
</del><ins>+ static JSJavaScriptCallFrame* create(JSC::VM& vm, JSC::Structure* structure, Ref<JavaScriptCallFrame>&& impl)
</ins><span class="cx"> {
</span><del>- JSJavaScriptCallFrame* instance = new (NotNull, JSC::allocateCell<JSJavaScriptCallFrame>(vm.heap)) JSJavaScriptCallFrame(vm, structure, impl);
</del><ins>+ JSJavaScriptCallFrame* instance = new (NotNull, JSC::allocateCell<JSJavaScriptCallFrame>(vm.heap)) JSJavaScriptCallFrame(vm, structure, WTFMove(impl));
</ins><span class="cx"> instance->finishCreation(vm);
</span><span class="cx"> return instance;
</span><span class="cx"> }
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- JSJavaScriptCallFrame(JSC::VM&, JSC::Structure*, PassRefPtr<JavaScriptCallFrame>);
</del><ins>+ JSJavaScriptCallFrame(JSC::VM&, JSC::Structure*, Ref<JavaScriptCallFrame>&&);
</ins><span class="cx"> ~JSJavaScriptCallFrame();
</span><span class="cx">
</span><span class="cx"> JavaScriptCallFrame* m_impl;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJavaScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-JavaScriptCallFrame::JavaScriptCallFrame(PassRefPtr<DebuggerCallFrame> debuggerCallFrame)
- : m_debuggerCallFrame(debuggerCallFrame)
</del><ins>+JavaScriptCallFrame::JavaScriptCallFrame(Ref<DebuggerCallFrame>&& debuggerCallFrame)
+ : m_debuggerCallFrame(WTFMove(debuggerCallFrame))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> if (!debuggerCallerFrame)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- m_caller = create(debuggerCallerFrame);
</del><ins>+ m_caller = create(debuggerCallerFrame.releaseNonNull());
</ins><span class="cx"> return m_caller.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJavaScriptCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -37,9 +37,9 @@
</span><span class="cx">
</span><span class="cx"> class JavaScriptCallFrame : public RefCounted<JavaScriptCallFrame> {
</span><span class="cx"> public:
</span><del>- static Ref<JavaScriptCallFrame> create(PassRefPtr<JSC::DebuggerCallFrame> debuggerCallFrame)
</del><ins>+ static Ref<JavaScriptCallFrame> create(Ref<JSC::DebuggerCallFrame>&& debuggerCallFrame)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new JavaScriptCallFrame(debuggerCallFrame));
</del><ins>+ return adoptRef(*new JavaScriptCallFrame(WTFMove(debuggerCallFrame)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JavaScriptCallFrame* caller();
</span><span class="lines">@@ -58,9 +58,9 @@
</span><span class="cx"> JSC::JSValue evaluateWithScopeExtension(const String& script, JSC::JSObject* scopeExtension, NakedPtr<JSC::Exception>& exception) const { return m_debuggerCallFrame->evaluateWithScopeExtension(script, scopeExtension, exception); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- JavaScriptCallFrame(PassRefPtr<JSC::DebuggerCallFrame>);
</del><ins>+ JavaScriptCallFrame(Ref<JSC::DebuggerCallFrame>&&);
</ins><span class="cx">
</span><del>- RefPtr<JSC::DebuggerCallFrame> m_debuggerCallFrame;
</del><ins>+ Ref<JSC::DebuggerCallFrame> m_debuggerCallFrame;
</ins><span class="cx"> RefPtr<JavaScriptCallFrame> m_caller;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -89,29 +89,29 @@
</span><span class="cx">
</span><span class="cx"> bool ScriptDebugServer::evaluateBreakpointAction(const ScriptBreakpointAction& breakpointAction)
</span><span class="cx"> {
</span><del>- DebuggerCallFrame* debuggerCallFrame = currentDebuggerCallFrame();
</del><ins>+ DebuggerCallFrame& debuggerCallFrame = currentDebuggerCallFrame();
</ins><span class="cx">
</span><span class="cx"> switch (breakpointAction.type) {
</span><span class="cx"> case ScriptBreakpointActionTypeLog: {
</span><del>- dispatchBreakpointActionLog(debuggerCallFrame->globalExec(), breakpointAction.data);
</del><ins>+ dispatchBreakpointActionLog(debuggerCallFrame.globalExec(), breakpointAction.data);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case ScriptBreakpointActionTypeEvaluate: {
</span><span class="cx"> NakedPtr<Exception> exception;
</span><span class="cx"> JSObject* scopeExtensionObject = nullptr;
</span><del>- debuggerCallFrame->evaluateWithScopeExtension(breakpointAction.data, scopeExtensionObject, exception);
</del><ins>+ debuggerCallFrame.evaluateWithScopeExtension(breakpointAction.data, scopeExtensionObject, exception);
</ins><span class="cx"> if (exception)
</span><del>- reportException(debuggerCallFrame->globalExec(), exception);
</del><ins>+ reportException(debuggerCallFrame.globalExec(), exception);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case ScriptBreakpointActionTypeSound:
</span><del>- dispatchBreakpointActionSound(debuggerCallFrame->globalExec(), breakpointAction.identifier);
</del><ins>+ dispatchBreakpointActionSound(debuggerCallFrame.globalExec(), breakpointAction.identifier);
</ins><span class="cx"> break;
</span><span class="cx"> case ScriptBreakpointActionTypeProbe: {
</span><span class="cx"> NakedPtr<Exception> exception;
</span><span class="cx"> JSObject* scopeExtensionObject = nullptr;
</span><del>- JSValue result = debuggerCallFrame->evaluateWithScopeExtension(breakpointAction.data, scopeExtensionObject, exception);
- JSC::ExecState* exec = debuggerCallFrame->globalExec();
</del><ins>+ JSValue result = debuggerCallFrame.evaluateWithScopeExtension(breakpointAction.data, scopeExtensionObject, exception);
+ JSC::ExecState* exec = debuggerCallFrame.globalExec();
</ins><span class="cx"> if (exception)
</span><span class="cx"> reportException(exec, exception);
</span><span class="cx">
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> void ScriptDebugServer::dispatchDidPause(ScriptDebugListener* listener)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isPaused());
</span><del>- DebuggerCallFrame* debuggerCallFrame = currentDebuggerCallFrame();
- JSGlobalObject* globalObject = debuggerCallFrame->scope()->globalObject();
</del><ins>+ DebuggerCallFrame& debuggerCallFrame = currentDebuggerCallFrame();
+ JSGlobalObject* globalObject = debuggerCallFrame.scope()->globalObject();
</ins><span class="cx"> JSC::ExecState& state = *globalObject->globalExec();
</span><span class="cx"> JSValue jsCallFrame = toJS(&state, globalObject, JavaScriptCallFrame::create(debuggerCallFrame).ptr());
</span><span class="cx"> listener->didPause(state, jsCallFrame, exceptionOrCaughtValue(&state));
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> if (reasonForPause() == PausedForException)
</span><span class="cx"> return currentException();
</span><span class="cx">
</span><del>- for (RefPtr<DebuggerCallFrame> frame = currentDebuggerCallFrame(); frame; frame = frame->callerFrame()) {
</del><ins>+ for (RefPtr<DebuggerCallFrame> frame = &currentDebuggerCallFrame(); frame; frame = frame->callerFrame()) {
</ins><span class="cx"> DebuggerScope& scope = *frame->scope();
</span><span class="cx"> if (scope.isCatchScope())
</span><span class="cx"> return scope.caughtValue(state);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorConsoleAgent::stopTiming(const String& title, PassRefPtr<ScriptCallStack> callStack)
</del><ins>+void InspectorConsoleAgent::stopTiming(const String& title, Ref<ScriptCallStack>&& callStack)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!title.isNull());
</span><span class="cx"> if (title.isNull())
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">
</span><span class="cx"> double elapsed = monotonicallyIncreasingTime() - startTime;
</span><span class="cx"> String message = title + String::format(": %.3fms", elapsed * 1000);
</span><del>- addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::Timing, MessageLevel::Debug, message, callStack));
</del><ins>+ addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::Timing, MessageLevel::Debug, message, WTFMove(callStack)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::takeHeapSnapshot(const String& title)
</span><span class="lines">@@ -180,9 +180,9 @@
</span><span class="cx"> m_frontendDispatcher->heapSnapshot(timestamp, snapshotData, title.isEmpty() ? nullptr : &title);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorConsoleAgent::count(JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments)
</del><ins>+void InspectorConsoleAgent::count(JSC::ExecState* state, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><del>- RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(state, ScriptCallStack::maxCallStackSizeToCapture));
</del><ins>+ Ref<ScriptCallStack> callStack = createScriptCallStackForConsole(state, ScriptCallStack::maxCallStackSizeToCapture);
</ins><span class="cx">
</span><span class="cx"> String title;
</span><span class="cx"> String identifier;
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> // FIXME: Web Inspector should have a better UI for counters, but for now we just log an updated counter value.
</span><span class="cx">
</span><span class="cx"> String message = makeString(title, ": ", String::number(result.iterator->value));
</span><del>- addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::Log, MessageLevel::Debug, message, callStack));
</del><ins>+ addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::Log, MessageLevel::Debug, message, WTFMove(callStack)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isGroupMessage(MessageType type)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -71,9 +71,9 @@
</span><span class="cx"> void addMessageToConsole(std::unique_ptr<ConsoleMessage>);
</span><span class="cx">
</span><span class="cx"> void startTiming(const String& title);
</span><del>- void stopTiming(const String& title, PassRefPtr<ScriptCallStack>);
</del><ins>+ void stopTiming(const String& title, Ref<ScriptCallStack>&&);
</ins><span class="cx"> void takeHeapSnapshot(const String& title);
</span><del>- void count(JSC::ExecState*, PassRefPtr<ScriptArguments>);
</del><ins>+ void count(JSC::ExecState*, Ref<ScriptArguments>&&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void addConsoleMessage(std::unique_ptr<ConsoleMessage>);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -230,9 +230,9 @@
</span><span class="cx"> if (!m_scriptDebugServer.breakpointsActive())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<ScriptCallStack> callStack = createScriptCallStack(exec, m_asyncStackTraceDepth);
- ASSERT(callStack && callStack->size());
- if (!callStack || !callStack->size())
</del><ins>+ Ref<ScriptCallStack> callStack = createScriptCallStack(exec, m_asyncStackTraceDepth);
+ ASSERT(callStack->size());
+ if (!callStack->size())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RefPtr<AsyncStackTrace> parentStackTrace;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/runtime/ConsoleClient.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -147,11 +147,11 @@
</span><span class="cx"> WTFLogAlways("%s", builder.toString().utf8().data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::printConsoleMessageWithArguments(MessageSource source, MessageType type, MessageLevel level, JSC::ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::printConsoleMessageWithArguments(MessageSource source, MessageType type, MessageLevel level, JSC::ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> bool isTraceMessage = type == MessageType::Trace;
</span><span class="cx"> size_t stackSize = isTraceMessage ? ScriptCallStack::maxCallStackSizeToCapture : 1;
</span><del>- RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, stackSize));
</del><ins>+ Ref<ScriptCallStack> callStack = createScriptCallStackForConsole(exec, stackSize);
</ins><span class="cx"> const ScriptCallFrame& lastCaller = callStack->at(0);
</span><span class="cx">
</span><span class="cx"> StringBuilder builder;
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::internalMessageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, RefPtr<ScriptArguments>&& arguments, ArgumentRequirement argumentRequirement)
</del><ins>+void ConsoleClient::internalMessageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, Ref<ScriptArguments>&& arguments, ArgumentRequirement argumentRequirement)
</ins><span class="cx"> {
</span><span class="cx"> if (argumentRequirement == ArgumentRequired && !arguments->argumentCount())
</span><span class="cx"> return;
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> messageWithTypeAndLevel(type, level, exec, WTFMove(arguments));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::logWithLevel(ExecState* exec, RefPtr<ScriptArguments>&& arguments, MessageLevel level)
</del><ins>+void ConsoleClient::logWithLevel(ExecState* exec, Ref<ScriptArguments>&& arguments, MessageLevel level)
</ins><span class="cx"> {
</span><span class="cx"> internalMessageWithTypeAndLevel(MessageType::Log, level, exec, WTFMove(arguments), ArgumentRequired);
</span><span class="cx"> }
</span><span class="lines">@@ -208,42 +208,42 @@
</span><span class="cx"> internalMessageWithTypeAndLevel(MessageType::Clear, MessageLevel::Log, exec, ScriptArguments::createEmpty(exec), ArgumentNotRequired);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::dir(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::dir(ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> internalMessageWithTypeAndLevel(MessageType::Dir, MessageLevel::Log, exec, WTFMove(arguments), ArgumentRequired);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::dirXML(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::dirXML(ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> internalMessageWithTypeAndLevel(MessageType::DirXML, MessageLevel::Log, exec, WTFMove(arguments), ArgumentRequired);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::table(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::table(ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> internalMessageWithTypeAndLevel(MessageType::Table, MessageLevel::Log, exec, WTFMove(arguments), ArgumentRequired);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::trace(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::trace(ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> internalMessageWithTypeAndLevel(MessageType::Trace, MessageLevel::Log, exec, WTFMove(arguments), ArgumentNotRequired);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::assertion(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::assertion(ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> internalMessageWithTypeAndLevel(MessageType::Assert, MessageLevel::Error, exec, WTFMove(arguments), ArgumentNotRequired);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::group(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::group(ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> internalMessageWithTypeAndLevel(MessageType::StartGroup, MessageLevel::Log, exec, WTFMove(arguments), ArgumentNotRequired);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::groupCollapsed(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::groupCollapsed(ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> internalMessageWithTypeAndLevel(MessageType::StartGroupCollapsed, MessageLevel::Log, exec, WTFMove(arguments), ArgumentNotRequired);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleClient::groupEnd(ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void ConsoleClient::groupEnd(ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> internalMessageWithTypeAndLevel(MessageType::EndGroup, MessageLevel::Log, exec, WTFMove(arguments), ArgumentNotRequired);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConsoleClient.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConsoleClient.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/runtime/ConsoleClient.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -41,31 +41,31 @@
</span><span class="cx"> virtual ~ConsoleClient() { }
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static void printConsoleMessage(MessageSource, MessageType, MessageLevel, const String& message, const String& url, unsigned lineNumber, unsigned columnNumber);
</span><del>- JS_EXPORT_PRIVATE static void printConsoleMessageWithArguments(MessageSource, MessageType, MessageLevel, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ JS_EXPORT_PRIVATE static void printConsoleMessageWithArguments(MessageSource, MessageType, MessageLevel, JSC::ExecState*, Ref<Inspector::ScriptArguments>&&);
</ins><span class="cx">
</span><del>- void logWithLevel(ExecState*, RefPtr<Inspector::ScriptArguments>&&, MessageLevel);
</del><ins>+ void logWithLevel(ExecState*, Ref<Inspector::ScriptArguments>&&, MessageLevel);
</ins><span class="cx"> void clear(ExecState*);
</span><del>- void dir(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void dirXML(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void table(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void trace(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void assertion(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void group(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void groupCollapsed(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- void groupEnd(ExecState*, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ void dir(ExecState*, Ref<Inspector::ScriptArguments>&&);
+ void dirXML(ExecState*, Ref<Inspector::ScriptArguments>&&);
+ void table(ExecState*, Ref<Inspector::ScriptArguments>&&);
+ void trace(ExecState*, Ref<Inspector::ScriptArguments>&&);
+ void assertion(ExecState*, Ref<Inspector::ScriptArguments>&&);
+ void group(ExecState*, Ref<Inspector::ScriptArguments>&&);
+ void groupCollapsed(ExecState*, Ref<Inspector::ScriptArguments>&&);
+ void groupEnd(ExecState*, Ref<Inspector::ScriptArguments>&&);
</ins><span class="cx">
</span><del>- virtual void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) = 0;
- virtual void count(ExecState*, RefPtr<Inspector::ScriptArguments>&&) = 0;
</del><ins>+ virtual void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, Ref<Inspector::ScriptArguments>&&) = 0;
+ virtual void count(ExecState*, Ref<Inspector::ScriptArguments>&&) = 0;
</ins><span class="cx"> virtual void profile(ExecState*, const String& title) = 0;
</span><span class="cx"> virtual void profileEnd(ExecState*, const String& title) = 0;
</span><span class="cx"> virtual void takeHeapSnapshot(ExecState*, const String& title) = 0;
</span><span class="cx"> virtual void time(ExecState*, const String& title) = 0;
</span><span class="cx"> virtual void timeEnd(ExecState*, const String& title) = 0;
</span><del>- virtual void timeStamp(ExecState*, RefPtr<Inspector::ScriptArguments>&&) = 0;
</del><ins>+ virtual void timeStamp(ExecState*, Ref<Inspector::ScriptArguments>&&) = 0;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> enum ArgumentRequirement { ArgumentRequired, ArgumentNotRequired };
</span><del>- void internalMessageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&, ArgumentRequirement);
</del><ins>+ void internalMessageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, Ref<Inspector::ScriptArguments>&&, ArgumentRequirement);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConsoleObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -110,8 +110,7 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
- client->logWithLevel(exec, WTFMove(arguments), level);
</del><ins>+ client->logWithLevel(exec, Inspector::createScriptArguments(exec, 0), level);
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -156,8 +155,7 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
- client->dir(exec, WTFMove(arguments));
</del><ins>+ client->dir(exec, Inspector::createScriptArguments(exec, 0));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -167,8 +165,7 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
- client->dirXML(exec, WTFMove(arguments));
</del><ins>+ client->dirXML(exec, Inspector::createScriptArguments(exec, 0));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -178,8 +175,7 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
- client->table(exec, WTFMove(arguments));
</del><ins>+ client->table(exec, Inspector::createScriptArguments(exec, 0));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -189,8 +185,7 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
- client->trace(exec, WTFMove(arguments));
</del><ins>+ client->trace(exec, Inspector::createScriptArguments(exec, 0));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -208,8 +203,7 @@
</span><span class="cx"> if (condition)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 1));
- client->assertion(exec, WTFMove(arguments));
</del><ins>+ client->assertion(exec, Inspector::createScriptArguments(exec, 1));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -219,8 +213,7 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
- client->count(exec, WTFMove(arguments));
</del><ins>+ client->count(exec, Inspector::createScriptArguments(exec, 0));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -340,8 +333,7 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
- client->timeStamp(exec, WTFMove(arguments));
</del><ins>+ client->timeStamp(exec, Inspector::createScriptArguments(exec, 0));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -351,8 +343,7 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
- client->group(exec, WTFMove(arguments));
</del><ins>+ client->group(exec, Inspector::createScriptArguments(exec, 0));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -362,8 +353,7 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
- client->groupCollapsed(exec, WTFMove(arguments));
</del><ins>+ client->groupCollapsed(exec, Inspector::createScriptArguments(exec, 0));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -373,8 +363,7 @@
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- RefPtr<Inspector::ScriptArguments> arguments(Inspector::createScriptArguments(exec, 0));
- client->groupEnd(exec, WTFMove(arguments));
</del><ins>+ client->groupEnd(exec, Inspector::createScriptArguments(exec, 0));
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/ChangeLog 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2017-02-16 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [JSC] Drop PassRefPtr in inspector/
+ https://bugs.webkit.org/show_bug.cgi?id=168420
+
+ Reviewed by Alex Christensen.
+
+ Use Ref<Inspector::ScriptArguments> and Ref<ScriptCallStack> as much as possible.
+ It drops some unnecessary null checks.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateCallWith):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjPrototypeFunctionWithScriptArgumentsAndCallStackCaller):
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::PendingException::PendingException):
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::consoleCountImpl):
+ (WebCore::InspectorInstrumentation::stopConsoleTimingImpl):
+ (WebCore::InspectorInstrumentation::consoleTimeStampImpl):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::consoleCount):
+ (WebCore::InspectorInstrumentation::stopConsoleTiming):
+ (WebCore::InspectorInstrumentation::consoleTimeStamp):
+ * inspector/InspectorNetworkAgent.cpp:
+ (WebCore::InspectorNetworkAgent::buildInitiatorObject):
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::createGenericRecord):
+ * inspector/WebInjectedScriptManager.cpp:
+ (WebCore::WebInjectedScriptManager::WebInjectedScriptManager):
+ * inspector/WebInjectedScriptManager.h:
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::postMessageTimerFired):
+ We dispatch appropriate addMessage function according to whether
+ `timer.stackTrace()` is nullptr.
+
+ * page/PageConsoleClient.cpp:
+ (WebCore::PageConsoleClient::addMessage):
+ (WebCore::PageConsoleClient::messageWithTypeAndLevel):
+ (WebCore::PageConsoleClient::count):
+ (WebCore::PageConsoleClient::timeEnd):
+ (WebCore::PageConsoleClient::timeStamp):
+ * page/PageConsoleClient.h:
+ * workers/WorkerConsoleClient.cpp:
+ (WebCore::WorkerConsoleClient::messageWithTypeAndLevel):
+ (WebCore::WorkerConsoleClient::count):
+ (WebCore::WorkerConsoleClient::timeEnd):
+ (WebCore::WorkerConsoleClient::timeStamp):
+ * workers/WorkerConsoleClient.h:
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::addMessage):
+
</ins><span class="cx"> 2017-02-16 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Make form validation accessible on iOS
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -4529,7 +4529,7 @@
</span><span class="cx"> push(@callWithArgs, "*document");
</span><span class="cx"> }
</span><span class="cx"> if ($function and $codeGenerator->ExtendedAttributeContains($callWith, "ScriptArguments")) {
</span><del>- push(@$outputArray, " RefPtr<Inspector::ScriptArguments> scriptArguments(Inspector::createScriptArguments($statePointer, " . @{$function->arguments} . "));\n");
</del><ins>+ push(@$outputArray, " Ref<Inspector::ScriptArguments> scriptArguments(Inspector::createScriptArguments($statePointer, " . @{$function->arguments} . "));\n");
</ins><span class="cx"> $implIncludes{"<inspector/ScriptArguments.h>"} = 1;
</span><span class="cx"> $implIncludes{"<inspector/ScriptCallStackFactory.h>"} = 1;
</span><span class="cx"> push(@callWithArgs, "WTFMove(scriptArguments)");
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -6112,7 +6112,7 @@
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><del>- RefPtr<Inspector::ScriptArguments> scriptArguments(Inspector::createScriptArguments(state, 0));
</del><ins>+ Ref<Inspector::ScriptArguments> scriptArguments(Inspector::createScriptArguments(state, 0));
</ins><span class="cx"> impl.withScriptArgumentsAndCallStack(WTFMove(scriptArguments));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> , m_lineNumber(lineNumber)
</span><span class="cx"> , m_columnNumber(columnNumber)
</span><span class="cx"> , m_sourceURL(sourceURL)
</span><del>- , m_callStack(callStack)
</del><ins>+ , m_callStack(WTFMove(callStack))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> String m_errorMessage;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -838,10 +838,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::consoleCountImpl(InstrumentingAgents& instrumentingAgents, JSC::ExecState* state, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void InspectorInstrumentation::consoleCountImpl(InstrumentingAgents& instrumentingAgents, JSC::ExecState* state, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent())
</span><del>- consoleAgent->count(state, arguments);
</del><ins>+ consoleAgent->count(state, WTFMove(arguments));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::takeHeapSnapshotImpl(InstrumentingAgents& instrumentingAgents, const String& title)
</span><span class="lines">@@ -864,21 +864,21 @@
</span><span class="cx"> consoleAgent->startTiming(title);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::stopConsoleTimingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame, const String& title, RefPtr<ScriptCallStack>&& stack)
</del><ins>+void InspectorInstrumentation::stopConsoleTimingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame, const String& title, Ref<ScriptCallStack>&& stack)
</ins><span class="cx"> {
</span><span class="cx"> if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent())
</span><del>- consoleAgent->stopTiming(title, stack);
</del><ins>+ consoleAgent->stopTiming(title, WTFMove(stack));
</ins><span class="cx"> if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
</span><span class="cx"> timelineAgent->timeEnd(frame, title);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::stopConsoleTimingImpl(InstrumentingAgents& instrumentingAgents, const String& title, RefPtr<ScriptCallStack>&& stack)
</del><ins>+void InspectorInstrumentation::stopConsoleTimingImpl(InstrumentingAgents& instrumentingAgents, const String& title, Ref<ScriptCallStack>&& stack)
</ins><span class="cx"> {
</span><span class="cx"> if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent())
</span><del>- consoleAgent->stopTiming(title, stack);
</del><ins>+ consoleAgent->stopTiming(title, WTFMove(stack));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::consoleTimeStampImpl(InstrumentingAgents& instrumentingAgents, Frame& frame, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void InspectorInstrumentation::consoleTimeStampImpl(InstrumentingAgents& instrumentingAgents, Frame& frame, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent()) {
</span><span class="cx"> String message;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -184,14 +184,14 @@
</span><span class="cx"> static void addMessageToConsole(Page&, std::unique_ptr<Inspector::ConsoleMessage>);
</span><span class="cx"> static void addMessageToConsole(WorkerGlobalScope&, std::unique_ptr<Inspector::ConsoleMessage>);
</span><span class="cx">
</span><del>- static void consoleCount(Page&, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&);
- static void consoleCount(WorkerGlobalScope&, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ static void consoleCount(Page&, JSC::ExecState*, Ref<Inspector::ScriptArguments>&&);
+ static void consoleCount(WorkerGlobalScope&, JSC::ExecState*, Ref<Inspector::ScriptArguments>&&);
</ins><span class="cx"> static void takeHeapSnapshot(Frame&, const String& title);
</span><span class="cx"> static void startConsoleTiming(Frame&, const String& title);
</span><span class="cx"> static void startConsoleTiming(WorkerGlobalScope&, const String& title);
</span><del>- static void stopConsoleTiming(Frame&, const String& title, RefPtr<Inspector::ScriptCallStack>&&);
- static void stopConsoleTiming(WorkerGlobalScope&, const String& title, RefPtr<Inspector::ScriptCallStack>&&);
- static void consoleTimeStamp(Frame&, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ static void stopConsoleTiming(Frame&, const String& title, Ref<Inspector::ScriptCallStack>&&);
+ static void stopConsoleTiming(WorkerGlobalScope&, const String& title, Ref<Inspector::ScriptCallStack>&&);
+ static void consoleTimeStamp(Frame&, Ref<Inspector::ScriptArguments>&&);
</ins><span class="cx"> static void startProfiling(Page&, JSC::ExecState*, const String& title);
</span><span class="cx"> static void stopProfiling(Page&, JSC::ExecState*, const String& title);
</span><span class="cx">
</span><span class="lines">@@ -349,13 +349,13 @@
</span><span class="cx">
</span><span class="cx"> static void addMessageToConsoleImpl(InstrumentingAgents&, std::unique_ptr<Inspector::ConsoleMessage>);
</span><span class="cx">
</span><del>- static void consoleCountImpl(InstrumentingAgents&, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ static void consoleCountImpl(InstrumentingAgents&, JSC::ExecState*, Ref<Inspector::ScriptArguments>&&);
</ins><span class="cx"> static void takeHeapSnapshotImpl(InstrumentingAgents&, const String& title);
</span><span class="cx"> static void startConsoleTimingImpl(InstrumentingAgents&, Frame&, const String& title);
</span><span class="cx"> static void startConsoleTimingImpl(InstrumentingAgents&, const String& title);
</span><del>- static void stopConsoleTimingImpl(InstrumentingAgents&, Frame&, const String& title, RefPtr<Inspector::ScriptCallStack>&&);
- static void stopConsoleTimingImpl(InstrumentingAgents&, const String& title, RefPtr<Inspector::ScriptCallStack>&&);
- static void consoleTimeStampImpl(InstrumentingAgents&, Frame&, RefPtr<Inspector::ScriptArguments>&&);
</del><ins>+ static void stopConsoleTimingImpl(InstrumentingAgents&, Frame&, const String& title, Ref<Inspector::ScriptCallStack>&&);
+ static void stopConsoleTimingImpl(InstrumentingAgents&, const String& title, Ref<Inspector::ScriptCallStack>&&);
+ static void consoleTimeStampImpl(InstrumentingAgents&, Frame&, Ref<Inspector::ScriptArguments>&&);
</ins><span class="cx">
</span><span class="cx"> static void didRequestAnimationFrameImpl(InstrumentingAgents&, int callbackId, Frame*);
</span><span class="cx"> static void didCancelAnimationFrameImpl(InstrumentingAgents&, int callbackId, Frame*);
</span><span class="lines">@@ -1195,12 +1195,12 @@
</span><span class="cx"> addMessageToConsoleImpl(instrumentingAgentsForWorkerGlobalScope(workerGlobalScope), WTFMove(message));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::consoleCount(Page& page, JSC::ExecState* state, RefPtr<Inspector::ScriptArguments>&& arguments)
</del><ins>+inline void InspectorInstrumentation::consoleCount(Page& page, JSC::ExecState* state, Ref<Inspector::ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> consoleCountImpl(instrumentingAgentsForPage(page), state, WTFMove(arguments));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::consoleCount(WorkerGlobalScope& workerGlobalScope, JSC::ExecState* state, RefPtr<Inspector::ScriptArguments>&& arguments)
</del><ins>+inline void InspectorInstrumentation::consoleCount(WorkerGlobalScope& workerGlobalScope, JSC::ExecState* state, Ref<Inspector::ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> consoleCountImpl(instrumentingAgentsForWorkerGlobalScope(workerGlobalScope), state, WTFMove(arguments));
</span><span class="cx"> }
</span><span class="lines">@@ -1223,18 +1223,18 @@
</span><span class="cx"> startConsoleTimingImpl(instrumentingAgentsForWorkerGlobalScope(workerGlobalScope), title);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::stopConsoleTiming(Frame& frame, const String& title, RefPtr<Inspector::ScriptCallStack>&& stack)
</del><ins>+inline void InspectorInstrumentation::stopConsoleTiming(Frame& frame, const String& title, Ref<Inspector::ScriptCallStack>&& stack)
</ins><span class="cx"> {
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
</span><span class="cx"> stopConsoleTimingImpl(*instrumentingAgents, frame, title, WTFMove(stack));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::stopConsoleTiming(WorkerGlobalScope& workerGlobalScope, const String& title, RefPtr<Inspector::ScriptCallStack>&& stack)
</del><ins>+inline void InspectorInstrumentation::stopConsoleTiming(WorkerGlobalScope& workerGlobalScope, const String& title, Ref<Inspector::ScriptCallStack>&& stack)
</ins><span class="cx"> {
</span><span class="cx"> stopConsoleTimingImpl(instrumentingAgentsForWorkerGlobalScope(workerGlobalScope), title, WTFMove(stack));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::consoleTimeStamp(Frame& frame, RefPtr<Inspector::ScriptArguments>&& arguments)
</del><ins>+inline void InspectorInstrumentation::consoleTimeStamp(Frame& frame, Ref<Inspector::ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorNetworkAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -502,8 +502,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Inspector::Protocol::Network::Initiator> InspectorNetworkAgent::buildInitiatorObject(Document* document)
</span><span class="cx"> {
</span><del>- RefPtr<ScriptCallStack> stackTrace = createScriptCallStack(JSMainThreadExecState::currentState(), ScriptCallStack::maxCallStackSizeToCapture);
- if (stackTrace && stackTrace->size() > 0) {
</del><ins>+ Ref<ScriptCallStack> stackTrace = createScriptCallStack(JSMainThreadExecState::currentState(), ScriptCallStack::maxCallStackSizeToCapture);
+ if (stackTrace->size() > 0) {
</ins><span class="cx"> auto initiatorObject = Inspector::Protocol::Network::Initiator::create()
</span><span class="cx"> .setType(Inspector::Protocol::Network::Initiator::Type::Script)
</span><span class="cx"> .release();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> record->setDouble(ASCIILiteral("startTime"), startTime);
</span><span class="cx">
</span><span class="cx"> if (maxCallStackDepth) {
</span><del>- RefPtr<ScriptCallStack> stackTrace = createScriptCallStack(JSMainThreadExecState::currentState(), maxCallStackDepth);
- if (stackTrace && stackTrace->size())
</del><ins>+ Ref<ScriptCallStack> stackTrace = createScriptCallStack(JSMainThreadExecState::currentState(), maxCallStackDepth);
+ if (stackTrace->size())
</ins><span class="cx"> record->setValue(ASCIILiteral("stackTrace"), stackTrace->buildInspectorArray());
</span><span class="cx"> }
</span><span class="cx"> return record;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebInjectedScriptManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebInjectedScriptManager.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebInjectedScriptManager.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/inspector/WebInjectedScriptManager.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebInjectedScriptManager::WebInjectedScriptManager(InspectorEnvironment& environment, RefPtr<InjectedScriptHost>&& host)
</del><ins>+WebInjectedScriptManager::WebInjectedScriptManager(InspectorEnvironment& environment, Ref<InjectedScriptHost>&& host)
</ins><span class="cx"> : InjectedScriptManager(environment, WTFMove(host))
</span><span class="cx"> , m_commandLineAPIHost(CommandLineAPIHost::create())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebInjectedScriptManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebInjectedScriptManager.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebInjectedScriptManager.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/inspector/WebInjectedScriptManager.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> class WebInjectedScriptManager final : public Inspector::InjectedScriptManager {
</span><span class="cx"> public:
</span><del>- WebInjectedScriptManager(Inspector::InspectorEnvironment&, RefPtr<Inspector::InjectedScriptHost>&&);
</del><ins>+ WebInjectedScriptManager(Inspector::InspectorEnvironment&, Ref<Inspector::InjectedScriptHost>&&);
</ins><span class="cx"> virtual ~WebInjectedScriptManager() { }
</span><span class="cx">
</span><span class="cx"> CommandLineAPIHost* commandLineAPIHost() const { return m_commandLineAPIHost.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -993,7 +993,10 @@
</span><span class="cx"> if (!intendedTargetOrigin->isSameSchemeHostPort(document()->securityOrigin())) {
</span><span class="cx"> if (auto* pageConsole = console()) {
</span><span class="cx"> String message = makeString("Unable to post message to ", intendedTargetOrigin->toString(), ". Recipient has origin ", document()->securityOrigin().toString(), ".\n");
</span><del>- pageConsole->addMessage(MessageSource::Security, MessageLevel::Error, message, timer.stackTrace());
</del><ins>+ if (timer.stackTrace())
+ pageConsole->addMessage(MessageSource::Security, MessageLevel::Error, message, *timer.stackTrace());
+ else
+ pageConsole->addMessage(MessageSource::Security, MessageLevel::Error, message);
</ins><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsoleClient.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsoleClient.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/page/PageConsoleClient.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> addMessage(source, level, message, url, line, column, 0, JSMainThreadExecState::currentState(), requestIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageConsoleClient::addMessage(MessageSource source, MessageLevel level, const String& message, RefPtr<ScriptCallStack>&& callStack)
</del><ins>+void PageConsoleClient::addMessage(MessageSource source, MessageLevel level, const String& message, Ref<ScriptCallStack>&& callStack)
</ins><span class="cx"> {
</span><span class="cx"> addMessage(source, level, message, String(), 0, 0, WTFMove(callStack), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> std::unique_ptr<Inspector::ConsoleMessage> message;
</span><span class="cx">
</span><span class="cx"> if (callStack)
</span><del>- message = std::make_unique<Inspector::ConsoleMessage>(source, MessageType::Log, level, messageText, WTFMove(callStack), requestIdentifier);
</del><ins>+ message = std::make_unique<Inspector::ConsoleMessage>(source, MessageType::Log, level, messageText, callStack.releaseNonNull(), requestIdentifier);
</ins><span class="cx"> else
</span><span class="cx"> message = std::make_unique<Inspector::ConsoleMessage>(source, MessageType::Log, level, messageText, suggestedURL, suggestedLineNumber, suggestedColumnNumber, state, requestIdentifier);
</span><span class="cx">
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-void PageConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, RefPtr<Inspector::ScriptArguments>&& arguments)
</del><ins>+void PageConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, Ref<Inspector::ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> String messageText;
</span><span class="cx"> bool gotMessage = arguments->getFirstArgumentAsString(messageText);
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> ConsoleClient::printConsoleMessageWithArguments(MessageSource::ConsoleAPI, type, level, exec, WTFMove(arguments));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageConsoleClient::count(JSC::ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void PageConsoleClient::count(JSC::ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> InspectorInstrumentation::consoleCount(m_page, exec, WTFMove(arguments));
</span><span class="cx"> }
</span><span class="lines">@@ -205,11 +205,10 @@
</span><span class="cx">
</span><span class="cx"> void PageConsoleClient::timeEnd(JSC::ExecState* exec, const String& title)
</span><span class="cx"> {
</span><del>- RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, 1));
- InspectorInstrumentation::stopConsoleTiming(m_page.mainFrame(), title, WTFMove(callStack));
</del><ins>+ InspectorInstrumentation::stopConsoleTiming(m_page.mainFrame(), title, createScriptCallStackForConsole(exec, 1));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PageConsoleClient::timeStamp(JSC::ExecState*, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void PageConsoleClient::timeStamp(JSC::ExecState*, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> InspectorInstrumentation::consoleTimeStamp(m_page.mainFrame(), WTFMove(arguments));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConsoleClient.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConsoleClient.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/page/PageConsoleClient.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -54,18 +54,18 @@
</span><span class="cx"> static void unmute();
</span><span class="cx">
</span><span class="cx"> void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&& = nullptr, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0);
</span><del>- void addMessage(MessageSource, MessageLevel, const String& message, RefPtr<Inspector::ScriptCallStack>&&);
</del><ins>+ void addMessage(MessageSource, MessageLevel, const String& message, Ref<Inspector::ScriptCallStack>&&);
</ins><span class="cx"> void addMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0, Document* = nullptr);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) override;
- void count(JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) override;
</del><ins>+ void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, Ref<Inspector::ScriptArguments>&&) override;
+ void count(JSC::ExecState*, Ref<Inspector::ScriptArguments>&&) override;
</ins><span class="cx"> void profile(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void profileEnd(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void takeHeapSnapshot(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void time(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void timeEnd(JSC::ExecState*, const String& title) override;
</span><del>- void timeStamp(JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) override;
</del><ins>+ void timeStamp(JSC::ExecState*, Ref<Inspector::ScriptArguments>&&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Page& m_page;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerConsoleClient.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerConsoleClient.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/workers/WorkerConsoleClient.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, RefPtr<Inspector::ScriptArguments>&& arguments)
</del><ins>+void WorkerConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level, JSC::ExecState* exec, Ref<Inspector::ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> String messageText;
</span><span class="cx"> arguments->getFirstArgumentAsString(messageText);
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> m_workerGlobalScope.addConsoleMessage(WTFMove(message));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerConsoleClient::count(JSC::ExecState* exec, RefPtr<ScriptArguments>&& arguments)
</del><ins>+void WorkerConsoleClient::count(JSC::ExecState* exec, Ref<ScriptArguments>&& arguments)
</ins><span class="cx"> {
</span><span class="cx"> InspectorInstrumentation::consoleCount(m_workerGlobalScope, exec, WTFMove(arguments));
</span><span class="cx"> }
</span><span class="lines">@@ -65,8 +65,7 @@
</span><span class="cx">
</span><span class="cx"> void WorkerConsoleClient::timeEnd(JSC::ExecState* exec, const String& title)
</span><span class="cx"> {
</span><del>- RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, 1));
- InspectorInstrumentation::stopConsoleTiming(m_workerGlobalScope, title, WTFMove(callStack));
</del><ins>+ InspectorInstrumentation::stopConsoleTiming(m_workerGlobalScope, title, createScriptCallStackForConsole(exec, 1));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: <https://webkit.org/b/153499> Web Inspector: console.profile should use the new Sampling Profiler
</span><span class="lines">@@ -75,6 +74,6 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: <https://webkit.org/b/127634> Web Inspector: support debugging web workers
</span><span class="cx"> void WorkerConsoleClient::takeHeapSnapshot(JSC::ExecState*, const String&) { }
</span><del>-void WorkerConsoleClient::timeStamp(JSC::ExecState*, RefPtr<ScriptArguments>&&) { }
</del><ins>+void WorkerConsoleClient::timeStamp(JSC::ExecState*, Ref<ScriptArguments>&&) { }
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerConsoleClient.h (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerConsoleClient.h 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/workers/WorkerConsoleClient.h 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -42,14 +42,14 @@
</span><span class="cx"> virtual ~WorkerConsoleClient();
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) override;
- void count(JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) override;
</del><ins>+ void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, Ref<Inspector::ScriptArguments>&&) override;
+ void count(JSC::ExecState*, Ref<Inspector::ScriptArguments>&&) override;
</ins><span class="cx"> void profile(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void profileEnd(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void takeHeapSnapshot(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void time(JSC::ExecState*, const String& title) override;
</span><span class="cx"> void timeEnd(JSC::ExecState*, const String& title) override;
</span><del>- void timeStamp(JSC::ExecState*, RefPtr<Inspector::ScriptArguments>&&) override;
</del><ins>+ void timeStamp(JSC::ExecState*, Ref<Inspector::ScriptArguments>&&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WorkerGlobalScope& m_workerGlobalScope;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Inspector::ConsoleMessage> message;
</span><span class="cx"> if (callStack)
</span><del>- message = std::make_unique<Inspector::ConsoleMessage>(source, MessageType::Log, level, messageText, WTFMove(callStack), requestIdentifier);
</del><ins>+ message = std::make_unique<Inspector::ConsoleMessage>(source, MessageType::Log, level, messageText, callStack.releaseNonNull(), requestIdentifier);
</ins><span class="cx"> else
</span><span class="cx"> message = std::make_unique<Inspector::ConsoleMessage>(source, MessageType::Log, level, messageText, sourceURL, lineNumber, columnNumber, state, requestIdentifier);
</span><span class="cx"> InspectorInstrumentation::addMessageToConsole(*this, WTFMove(message));
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-02-16 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [JSC] Drop PassRefPtr in inspector/
+ https://bugs.webkit.org/show_bug.cgi?id=168420
+
+ Reviewed by Alex Christensen.
+
+ * WebView/WebScriptDebugger.mm:
+ (WebScriptDebugger::handlePause):
+
</ins><span class="cx"> 2017-02-16 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up use of some CALayer-related SPI
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebScriptDebuggermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebScriptDebugger.mm (212447 => 212448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebScriptDebugger.mm 2017-02-16 18:38:14 UTC (rev 212447)
+++ trunk/Source/WebKit/mac/WebView/WebScriptDebugger.mm 2017-02-16 18:49:40 UTC (rev 212448)
</span><span class="lines">@@ -131,9 +131,9 @@
</span><span class="cx">
</span><span class="cx"> WebFrame *webFrame = toWebFrame(globalObject);
</span><span class="cx"> WebView *webView = [webFrame webView];
</span><del>- DebuggerCallFrame* debuggerCallFrame = currentDebuggerCallFrame();
</del><ins>+ DebuggerCallFrame& debuggerCallFrame = currentDebuggerCallFrame();
</ins><span class="cx"> JSValue exceptionValue = currentException();
</span><del>- String functionName = debuggerCallFrame->functionName();
</del><ins>+ String functionName = debuggerCallFrame.functionName();
</ins><span class="cx"> RetainPtr<WebScriptCallFrame> webCallFrame = adoptNS([[WebScriptCallFrame alloc] _initWithGlobalObject:core(webFrame)->script().windowScriptObject() functionName:functionName exceptionValue:exceptionValue]);
</span><span class="cx">
</span><span class="cx"> WebScriptDebugDelegateImplementationCache* cache = WebViewGetScriptDebugDelegateImplementations(webView);
</span><span class="lines">@@ -140,9 +140,9 @@
</span><span class="cx"> if (cache->exceptionWasRaisedFunc) {
</span><span class="cx"> if (cache->exceptionWasRaisedExpectsHasHandlerFlag) {
</span><span class="cx"> bool hasHandler = hasHandlerForExceptionCallback();
</span><del>- CallScriptDebugDelegate(cache->exceptionWasRaisedFunc, webView, @selector(webView:exceptionWasRaised:hasHandler:sourceId:line:forWebFrame:), webCallFrame.get(), hasHandler, debuggerCallFrame->sourceID(), debuggerCallFrame->line(), webFrame);
</del><ins>+ CallScriptDebugDelegate(cache->exceptionWasRaisedFunc, webView, @selector(webView:exceptionWasRaised:hasHandler:sourceId:line:forWebFrame:), webCallFrame.get(), hasHandler, debuggerCallFrame.sourceID(), debuggerCallFrame.line(), webFrame);
</ins><span class="cx"> } else
</span><del>- CallScriptDebugDelegate(cache->exceptionWasRaisedFunc, webView, @selector(webView:exceptionWasRaised:sourceId:line:forWebFrame:), webCallFrame.get(), debuggerCallFrame->sourceID(), debuggerCallFrame->line(), webFrame);
</del><ins>+ CallScriptDebugDelegate(cache->exceptionWasRaisedFunc, webView, @selector(webView:exceptionWasRaised:sourceId:line:forWebFrame:), webCallFrame.get(), debuggerCallFrame.sourceID(), debuggerCallFrame.line(), webFrame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_callingDelegate = false;
</span></span></pre>
</div>
</div>
</body>
</html>