<!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>[185608] trunk</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/185608">185608</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 13:51:04 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use NakedPtr<Exception>& to return exception results.
https://bugs.webkit.org/show_bug.cgi?id=145870
Reviewed by Anders Carlsson and Filip Pizlo.
Source/JavaScriptCore:
Before <a href="http://trac.webkit.org/projects/webkit/changeset/185259">r185259</a>, calls into the VM takes a JSValue* exception result argument for
returning any uncaught exception that may have been thrown while executing JS code.
As a result, clients of the VM functions will declare a local JSValue exception
result which is automatically initialized to a null value (i.e. the empty value,
not the JS null value).
With <a href="http://trac.webkit.org/projects/webkit/changeset/185259">r185259</a>, the VM functions were changed to take an Exception*& exception result
instead, and the VM functions are responsible for initializing the exception result
to null if no exception is thrown.
This introduces 2 issues:
1. the VM functions are vulnerable to modifications that may add early returns
before the exception result is nullified. This can result in the exception
result being used without initialization.
2. Previously, a client could technically use the same exception result for more
than one calls into the VM functions. If an earlier call sets it to a thrown
value, the thrown value will stick unless a subsequent call throws a different
exception.
With the new Exception*& exception result, the VM functions will always clear
the exception result before proceeding. As a result, the client's exception
result will be null after the second call even though the first call saw an
exception thrown. This is a change in the expected behavior.
To fix these issues, we'll introduce a NakedPtr smart pointer whose sole purpose
is to guarantee that the pointer is initialized. The VM functions will now take
a NakedPtr<Exception>& instead of the Exception*&. This ensures that the
exception result is initialized.
The VM functions be also reverted to only set the exception result if a new
exception is thrown.
* API/JSBase.cpp:
(JSEvaluateScript):
* API/JSScriptRef.cpp:
* bindings/ScriptFunctionCall.cpp:
(Deprecated::ScriptFunctionCall::call):
* bindings/ScriptFunctionCall.h:
* debugger/Debugger.cpp:
(JSC::Debugger::hasBreakpoint):
* debugger/Debugger.h:
* debugger/DebuggerCallFrame.cpp:
(JSC::DebuggerCallFrame::thisValue):
(JSC::DebuggerCallFrame::evaluate):
* debugger/DebuggerCallFrame.h:
(JSC::DebuggerCallFrame::isValid):
* inspector/InjectedScriptManager.cpp:
(Inspector::InjectedScriptManager::createInjectedScript):
* inspector/InspectorEnvironment.h:
* inspector/JSJavaScriptCallFrame.cpp:
(Inspector::JSJavaScriptCallFrame::evaluate):
* inspector/JavaScriptCallFrame.h:
(Inspector::JavaScriptCallFrame::vmEntryGlobalObject):
(Inspector::JavaScriptCallFrame::thisValue):
(Inspector::JavaScriptCallFrame::evaluate):
* inspector/ScriptDebugServer.cpp:
(Inspector::ScriptDebugServer::evaluateBreakpointAction):
* jsc.cpp:
(functionRun):
(functionLoad):
(runWithScripts):
(runInteractive):
* runtime/CallData.cpp:
(JSC::call):
* runtime/CallData.h:
* runtime/Completion.cpp:
(JSC::checkSyntax):
(JSC::evaluate):
* runtime/Completion.h:
(JSC::evaluate):
Source/WebCore:
No new WebCore tests because this functionality is already covered by existing tests.
API tests added for WTF::NakedPtr.
* bindings/js/JSCallbackData.cpp:
(WebCore::JSCallbackData::invokeCallback):
* bindings/js/JSCustomXPathNSResolver.cpp:
(WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
* bindings/js/JSErrorHandler.cpp:
(WebCore::JSErrorHandler::handleEvent):
* bindings/js/JSEventListener.cpp:
(WebCore::JSEventListener::handleEvent):
* bindings/js/JSMainThreadExecState.cpp:
(WebCore::JSMainThreadExecState::didLeaveScriptContext):
(WebCore::functionCallHandlerFromAnyThread):
(WebCore::evaluateHandlerFromAnyThread):
* bindings/js/JSMainThreadExecState.h:
(WebCore::JSMainThreadExecState::currentState):
(WebCore::JSMainThreadExecState::call):
(WebCore::JSMainThreadExecState::evaluate):
* bindings/js/JSMutationCallback.cpp:
(WebCore::JSMutationCallback::call):
* bindings/js/ScheduledAction.cpp:
(WebCore::ScheduledAction::executeFunctionInContext):
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::evaluateInWorld):
* bindings/js/WorkerScriptController.cpp:
(WebCore::WorkerScriptController::evaluate):
(WebCore::WorkerScriptController::setException):
* bindings/js/WorkerScriptController.h:
(WebCore::WorkerScriptController::workerGlobalScopeWrapper):
* bindings/objc/WebScriptObject.mm:
(-[WebScriptObject callWebScriptMethod:withArguments:]):
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::importScripts):
Source/WTF:
Introducing the NakedPtr class.
* WTF.xcodeproj/project.pbxproj:
* wtf/NakedPtr.h: Added.
(WTF::NakedPtr::NakedPtr):
(WTF::NakedPtr::get):
(WTF::NakedPtr::clear):
(WTF::NakedPtr::operator*):
(WTF::NakedPtr::operator->):
(WTF::NakedPtr::operator T*):
(WTF::NakedPtr::operator!):
(WTF::NakedPtr::operator bool):
(WTF::=):
(WTF::NakedPtr<T>::swap):
(WTF::swap):
Tools:
* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters:
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WTF/NakedPtr.cpp: Added.
(TestWebKitAPI::TEST):
(TestWebKitAPI::nakedPtrFoo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSBasecpp">trunk/Source/JavaScriptCore/API/JSBase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSScriptRefcpp">trunk/Source/JavaScriptCore/API/JSScriptRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebindingsScriptFunctionCallcpp">trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebindingsScriptFunctionCallh">trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.h</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="#trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp">trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerCallFrameh">trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptManagercpp">trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorEnvironmenth">trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.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="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCallDatacpp">trunk/Source/JavaScriptCore/runtime/CallData.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCallDatah">trunk/Source/JavaScriptCore/runtime/CallData.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCompletioncpp">trunk/Source/JavaScriptCore/runtime/Completion.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCompletionh">trunk/Source/JavaScriptCore/runtime/Completion.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCallbackDatacpp">trunk/Source/WebCore/bindings/js/JSCallbackData.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomXPathNSResolvercpp">trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSErrorHandlercpp">trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSEventListenercpp">trunk/Source/WebCore/bindings/js/JSEventListener.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMainThreadExecStatecpp">trunk/Source/WebCore/bindings/js/JSMainThreadExecState.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMainThreadExecStateh">trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMutationCallbackcpp">trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScheduledActioncpp">trunk/Source/WebCore/bindings/js/ScheduledAction.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptControllercpp">trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptControllerh">trunk/Source/WebCore/bindings/js/WorkerScriptController.h</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcWebScriptObjectmm">trunk/Source/WebCore/bindings/objc/WebScriptObject.mm</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPICMakeListstxt">trunk/Tools/TestWebKitAPI/CMakeLists.txt</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIvcxprojTestWebKitAPIvcxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIvcxprojTestWebKitAPIvcxprojfilters">trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters</a></li>
<li><a href="#trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfNakedPtrh">trunk/Source/WTF/wtf/NakedPtr.h</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFNakedPtrcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/NakedPtr.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSBase.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSBase.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/API/JSBase.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> JSGlobalObject* globalObject = exec->vmEntryGlobalObject();
</span><span class="cx"> SourceCode source = makeSource(script->string(), sourceURL ? sourceURL->string() : String(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));
</span><span class="cx">
</span><del>- Exception* evaluationException;
</del><ins>+ NakedPtr<Exception> evaluationException;
</ins><span class="cx"> JSValue returnValue = evaluate(globalObject->globalExec(), source, jsThisObject, evaluationException);
</span><span class="cx">
</span><span class="cx"> if (evaluationException) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSScriptRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSScriptRef.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSScriptRef.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/API/JSScriptRef.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>- Exception* internalException;
</del><ins>+ NakedPtr<Exception> internalException;
</ins><span class="cx"> JSValue thisValue = thisValueRef ? toJS(exec, thisValueRef) : jsUndefined();
</span><span class="cx"> JSValue result = evaluate(exec, SourceCode(script), thisValue, internalException);
</span><span class="cx"> if (internalException) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -1,3 +1,83 @@
</span><ins>+2015-06-16 Mark Lam <mark.lam@apple.com>
+
+ Use NakedPtr<Exception>& to return exception results.
+ https://bugs.webkit.org/show_bug.cgi?id=145870
+
+ Reviewed by Anders Carlsson and Filip Pizlo.
+
+ Before r185259, calls into the VM takes a JSValue* exception result argument for
+ returning any uncaught exception that may have been thrown while executing JS code.
+ As a result, clients of the VM functions will declare a local JSValue exception
+ result which is automatically initialized to a null value (i.e. the empty value,
+ not the JS null value).
+
+ With r185259, the VM functions were changed to take an Exception*& exception result
+ instead, and the VM functions are responsible for initializing the exception result
+ to null if no exception is thrown.
+
+ This introduces 2 issues:
+
+ 1. the VM functions are vulnerable to modifications that may add early returns
+ before the exception result is nullified. This can result in the exception
+ result being used without initialization.
+
+ 2. Previously, a client could technically use the same exception result for more
+ than one calls into the VM functions. If an earlier call sets it to a thrown
+ value, the thrown value will stick unless a subsequent call throws a different
+ exception.
+
+ With the new Exception*& exception result, the VM functions will always clear
+ the exception result before proceeding. As a result, the client's exception
+ result will be null after the second call even though the first call saw an
+ exception thrown. This is a change in the expected behavior.
+
+ To fix these issues, we'll introduce a NakedPtr smart pointer whose sole purpose
+ is to guarantee that the pointer is initialized. The VM functions will now take
+ a NakedPtr<Exception>& instead of the Exception*&. This ensures that the
+ exception result is initialized.
+
+ The VM functions be also reverted to only set the exception result if a new
+ exception is thrown.
+
+ * API/JSBase.cpp:
+ (JSEvaluateScript):
+ * API/JSScriptRef.cpp:
+ * bindings/ScriptFunctionCall.cpp:
+ (Deprecated::ScriptFunctionCall::call):
+ * bindings/ScriptFunctionCall.h:
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::hasBreakpoint):
+ * debugger/Debugger.h:
+ * debugger/DebuggerCallFrame.cpp:
+ (JSC::DebuggerCallFrame::thisValue):
+ (JSC::DebuggerCallFrame::evaluate):
+ * debugger/DebuggerCallFrame.h:
+ (JSC::DebuggerCallFrame::isValid):
+ * inspector/InjectedScriptManager.cpp:
+ (Inspector::InjectedScriptManager::createInjectedScript):
+ * inspector/InspectorEnvironment.h:
+ * inspector/JSJavaScriptCallFrame.cpp:
+ (Inspector::JSJavaScriptCallFrame::evaluate):
+ * inspector/JavaScriptCallFrame.h:
+ (Inspector::JavaScriptCallFrame::vmEntryGlobalObject):
+ (Inspector::JavaScriptCallFrame::thisValue):
+ (Inspector::JavaScriptCallFrame::evaluate):
+ * inspector/ScriptDebugServer.cpp:
+ (Inspector::ScriptDebugServer::evaluateBreakpointAction):
+ * jsc.cpp:
+ (functionRun):
+ (functionLoad):
+ (runWithScripts):
+ (runInteractive):
+ * runtime/CallData.cpp:
+ (JSC::call):
+ * runtime/CallData.h:
+ * runtime/Completion.cpp:
+ (JSC::checkSyntax):
+ (JSC::evaluate):
+ * runtime/Completion.h:
+ (JSC::evaluate):
+
</ins><span class="cx"> 2015-06-15 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> FTL boolify() UntypedUse is wrong in the masquerades-as-undefined case
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebindingsScriptFunctionCallcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> return Deprecated::ScriptValue();
</span><span class="cx">
</span><span class="cx"> JSValue result;
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> if (m_callHandler)
</span><span class="cx"> result = m_callHandler(m_exec, function, callType, callData, thisObject, m_arguments, exception);
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebindingsScriptFunctionCallh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.h (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.h 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.h 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> class JS_EXPORT_PRIVATE ScriptFunctionCall : public ScriptCallArgumentHandler {
</span><span class="cx"> public:
</span><del>- typedef JSC::JSValue (*ScriptFunctionCallHandler)(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, JSC::Exception*& exception);
</del><ins>+ typedef JSC::JSValue (*ScriptFunctionCallHandler)(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>&);
</ins><span class="cx"> ScriptFunctionCall(const ScriptObject& thisObject, const String& name, ScriptFunctionCallHandler handler = nullptr);
</span><span class="cx"> ScriptValue call(bool& hadException);
</span><span class="cx"> ScriptValue call();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> #include "CodeBlock.h"
</span><span class="cx"> #include "DebuggerCallFrame.h"
</span><span class="cx"> #include "Error.h"
</span><del>-
</del><span class="cx"> #include "HeapIterationScope.h"
</span><span class="cx"> #include "Interpreter.h"
</span><span class="cx"> #include "JSCJSValueInlines.h"
</span><span class="lines">@@ -487,7 +486,7 @@
</span><span class="cx"> // so make it looks like the debugger is already paused.
</span><span class="cx"> TemporaryPausedState pausedState(*this);
</span><span class="cx">
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> DebuggerCallFrame* debuggerCallFrame = currentDebuggerCallFrame();
</span><span class="cx"> JSValue result = debuggerCallFrame->evaluate(breakpoint->condition, exception);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.h (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.h 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.h 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class CodeBlock;
</span><ins>+class Exception;
</ins><span class="cx"> class ExecState;
</span><span class="cx"> class JSGlobalObject;
</span><span class="cx"> class SourceProvider;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "CodeBlock.h"
</span><span class="cx"> #include "DebuggerEvalEnabler.h"
</span><span class="cx"> #include "DebuggerScope.h"
</span><del>-#include "Exception.h"
</del><span class="cx"> #include "Interpreter.h"
</span><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "JSLexicalEnvironment.h"
</span><span class="lines">@@ -177,10 +176,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Evaluate some JavaScript code in the scope of this frame.
</span><del>-JSValue DebuggerCallFrame::evaluate(const String& script, Exception*& exception)
</del><ins>+JSValue DebuggerCallFrame::evaluate(const String& script, NakedPtr<Exception>& exception)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isValid());
</span><del>- exception = nullptr;
</del><span class="cx"> CallFrame* callFrame = m_callFrame;
</span><span class="cx"> if (!callFrame)
</span><span class="cx"> return jsNull();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.h (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.h 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.h 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "DebuggerPrimitives.h"
</span><span class="cx"> #include "Strong.h"
</span><ins>+#include <wtf/NakedPtr.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/TextPosition.h>
</span><span class="lines">@@ -67,7 +68,7 @@
</span><span class="cx"> JS_EXPORT_PRIVATE String functionName() const;
</span><span class="cx"> JS_EXPORT_PRIVATE Type type() const;
</span><span class="cx"> JS_EXPORT_PRIVATE JSValue thisValue() const;
</span><del>- JSValue evaluate(const String&, Exception*&);
</del><ins>+ JSValue evaluate(const String&, NakedPtr<Exception>&);
</ins><span class="cx">
</span><span class="cx"> bool isValid() const { return !!m_callFrame; }
</span><span class="cx"> JS_EXPORT_PRIVATE void invalidate();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> JSGlobalObject* globalObject = scriptState->lexicalGlobalObject();
</span><span class="cx"> JSValue globalThisValue = scriptState->globalThisValue();
</span><span class="cx">
</span><del>- Exception* evaluationException;
</del><ins>+ NakedPtr<Exception> evaluationException;
</ins><span class="cx"> InspectorEvaluateHandler evaluateHandler = m_environment.evaluateHandler();
</span><span class="cx"> JSValue functionValue = evaluateHandler(scriptState, sourceCode, globalThisValue, evaluationException);
</span><span class="cx"> if (evaluationException)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorEnvironmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/inspector/InspectorEnvironment.h 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-typedef JSC::JSValue (*InspectorFunctionCallHandler)(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, JSC::Exception*& returnedException);
-typedef JSC::JSValue (*InspectorEvaluateHandler)(JSC::ExecState*, const JSC::SourceCode&, JSC::JSValue thisValue, JSC::Exception*& returnedException);
</del><ins>+typedef JSC::JSValue (*InspectorFunctionCallHandler)(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException);
+typedef JSC::JSValue (*InspectorEvaluateHandler)(JSC::ExecState*, const JSC::SourceCode&, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException);
</ins><span class="cx">
</span><span class="cx"> class InspectorEnvironment {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "DebuggerScope.h"
</span><span class="cx"> #include "Error.h"
</span><del>-#include "Exception.h"
</del><span class="cx"> #include "JSCJSValue.h"
</span><span class="cx"> #include "JSCellInlines.h"
</span><span class="cx"> #include "JSJavaScriptCallFramePrototype.h"
</span><span class="lines">@@ -76,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSJavaScriptCallFrame::evaluate(ExecState* exec)
</span><span class="cx"> {
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> JSValue result = impl().evaluate(exec->argument(0).toString(exec)->value(exec), exception);
</span><span class="cx"> if (exception)
</span><span class="cx"> exec->vm().throwException(exec, exception);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJavaScriptCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/inspector/JavaScriptCallFrame.h 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> JSC::JSGlobalObject* vmEntryGlobalObject() const { return m_debuggerCallFrame->vmEntryGlobalObject(); }
</span><span class="cx">
</span><span class="cx"> JSC::JSValue thisValue() const { return m_debuggerCallFrame->thisValue(); }
</span><del>- JSC::JSValue evaluate(const String& script, JSC::Exception*& exception) const { return m_debuggerCallFrame->evaluate(script, exception); }
</del><ins>+ JSC::JSValue evaluate(const String& script, NakedPtr<JSC::Exception>& exception) const { return m_debuggerCallFrame->evaluate(script, exception); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> JavaScriptCallFrame(PassRefPtr<JSC::DebuggerCallFrame>);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case ScriptBreakpointActionTypeEvaluate: {
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> debuggerCallFrame->evaluate(breakpointAction.data, exception);
</span><span class="cx"> if (exception)
</span><span class="cx"> reportException(debuggerCallFrame->exec(), exception);
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> dispatchBreakpointActionSound(debuggerCallFrame->exec(), breakpointAction.identifier);
</span><span class="cx"> break;
</span><span class="cx"> case ScriptBreakpointActionTypeProbe: {
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> JSValue result = debuggerCallFrame->evaluate(breakpointAction.data, exception);
</span><span class="cx"> if (exception)
</span><span class="cx"> reportException(debuggerCallFrame->exec(), exception);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -908,7 +908,7 @@
</span><span class="cx"> globalObject->putDirect(
</span><span class="cx"> exec->vm(), Identifier::fromString(globalObject->globalExec(), "arguments"), array);
</span><span class="cx">
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> StopWatch stopWatch;
</span><span class="cx"> stopWatch.start();
</span><span class="cx"> evaluate(globalObject->globalExec(), jscSource(script.data(), fileName), JSValue(), exception);
</span><span class="lines">@@ -931,7 +931,7 @@
</span><span class="cx">
</span><span class="cx"> JSGlobalObject* globalObject = exec->lexicalGlobalObject();
</span><span class="cx">
</span><del>- Exception* evaluationException;
</del><ins>+ NakedPtr<Exception> evaluationException;
</ins><span class="cx"> JSValue result = evaluate(globalObject->globalExec(), jscSource(script.data(), fileName), JSValue(), evaluationException);
</span><span class="cx"> if (evaluationException)
</span><span class="cx"> exec->vm().throwException(exec, evaluationException);
</span><span class="lines">@@ -1294,7 +1294,7 @@
</span><span class="cx">
</span><span class="cx"> vm.startSampling();
</span><span class="cx">
</span><del>- Exception* evaluationException;
</del><ins>+ NakedPtr<Exception> evaluationException;
</ins><span class="cx"> JSValue returnValue = evaluate(globalObject->globalExec(), jscSource(script, fileName), JSValue(), evaluationException);
</span><span class="cx"> success = success && !evaluationException;
</span><span class="cx"> if (dump && !evaluationException)
</span><span class="lines">@@ -1358,7 +1358,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- Exception* evaluationException;
</del><ins>+ NakedPtr<Exception> evaluationException;
</ins><span class="cx"> JSValue returnValue = evaluate(globalObject->globalExec(), makeSource(source, interpreterName), JSValue(), evaluationException);
</span><span class="cx"> #else
</span><span class="cx"> printf("%s", interactivePrompt);
</span><span class="lines">@@ -1374,7 +1374,7 @@
</span><span class="cx"> break;
</span><span class="cx"> line.append('\0');
</span><span class="cx">
</span><del>- Exception* evaluationException;
</del><ins>+ NakedPtr<Exception> evaluationException;
</ins><span class="cx"> JSValue returnValue = evaluate(globalObject->globalExec(), jscSource(line.data(), interpreterName), JSValue(), evaluationException);
</span><span class="cx"> #endif
</span><span class="cx"> if (evaluationException)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCallDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CallData.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CallData.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/runtime/CallData.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CallData.h"
</span><span class="cx">
</span><del>-#include "Exception.h"
</del><span class="cx"> #include "Executable.h"
</span><span class="cx"> #include "Interpreter.h"
</span><span class="cx"> #include "JSFunction.h"
</span><span class="lines">@@ -40,15 +39,14 @@
</span><span class="cx"> return exec->interpreter()->executeCall(exec, asObject(functionObject), callType, callData, thisValue, args);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue call(ExecState* exec, JSValue functionObject, CallType callType, const CallData& callData, JSValue thisValue, const ArgList& args, Exception*& returnedException)
</del><ins>+JSValue call(ExecState* exec, JSValue functionObject, CallType callType, const CallData& callData, JSValue thisValue, const ArgList& args, NakedPtr<Exception>& returnedException)
</ins><span class="cx"> {
</span><span class="cx"> JSValue result = call(exec, functionObject, callType, callData, thisValue, args);
</span><span class="cx"> if (exec->hadException()) {
</span><span class="cx"> returnedException = exec->exception();
</span><span class="cx"> exec->clearException();
</span><span class="cx"> return jsUndefined();
</span><del>- } else
- returnedException = nullptr;
</del><ins>+ }
</ins><span class="cx"> RELEASE_ASSERT(result);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCallDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CallData.h (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CallData.h 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/runtime/CallData.h 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #define CallData_h
</span><span class="cx">
</span><span class="cx"> #include "JSCJSValue.h"
</span><ins>+#include <wtf/NakedPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -59,7 +60,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE JSValue call(ExecState*, JSValue functionObject, CallType, const CallData&, JSValue thisValue, const ArgList&);
</span><del>-JS_EXPORT_PRIVATE JSValue call(ExecState*, JSValue functionObject, CallType, const CallData&, JSValue thisValue, const ArgList&, Exception*& returnedException);
</del><ins>+JS_EXPORT_PRIVATE JSValue call(ExecState*, JSValue functionObject, CallType, const CallData&, JSValue thisValue, const ArgList&, NakedPtr<Exception>& returnedException);
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCompletioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Completion.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Completion.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/runtime/Completion.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -61,12 +61,11 @@
</span><span class="cx"> JSParserStrictMode::NotStrict, JSParserCodeType::Program, error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue evaluate(ExecState* exec, const SourceCode& source, JSValue thisValue, Exception*& returnedException)
</del><ins>+JSValue evaluate(ExecState* exec, const SourceCode& source, JSValue thisValue, NakedPtr<Exception>& returnedException)
</ins><span class="cx"> {
</span><span class="cx"> JSLockHolder lock(exec);
</span><span class="cx"> RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
</span><span class="cx"> RELEASE_ASSERT(!exec->vm().isCollectorBusy());
</span><del>- returnedException = nullptr;
</del><span class="cx">
</span><span class="cx"> CodeProfiling profile(source);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCompletionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Completion.h (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Completion.h 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/JavaScriptCore/runtime/Completion.h 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #define Completion_h
</span><span class="cx">
</span><span class="cx"> #include "JSCJSValue.h"
</span><ins>+#include <wtf/NakedPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -36,10 +37,10 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE bool checkSyntax(VM&, const SourceCode&, ParserError&);
</span><span class="cx"> JS_EXPORT_PRIVATE bool checkSyntax(ExecState*, const SourceCode&, JSValue* exception = 0);
</span><del>-JS_EXPORT_PRIVATE JSValue evaluate(ExecState*, const SourceCode&, JSValue thisValue, Exception*& returnedException);
</del><ins>+JS_EXPORT_PRIVATE JSValue evaluate(ExecState*, const SourceCode&, JSValue thisValue, NakedPtr<Exception>& returnedException);
</ins><span class="cx"> inline JSValue evaluate(ExecState* exec, const SourceCode& sourceCode, JSValue thisValue = JSValue())
</span><span class="cx"> {
</span><del>- Exception* unused;
</del><ins>+ NakedPtr<Exception> unused;
</ins><span class="cx"> return evaluate(exec, sourceCode, thisValue, unused);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WTF/ChangeLog 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-06-16 Mark Lam <mark.lam@apple.com>
+
+ Use NakedPtr<Exception>& to return exception results.
+ https://bugs.webkit.org/show_bug.cgi?id=145870
+
+ Reviewed by Anders Carlsson and Filip Pizlo.
+
+ Introducing the NakedPtr class.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/NakedPtr.h: Added.
+ (WTF::NakedPtr::NakedPtr):
+ (WTF::NakedPtr::get):
+ (WTF::NakedPtr::clear):
+ (WTF::NakedPtr::operator*):
+ (WTF::NakedPtr::operator->):
+ (WTF::NakedPtr::operator T*):
+ (WTF::NakedPtr::operator!):
+ (WTF::NakedPtr::operator bool):
+ (WTF::=):
+ (WTF::NakedPtr<T>::swap):
+ (WTF::swap):
+
</ins><span class="cx"> 2015-06-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GLib] Move files under Source/WTF/wtf/gobject to Source/WTF/wtf/glib
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -277,6 +277,7 @@
</span><span class="cx"> E4A0AD3A1A96245500536DF6 /* WorkQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = E4A0AD381A96245500536DF6 /* WorkQueue.h */; };
</span><span class="cx"> E4A0AD3D1A96253C00536DF6 /* WorkQueueCocoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4A0AD3C1A96253C00536DF6 /* WorkQueueCocoa.cpp */; };
</span><span class="cx"> EB95E1F0161A72410089A2F5 /* ByteOrder.h in Headers */ = {isa = PBXBuildFile; fileRef = EB95E1EF161A72410089A2F5 /* ByteOrder.h */; };
</span><ins>+ FE8225311B2A1E5B00BA68FD /* NakedPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = FE8225301B2A1E5B00BA68FD /* NakedPtr.h */; };
</ins><span class="cx"> FE91E8811AB2A0200099895F /* SpinLock.h in Headers */ = {isa = PBXBuildFile; fileRef = FE91E8801AB2A0200099895F /* SpinLock.h */; };
</span><span class="cx"> FEDACD3D1630F83F00C69634 /* StackStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEDACD3B1630F83F00C69634 /* StackStats.cpp */; };
</span><span class="cx"> FEDACD3E1630F83F00C69634 /* StackStats.h in Headers */ = {isa = PBXBuildFile; fileRef = FEDACD3C1630F83F00C69634 /* StackStats.h */; };
</span><span class="lines">@@ -568,6 +569,7 @@
</span><span class="cx"> E4A0AD381A96245500536DF6 /* WorkQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkQueue.h; sourceTree = "<group>"; };
</span><span class="cx"> E4A0AD3C1A96253C00536DF6 /* WorkQueueCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueueCocoa.cpp; sourceTree = "<group>"; };
</span><span class="cx"> EB95E1EF161A72410089A2F5 /* ByteOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteOrder.h; sourceTree = "<group>"; };
</span><ins>+ FE8225301B2A1E5B00BA68FD /* NakedPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NakedPtr.h; sourceTree = "<group>"; };
</ins><span class="cx"> FE91E8801AB2A0200099895F /* SpinLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpinLock.h; sourceTree = "<group>"; };
</span><span class="cx"> FEDACD3B1630F83F00C69634 /* StackStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StackStats.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FEDACD3C1630F83F00C69634 /* StackStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StackStats.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -782,6 +784,7 @@
</span><span class="cx"> A8A472CD151A825B004123FF /* MetaAllocator.cpp */,
</span><span class="cx"> A8A472CE151A825B004123FF /* MetaAllocator.h */,
</span><span class="cx"> A8A472CF151A825B004123FF /* MetaAllocatorHandle.h */,
</span><ins>+ FE8225301B2A1E5B00BA68FD /* NakedPtr.h */,
</ins><span class="cx"> 1A3F6BE6174ADA2100B2EEA7 /* NeverDestroyed.h */,
</span><span class="cx"> 0F0D85B317234CB100338210 /* NoLock.h */,
</span><span class="cx"> A8A472D0151A825B004123FF /* Noncopyable.h */,
</span><span class="lines">@@ -1178,6 +1181,7 @@
</span><span class="cx"> FE91E8811AB2A0200099895F /* SpinLock.h in Headers */,
</span><span class="cx"> A8A4742C151A825B004123FF /* StringExtras.h in Headers */,
</span><span class="cx"> A8A4743F151A825B004123FF /* StringHash.h in Headers */,
</span><ins>+ FE8225311B2A1E5B00BA68FD /* NakedPtr.h in Headers */,
</ins><span class="cx"> A748745417A0BDAE00FA04CB /* StringHashDumpContext.h in Headers */,
</span><span class="cx"> A8A4742D151A825B004123FF /* StringHasher.h in Headers */,
</span><span class="cx"> A8A47441151A825B004123FF /* StringImpl.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfNakedPtrh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/NakedPtr.h (0 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/NakedPtr.h (rev 0)
+++ trunk/Source/WTF/wtf/NakedPtr.h 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -0,0 +1,119 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WTF_NakedPtr_h
+#define WTF_NakedPtr_h
+
+#include <wtf/FastMalloc.h>
+
+namespace WTF {
+
+// The purpose of this class is to ensure that the wrapped pointer will never be
+// used uninitialized.
+
+template <typename T> class NakedPtr {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ ALWAYS_INLINE NakedPtr() : m_ptr(nullptr) { }
+ ALWAYS_INLINE NakedPtr(T* ptr) : m_ptr(ptr) { }
+ ALWAYS_INLINE NakedPtr(const NakedPtr& o) : m_ptr(o.m_ptr) { }
+ template<typename U> NakedPtr(const NakedPtr<U>& o) : m_ptr(o.get()) { }
+
+ ALWAYS_INLINE NakedPtr(NakedPtr&& o) : m_ptr(o.get()) { }
+ template<typename U> NakedPtr(NakedPtr<U>&& o) : m_ptr(o.get()) { }
+
+ T* get() const { return m_ptr; }
+
+ void clear() { m_ptr = nullptr; }
+
+ T& operator*() const { ASSERT(m_ptr); return *m_ptr; }
+ ALWAYS_INLINE T* operator->() const { return m_ptr; }
+
+ operator T*() { return m_ptr; }
+
+ bool operator!() const { return !m_ptr; }
+
+ explicit operator bool() const { return !!m_ptr; }
+
+ NakedPtr& operator=(const NakedPtr&);
+ NakedPtr& operator=(T*);
+ template<typename U> NakedPtr& operator=(const NakedPtr<U>&);
+ NakedPtr& operator=(NakedPtr&&);
+ template<typename U> NakedPtr& operator=(NakedPtr<U>&&);
+
+ void swap(NakedPtr&);
+
+private:
+ T* m_ptr;
+};
+
+template<typename T> inline NakedPtr<T>& NakedPtr<T>::operator=(const NakedPtr& o)
+{
+ m_ptr = o.m_ptr;
+ return *this;
+}
+
+template<typename T> inline NakedPtr<T>& NakedPtr<T>::operator=(T* optr)
+{
+ m_ptr = optr;
+ return *this;
+}
+
+template<typename T> template<typename U> inline NakedPtr<T>& NakedPtr<T>::operator=(const NakedPtr<U>& o)
+{
+ NakedPtr ptr = o;
+ swap(ptr);
+ return *this;
+}
+
+template<typename T> inline NakedPtr<T>& NakedPtr<T>::operator=(NakedPtr&& o)
+{
+ NakedPtr ptr = WTF::move(o);
+ swap(ptr);
+ return *this;
+}
+
+template<typename T> template<typename U> inline NakedPtr<T>& NakedPtr<T>::operator=(NakedPtr<U>&& o)
+{
+ NakedPtr ptr = WTF::move(o);
+ swap(ptr);
+ return *this;
+}
+
+template<class T> inline void NakedPtr<T>::swap(NakedPtr& o)
+{
+ std::swap(m_ptr, o.m_ptr);
+}
+
+template<class T> inline void swap(NakedPtr<T>& a, NakedPtr<T>& b)
+{
+ a.swap(b);
+}
+
+} // namespace WTF
+
+using WTF::NakedPtr;
+
+#endif // WTF_NakedPtr_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/ChangeLog 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2015-06-16 Mark Lam <mark.lam@apple.com>
+
+ Use NakedPtr<Exception>& to return exception results.
+ https://bugs.webkit.org/show_bug.cgi?id=145870
+
+ Reviewed by Anders Carlsson and Filip Pizlo.
+
+ No new WebCore tests because this functionality is already covered by existing tests.
+ API tests added for WTF::NakedPtr.
+
+ * bindings/js/JSCallbackData.cpp:
+ (WebCore::JSCallbackData::invokeCallback):
+ * bindings/js/JSCustomXPathNSResolver.cpp:
+ (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
+ * bindings/js/JSErrorHandler.cpp:
+ (WebCore::JSErrorHandler::handleEvent):
+ * bindings/js/JSEventListener.cpp:
+ (WebCore::JSEventListener::handleEvent):
+ * bindings/js/JSMainThreadExecState.cpp:
+ (WebCore::JSMainThreadExecState::didLeaveScriptContext):
+ (WebCore::functionCallHandlerFromAnyThread):
+ (WebCore::evaluateHandlerFromAnyThread):
+ * bindings/js/JSMainThreadExecState.h:
+ (WebCore::JSMainThreadExecState::currentState):
+ (WebCore::JSMainThreadExecState::call):
+ (WebCore::JSMainThreadExecState::evaluate):
+ * bindings/js/JSMutationCallback.cpp:
+ (WebCore::JSMutationCallback::call):
+ * bindings/js/ScheduledAction.cpp:
+ (WebCore::ScheduledAction::executeFunctionInContext):
+ * bindings/js/ScriptController.cpp:
+ (WebCore::ScriptController::evaluateInWorld):
+ * bindings/js/WorkerScriptController.cpp:
+ (WebCore::WorkerScriptController::evaluate):
+ (WebCore::WorkerScriptController::setException):
+ * bindings/js/WorkerScriptController.h:
+ (WebCore::WorkerScriptController::workerGlobalScopeWrapper):
+ * bindings/objc/WebScriptObject.mm:
+ (-[WebScriptObject callWebScriptMethod:withArguments:]):
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::importScripts):
+
</ins><span class="cx"> 2015-06-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> CSS Scroll Snap - support snapping to nested elements
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCallbackDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCallbackData.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCallbackData.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/js/JSCallbackData.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(context, callType, callData);
</span><span class="cx">
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> JSValue result = context->isDocument()
</span><span class="cx"> ? JSMainThreadExecState::call(exec, function, callType, callData, thisValue, args, exception)
</span><span class="cx"> : JSC::call(exec, function, callType, callData, thisValue, args, exception);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomXPathNSResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(jsStringWithCache(exec, prefix));
</span><span class="cx">
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> JSValue retval = JSMainThreadExecState::call(exec, function, callType, callData, m_customResolver.get(), args, exception);
</span><span class="cx">
</span><span class="cx"> String result;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSErrorHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/js/JSErrorHandler.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> VM& vm = globalObject->vm();
</span><span class="cx"> VMEntryScope entryScope(vm, vm.entryScope ? vm.entryScope->globalObject() : globalObject);
</span><span class="cx">
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> JSValue returnValue = scriptExecutionContext->isDocument()
</span><span class="cx"> ? JSMainThreadExecState::call(exec, jsFunction, callType, callData, globalObject, args, exception)
</span><span class="cx"> : JSC::call(exec, jsFunction, callType, callData, globalObject, args, exception);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSEventListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSEventListener.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(scriptExecutionContext, callType, callData);
</span><span class="cx">
</span><span class="cx"> JSValue thisValue = handleEventFunction == jsFunction ? toJS(exec, globalObject, event->currentTarget()) : jsFunction;
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> JSValue retval = scriptExecutionContext->isDocument()
</span><span class="cx"> ? JSMainThreadExecState::call(exec, handleEventFunction, callType, callData, thisValue, args, exception)
</span><span class="cx"> : JSC::call(exec, handleEventFunction, callType, callData, thisValue, args, exception);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMainThreadExecStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMainThreadExecState.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMainThreadExecState.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/js/JSMainThreadExecState.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -46,14 +46,14 @@
</span><span class="cx"> MutationObserver::deliverAllMutations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSC::JSValue functionCallHandlerFromAnyThread(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, JSC::Exception*& returnedException)
</del><ins>+JSC::JSValue functionCallHandlerFromAnyThread(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException)
</ins><span class="cx"> {
</span><span class="cx"> if (isMainThread())
</span><span class="cx"> return JSMainThreadExecState::call(exec, functionObject, callType, callData, thisValue, args, returnedException);
</span><span class="cx"> return JSC::call(exec, functionObject, callType, callData, thisValue, args, returnedException);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSC::JSValue evaluateHandlerFromAnyThread(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue, JSC::Exception*& returnedException)
</del><ins>+JSC::JSValue evaluateHandlerFromAnyThread(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException)
</ins><span class="cx"> {
</span><span class="cx"> if (isMainThread())
</span><span class="cx"> return JSMainThreadExecState::evaluate(exec, source, thisValue, returnedException);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMainThreadExecStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -50,13 +50,13 @@
</span><span class="cx"> return s_mainThreadState;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static JSC::JSValue call(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, JSC::Exception*& returnedException)
</del><ins>+ static JSC::JSValue call(JSC::ExecState* exec, JSC::JSValue functionObject, JSC::CallType callType, const JSC::CallData& callData, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException)
</ins><span class="cx"> {
</span><span class="cx"> JSMainThreadExecState currentState(exec);
</span><span class="cx"> return JSC::call(exec, functionObject, callType, callData, thisValue, args, returnedException);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static JSC::JSValue evaluate(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue, JSC::Exception*& returnedException)
</del><ins>+ static JSC::JSValue evaluate(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException)
</ins><span class="cx"> {
</span><span class="cx"> JSMainThreadExecState currentState(exec);
</span><span class="cx"> return JSC::evaluate(exec, source, thisValue, returnedException);
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> static JSC::JSValue evaluate(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue = JSC::JSValue())
</span><span class="cx"> {
</span><del>- JSC::Exception* unused;
</del><ins>+ NakedPtr<JSC::Exception> unused;
</ins><span class="cx"> return evaluate(exec, source, thisValue, unused);
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -127,8 +127,8 @@
</span><span class="cx"> JSC::ExecState* m_previousState;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-JSC::JSValue functionCallHandlerFromAnyThread(JSC::ExecState*, JSC::JSValue functionObject, JSC::CallType, const JSC::CallData&, JSC::JSValue thisValue, const JSC::ArgList& args, JSC::Exception*& returnedException);
-JSC::JSValue evaluateHandlerFromAnyThread(JSC::ExecState*, const JSC::SourceCode&, JSC::JSValue thisValue, JSC::Exception*& returnedException);
</del><ins>+JSC::JSValue functionCallHandlerFromAnyThread(JSC::ExecState*, JSC::JSValue functionObject, JSC::CallType, const JSC::CallData&, JSC::JSValue thisValue, const JSC::ArgList& args, NakedPtr<JSC::Exception>& returnedException);
+JSC::JSValue evaluateHandlerFromAnyThread(JSC::ExecState*, const JSC::SourceCode&, JSC::JSValue thisValue, NakedPtr<JSC::Exception>& returnedException);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMutationCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(context, callType, callData);
</span><span class="cx">
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> JSMainThreadExecState::call(exec, callback, callType, callData, jsObserver, args, exception);
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didCallFunction(cookie, context);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScheduledActioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScheduledAction.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScheduledAction.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/js/ScheduledAction.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(&context, callType, callData);
</span><span class="cx">
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> if (is<Document>(context))
</span><span class="cx"> JSMainThreadExecState::call(exec, m_function.get(), callType, callData, thisValue, args, exception);
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentationCookie cookie = InspectorInstrumentation::willEvaluateScript(m_frame, sourceURL, sourceCode.startLine());
</span><span class="cx">
</span><del>- Exception* evaluationException;
</del><ins>+ NakedPtr<Exception> evaluationException;
</ins><span class="cx"> JSValue returnValue = JSMainThreadExecState::evaluate(exec, jsSourceCode, shell, evaluationException);
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didEvaluateScript(cookie, m_frame);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> if (isExecutionForbidden())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Exception* exception;
</del><ins>+ NakedPtr<Exception> exception;
</ins><span class="cx"> evaluate(sourceCode, exception);
</span><span class="cx"> if (exception) {
</span><span class="cx"> JSLockHolder lock(vm());
</span><span class="lines">@@ -107,9 +107,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, JSC::Exception*& returnedException)
</del><ins>+void WorkerScriptController::evaluate(const ScriptSourceCode& sourceCode, NakedPtr<JSC::Exception>& returnedException)
</ins><span class="cx"> {
</span><del>- returnedException = nullptr;
</del><span class="cx"> if (isExecutionForbidden())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -118,28 +117,26 @@
</span><span class="cx"> ExecState* exec = m_workerGlobalScopeWrapper->globalExec();
</span><span class="cx"> JSLockHolder lock(exec);
</span><span class="cx">
</span><del>- JSC::Exception* evaluationException;
- JSC::evaluate(exec, sourceCode.jsSourceCode(), m_workerGlobalScopeWrapper->globalThis(), evaluationException);
</del><ins>+ JSC::evaluate(exec, sourceCode.jsSourceCode(), m_workerGlobalScopeWrapper->globalThis(), returnedException);
</ins><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><del>- if ((evaluationException && isTerminatedExecutionException(evaluationException))
</del><ins>+ if ((returnedException && isTerminatedExecutionException(returnedException))
</ins><span class="cx"> || (vm.watchdog && vm.watchdog->didFire())) {
</span><span class="cx"> forbidExecution();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (evaluationException) {
</del><ins>+ if (returnedException) {
</ins><span class="cx"> String errorMessage;
</span><span class="cx"> int lineNumber = 0;
</span><span class="cx"> int columnNumber = 0;
</span><span class="cx"> String sourceURL = sourceCode.url().string();
</span><span class="cx"> if (m_workerGlobalScope->sanitizeScriptError(errorMessage, lineNumber, columnNumber, sourceURL, sourceCode.cachedScript())) {
</span><span class="cx"> vm.throwException(exec, createError(exec, errorMessage.impl()));
</span><del>- evaluationException = vm.exception();
</del><ins>+ returnedException = vm.exception();
</ins><span class="cx"> vm.clearException();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- returnedException = evaluationException;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerScriptController::setException(JSC::Exception* exception)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptController.h (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptController.h 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptController.h 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include <debugger/Debugger.h>
</span><span class="cx"> #include <heap/Strong.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/NakedPtr.h>
</ins><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx">
</span><span class="cx"> namespace Deprecated {
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void evaluate(const ScriptSourceCode&);
</span><del>- void evaluate(const ScriptSourceCode&, JSC::Exception*& returnedException);
</del><ins>+ void evaluate(const ScriptSourceCode&, NakedPtr<JSC::Exception>& returnedException);
</ins><span class="cx">
</span><span class="cx"> void setException(JSC::Exception*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcWebScriptObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/WebScriptObject.mm (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/WebScriptObject.mm 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/bindings/objc/WebScriptObject.mm 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> if (![self _isSafeScript])
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- JSC::Exception* exception;
</del><ins>+ NakedPtr<JSC::Exception> exception;
</ins><span class="cx"> JSC::JSValue result = JSMainThreadExecState::call(exec, function, callType, callData, [self _imp], argList, exception);
</span><span class="cx">
</span><span class="cx"> if (exception) {
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::scriptImported(scriptExecutionContext(), scriptLoader->identifier(), scriptLoader->script());
</span><span class="cx">
</span><del>- JSC::Exception* exception;
</del><ins>+ NakedPtr<JSC::Exception> exception;
</ins><span class="cx"> m_script->evaluate(ScriptSourceCode(scriptLoader->script(), scriptLoader->responseURL()), exception);
</span><span class="cx"> if (exception) {
</span><span class="cx"> m_script->setException(exception);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Tools/ChangeLog 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-16 Mark Lam <mark.lam@apple.com>
+
+ Use NakedPtr<Exception>& to return exception results.
+ https://bugs.webkit.org/show_bug.cgi?id=145870
+
+ Reviewed by Anders Carlsson and Filip Pizlo.
+
+ * TestWebKitAPI/CMakeLists.txt:
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters:
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WTF/NakedPtr.cpp: Added.
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::nakedPtrFoo):
+
</ins><span class="cx"> 2015-06-16 Tobias Reiss <tobi+webkit@basecode.de>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Adding myself as a committer.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPICMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/MathExtras.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/MediaTime.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/MetaAllocator.cpp
</span><ins>+ ${TESTWEBKITAPI_DIR}/Tests/WTF/NakedPtr.cpp
</ins><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/RedBlackTree.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/Ref.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/RefPtr.cpp
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIvcxprojTestWebKitAPIvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -323,6 +323,7 @@
</span><span class="cx"> <ClCompile Include="..\Tests\WTF\MathExtras.cpp" />
</span><span class="cx"> <ClCompile Include="..\Tests\WTF\MediaTime.cpp" />
</span><span class="cx"> <ClCompile Include="..\Tests\WTF\MetaAllocator.cpp" />
</span><ins>+ <ClCompile Include="..\Tests\WTF\NakedPtr.cpp" />
</ins><span class="cx"> <ClCompile Include="..\Tests\WTF\Optional.cpp" />
</span><span class="cx"> <ClCompile Include="..\Tests\WTF\RedBlackTree.cpp" />
</span><span class="cx"> <ClCompile Include="..\Tests\WTF\Ref.cpp" />
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIvcxprojTestWebKitAPIvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -75,6 +75,9 @@
</span><span class="cx"> <ClCompile Include="..\Tests\WTF\MediaTime.cpp">
</span><span class="cx"> <Filter>Tests\WTF</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\Tests\WTF\NakedPtr.cpp">
+ <Filter>Tests\WTF</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\Tests\WTF\Ref.cpp">
</span><span class="cx"> <Filter>Tests\WTF</Filter>
</span><span class="cx"> </ClCompile>
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (185607 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2015-06-16 20:50:21 UTC (rev 185607)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -300,6 +300,7 @@
</span><span class="cx"> F6B7BE9717469B96008A3445 /* associate-form-controls.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = F6B7BE9617469B7E008A3445 /* associate-form-controls.html */; };
</span><span class="cx"> F6F49C6B15545CA70007F39D /* DOMWindowExtensionNoCache_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6F49C6615545C8D0007F39D /* DOMWindowExtensionNoCache_Bundle.cpp */; };
</span><span class="cx"> F6FDDDD614241C6F004F1729 /* push-state.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = F6FDDDD514241C48004F1729 /* push-state.html */; };
</span><ins>+ FEB6F7511B2BA464009E4922 /* NakedPtr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEB6F74E1B2BA44E009E4922 /* NakedPtr.cpp */; };
</ins><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXContainerItemProxy section */
</span><span class="lines">@@ -728,6 +729,7 @@
</span><span class="cx"> F6F49C6715545C8D0007F39D /* DOMWindowExtensionNoCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowExtensionNoCache.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F6FDDDD214241AD4004F1729 /* PrivateBrowsingPushStateNoHistoryCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrivateBrowsingPushStateNoHistoryCallback.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F6FDDDD514241C48004F1729 /* push-state.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "push-state.html"; sourceTree = "<group>"; };
</span><ins>+ FEB6F74E1B2BA44E009E4922 /* NakedPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NakedPtr.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> /* End PBXFileReference section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXFrameworksBuildPhase section */
</span><span class="lines">@@ -1073,6 +1075,7 @@
</span><span class="cx"> CD5497B315857F0C00B5BC30 /* MediaTime.cpp */,
</span><span class="cx"> 0FC6C4CE141034AD005B7F0C /* MetaAllocator.cpp */,
</span><span class="cx"> 93A427AC180DA60F00CD24D7 /* MoveOnly.h */,
</span><ins>+ FEB6F74E1B2BA44E009E4922 /* NakedPtr.cpp */,
</ins><span class="cx"> 1AFDE6541953B2C000C48FFA /* Optional.cpp */,
</span><span class="cx"> 0FC6C4CB141027E0005B7F0C /* RedBlackTree.cpp */,
</span><span class="cx"> 93A427AA180DA26400CD24D7 /* Ref.cpp */,
</span><span class="lines">@@ -1500,6 +1503,7 @@
</span><span class="cx"> 7CCE7F021A411AE600447C4C /* NewFirstVisuallyNonEmptyLayout.cpp in Sources */,
</span><span class="cx"> 7CCE7F031A411AE600447C4C /* NewFirstVisuallyNonEmptyLayoutFails.cpp in Sources */,
</span><span class="cx"> 7CCE7F041A411AE600447C4C /* NewFirstVisuallyNonEmptyLayoutForImages.cpp in Sources */,
</span><ins>+ FEB6F7511B2BA464009E4922 /* NakedPtr.cpp in Sources */,
</ins><span class="cx"> 7CCE7F051A411AE600447C4C /* NewFirstVisuallyNonEmptyLayoutFrames.cpp in Sources */,
</span><span class="cx"> 7CCE7F251A411AF600447C4C /* OpenAndCloseWindow.mm in Sources */,
</span><span class="cx"> 7CCE7F3D1A411B8E00447C4C /* Optional.cpp in Sources */,
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFNakedPtrcpp"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/WTF/NakedPtr.cpp (0 => 185608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/NakedPtr.cpp (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/NakedPtr.cpp 2015-06-16 20:51:04 UTC (rev 185608)
</span><span class="lines">@@ -0,0 +1,230 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "RefLogger.h"
+#include <wtf/NakedPtr.h>
+
+namespace TestWebKitAPI {
+
+// For these tests, we need a base class and a derived class. For this purpose,
+// we reuse the RefLogger and DerivedRefLogger classes.
+
+TEST(WTF_NakedPtr, Basic)
+{
+ DerivedRefLogger a("a");
+
+ NakedPtr<RefLogger> empty;
+ ASSERT_EQ(nullptr, empty.get());
+
+ {
+ NakedPtr<RefLogger> ptr(&a);
+ ASSERT_EQ(&a, ptr.get());
+ ASSERT_EQ(&a, &*ptr);
+ ASSERT_EQ(&a.name, &ptr->name);
+ }
+
+ {
+ NakedPtr<RefLogger> ptr = &a;
+ ASSERT_EQ(&a, ptr.get());
+ }
+
+ {
+ NakedPtr<RefLogger> p1 = &a;
+ NakedPtr<RefLogger> p2(p1);
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&a, p2.get());
+ }
+
+ {
+ NakedPtr<RefLogger> p1 = &a;
+ NakedPtr<RefLogger> p2 = p1;
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&a, p2.get());
+ }
+
+ {
+ NakedPtr<RefLogger> p1 = &a;
+ NakedPtr<RefLogger> p2 = WTF::move(p1);
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&a, p2.get());
+ }
+
+ {
+ NakedPtr<RefLogger> p1 = &a;
+ NakedPtr<RefLogger> p2(WTF::move(p1));
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&a, p2.get());
+ }
+
+ {
+ NakedPtr<DerivedRefLogger> p1 = &a;
+ NakedPtr<RefLogger> p2 = p1;
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&a, p2.get());
+ }
+
+ {
+ NakedPtr<DerivedRefLogger> p1 = &a;
+ NakedPtr<RefLogger> p2 = WTF::move(p1);
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&a, p2.get());
+ }
+
+ {
+ NakedPtr<RefLogger> ptr(&a);
+ ASSERT_EQ(&a, ptr.get());
+ ptr.clear();
+ ASSERT_EQ(nullptr, ptr.get());
+ }
+}
+
+TEST(WTF_NakedPtr, Assignment)
+{
+ DerivedRefLogger a("a");
+ RefLogger b("b");
+ DerivedRefLogger c("c");
+
+ {
+ NakedPtr<RefLogger> p1(&a);
+ NakedPtr<RefLogger> p2(&b);
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&b, p2.get());
+ p1 = p2;
+ ASSERT_EQ(&b, p1.get());
+ ASSERT_EQ(&b, p2.get());
+ }
+
+ {
+ NakedPtr<RefLogger> ptr(&a);
+ ASSERT_EQ(&a, ptr.get());
+ ptr = &b;
+ ASSERT_EQ(&b, ptr.get());
+ }
+
+ {
+ NakedPtr<RefLogger> ptr(&a);
+ ASSERT_EQ(&a, ptr.get());
+ ptr = nullptr;
+ ASSERT_EQ(nullptr, ptr.get());
+ }
+
+ {
+ NakedPtr<RefLogger> p1(&a);
+ NakedPtr<RefLogger> p2(&b);
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&b, p2.get());
+ p1 = WTF::move(p2);
+ ASSERT_EQ(&b, p1.get());
+ ASSERT_EQ(&b, p2.get());
+ }
+
+ {
+ NakedPtr<RefLogger> p1(&a);
+ NakedPtr<DerivedRefLogger> p2(&c);
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&c, p2.get());
+ p1 = p2;
+ ASSERT_EQ(&c, p1.get());
+ ASSERT_EQ(&c, p2.get());
+ }
+
+ {
+ NakedPtr<RefLogger> ptr(&a);
+ ASSERT_EQ(&a, ptr.get());
+ ptr = &c;
+ ASSERT_EQ(&c, ptr.get());
+ }
+
+ {
+ NakedPtr<RefLogger> p1(&a);
+ NakedPtr<DerivedRefLogger> p2(&c);
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&c, p2.get());
+ p1 = WTF::move(p2);
+ ASSERT_EQ(&c, p1.get());
+ ASSERT_EQ(&c, p2.get());
+ }
+
+ {
+ NakedPtr<RefLogger> ptr(&a);
+ ASSERT_EQ(&a, ptr.get());
+ ptr = ptr;
+ ASSERT_EQ(&a, ptr.get());
+ }
+
+ {
+ NakedPtr<RefLogger> ptr(&a);
+ ASSERT_EQ(&a, ptr.get());
+ ptr = WTF::move(ptr);
+ ASSERT_EQ(&a, ptr.get());
+ }
+}
+
+TEST(WTF_NakedPtr, Swap)
+{
+ RefLogger a("a");
+ RefLogger b("b");
+
+ {
+ NakedPtr<RefLogger> p1(&a);
+ NakedPtr<RefLogger> p2(&b);
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&b, p2.get());
+ p1.swap(p2);
+ ASSERT_EQ(&b, p1.get());
+ ASSERT_EQ(&a, p2.get());
+ }
+
+ {
+ NakedPtr<RefLogger> p1(&a);
+ NakedPtr<RefLogger> p2(&b);
+ ASSERT_EQ(&a, p1.get());
+ ASSERT_EQ(&b, p2.get());
+ std::swap(p1, p2);
+ ASSERT_EQ(&b, p1.get());
+ ASSERT_EQ(&a, p2.get());
+ }
+}
+
+NakedPtr<RefLogger> nakedPtrFoo(RefLogger& logger)
+{
+ return NakedPtr<RefLogger>(&logger);
+}
+
+TEST(WTF_NakedPtr, ReturnValue)
+{
+ DerivedRefLogger a("a");
+
+ {
+ auto ptr = nakedPtrFoo(a);
+ ASSERT_EQ(&a, ptr.get());
+ ASSERT_EQ(&a, &*ptr);
+ ASSERT_EQ(&a.name, &ptr->name);
+ }
+}
+
+} // namespace TestWebKitAPI
</ins></span></pre>
</div>
</div>
</body>
</html>