<!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>[207328] trunk/Source/WebCore</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/207328">207328</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-13 23:58:28 -0700 (Thu, 13 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Binding generated code for private operations should assert for casted-this checks
https://bugs.webkit.org/show_bug.cgi?id=163326
Patch by Youenn Fablet <youenn@apple.com> on 2016-10-13
Reviewed by Darin Adler.
Covered by existing tests.
Private operations are not exposed to user scripts and are only called by built-in scripts or other WebKit-controlled code.
The call sites already ensure that the caller is of the right type so there is no need to do that work twice.
Introducing a casted-this-error Assert mode for casted-this checks, which may be reused for other binding generated code.
Updated binding generator to use that mode for private operations.
* bindings/js/JSDOMBinding.h:
(WebCore::BindingCaller::callPromiseOperation):
(WebCore::BindingCaller::callOperation):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation):
* bindings/scripts/test/JS/JSTestGlobalObject.cpp:
(WebCore::jsTestGlobalObjectInstanceFunctionTestPrivateFunction):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::jsTestObjPrototypeFunctionPrivateMethod):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207327 => 207328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-14 06:31:55 UTC (rev 207327)
+++ trunk/Source/WebCore/ChangeLog 2016-10-14 06:58:28 UTC (rev 207328)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-10-13 Youenn Fablet <youenn@apple.com>
+
+ Binding generated code for private operations should assert for casted-this checks
+ https://bugs.webkit.org/show_bug.cgi?id=163326
+
+ Reviewed by Darin Adler.
+
+ Covered by existing tests.
+
+ Private operations are not exposed to user scripts and are only called by built-in scripts or other WebKit-controlled code.
+ The call sites already ensure that the caller is of the right type so there is no need to do that work twice.
+
+ Introducing a casted-this-error Assert mode for casted-this checks, which may be reused for other binding generated code.
+ Updated binding generator to use that mode for private operations.
+
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::BindingCaller::callPromiseOperation):
+ (WebCore::BindingCaller::callOperation):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * bindings/scripts/test/JS/JSTestGlobalObject.cpp:
+ (WebCore::jsTestGlobalObjectInstanceFunctionTestPrivateFunction):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjPrototypeFunctionPrivateMethod):
+
</ins><span class="cx"> 2016-10-13 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> WebView and WebPage URLs not updated after URL is modified by InjectedBundlePageResourceLoadClient::willSendRequestForFrame
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (207327 => 207328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-10-14 06:31:55 UTC (rev 207327)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-10-14 06:58:28 UTC (rev 207328)
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> template<typename T> struct NativeValueTraits;
</span><span class="cx">
</span><span class="cx">
</span><del>-enum class CastedThisErrorBehavior { Throw, ReturnEarly, RejectPromise };
</del><ins>+enum class CastedThisErrorBehavior { Throw, ReturnEarly, RejectPromise, Assert };
</ins><span class="cx">
</span><span class="cx"> template<typename JSClass>
</span><span class="cx"> struct BindingCaller {
</span><span class="lines">@@ -343,16 +343,17 @@
</span><span class="cx"> static JSClass* castForAttribute(JSC::ExecState&, JSC::EncodedJSValue);
</span><span class="cx"> static JSClass* castForOperation(JSC::ExecState&);
</span><span class="cx">
</span><del>- template<PromiseOperationCallerFunction operationCaller>
</del><ins>+ template<PromiseOperationCallerFunction operationCaller, CastedThisErrorBehavior shouldThrow = CastedThisErrorBehavior::RejectPromise>
</ins><span class="cx"> static JSC::EncodedJSValue callPromiseOperation(JSC::ExecState* state, Ref<DeferredPromise>&& promise, const char* operationName)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(state);
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(state->vm());
</span><span class="cx"> auto* thisObject = castForOperation(*state);
</span><del>- if (UNLIKELY(!thisObject)) {
</del><ins>+ if (shouldThrow != CastedThisErrorBehavior::Assert && UNLIKELY(!thisObject)) {
</ins><span class="cx"> ASSERT(JSClass::info());
</span><span class="cx"> return rejectPromiseWithThisTypeError(promise.get(), JSClass::info()->className, operationName);
</span><span class="cx"> }
</span><ins>+ ASSERT(thisObject);
</ins><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObject, JSClass::info());
</span><span class="cx"> // FIXME: We should refactor the binding generated code to use references for state and thisObject.
</span><span class="cx"> return operationCaller(state, thisObject, WTFMove(promise), throwScope);
</span><span class="lines">@@ -364,7 +365,7 @@
</span><span class="cx"> ASSERT(state);
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(state->vm());
</span><span class="cx"> auto* thisObject = castForOperation(*state);
</span><del>- if (UNLIKELY(!thisObject)) {
</del><ins>+ if (shouldThrow != CastedThisErrorBehavior::Assert && UNLIKELY(!thisObject)) {
</ins><span class="cx"> ASSERT(JSClass::info());
</span><span class="cx"> if (shouldThrow == CastedThisErrorBehavior::Throw)
</span><span class="cx"> return throwThisTypeError(*state, throwScope, JSClass::info()->className, operationName);
</span><span class="lines">@@ -371,6 +372,7 @@
</span><span class="cx"> // For custom promise-returning operations
</span><span class="cx"> return rejectPromiseWithThisTypeError(*state, JSClass::info()->className, operationName);
</span><span class="cx"> }
</span><ins>+ ASSERT(thisObject);
</ins><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObject, JSClass::info());
</span><span class="cx"> // FIXME: We should refactor the binding generated code to use references for state and thisObject.
</span><span class="cx"> return operationCaller(state, thisObject, throwScope);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (207327 => 207328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-14 06:31:55 UTC (rev 207327)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-10-14 06:58:28 UTC (rev 207328)
</span><span class="lines">@@ -3677,7 +3677,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> my $methodName = $function->signature->name;
</span><span class="cx"> if (IsReturningPromise($function) && !$isCustom) {
</span><del>- push(@implContent, " return BindingCaller<$className>::callPromiseOperation<${functionName}Caller>(state, WTFMove(promise), \"${methodName}\");\n");
</del><ins>+ my $templateParameters = "${functionName}Caller";
+ $templateParameters .= ", CastedThisErrorBehavior::Assert" if ($function->signature->extendedAttributes->{PrivateIdentifier} and not $function->signature->extendedAttributes->{PublicIdentifier});
+ push(@implContent, " return BindingCaller<$className>::callPromiseOperation<${templateParameters}>(state, WTFMove(promise), \"${methodName}\");\n");
</ins><span class="cx"> push(@implContent, "}\n");
</span><span class="cx"> push(@implContent, "\n");
</span><span class="cx"> push(@implContent, "static inline JSC::EncodedJSValue ${functionName}Caller(JSC::ExecState* state, ${className}* castedThis, Ref<DeferredPromise>&& promise, JSC::ThrowScope& throwScope)\n");
</span><span class="lines">@@ -3684,9 +3686,13 @@
</span><span class="cx"> } else {
</span><span class="cx"> my $classParameterType = $className eq "JSEventTarget" ? "JSEventTargetWrapper*" : "${className}*";
</span><span class="cx"> my $templateParameters = "${functionName}Caller";
</span><del>- # FIXME: We need this specific handling for custom promise-returning functions.
- # It would be better to have the casted-this code calling the promise-specific code.
- $templateParameters .= ", CastedThisErrorBehavior::RejectPromise" if IsReturningPromise($function);
</del><ins>+ if ($function->signature->extendedAttributes->{PrivateIdentifier} and not $function->signature->extendedAttributes->{PublicIdentifier}) {
+ $templateParameters .= ", CastedThisErrorBehavior::Assert";
+ } elsif (IsReturningPromise($function)) {
+ # FIXME: We need this specific handling for custom promise-returning functions.
+ # It would be better to have the casted-this code calling the promise-specific code.
+ $templateParameters .= ", CastedThisErrorBehavior::RejectPromise" if IsReturningPromise($function);
+ }
</ins><span class="cx">
</span><span class="cx"> push(@implContent, " return BindingCaller<$className>::callOperation<${templateParameters}>(state, \"${methodName}\");\n");
</span><span class="cx"> push(@implContent, "}\n");
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp (207327 => 207328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2016-10-14 06:31:55 UTC (rev 207327)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2016-10-14 06:58:28 UTC (rev 207328)
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestGlobalObjectInstanceFunctionTestPrivateFunction(ExecState* state)
</span><span class="cx"> {
</span><del>- return BindingCaller<JSTestGlobalObject>::callOperation<jsTestGlobalObjectInstanceFunctionTestPrivateFunctionCaller>(state, "testPrivateFunction");
</del><ins>+ return BindingCaller<JSTestGlobalObject>::callOperation<jsTestGlobalObjectInstanceFunctionTestPrivateFunctionCaller, CastedThisErrorBehavior::Assert>(state, "testPrivateFunction");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline JSC::EncodedJSValue jsTestGlobalObjectInstanceFunctionTestPrivateFunctionCaller(JSC::ExecState* state, JSTestGlobalObject* castedThis, JSC::ThrowScope& throwScope)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (207327 => 207328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-14 06:31:55 UTC (rev 207327)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-10-14 06:58:28 UTC (rev 207328)
</span><span class="lines">@@ -5352,7 +5352,7 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionPrivateMethod(ExecState* state)
</span><span class="cx"> {
</span><del>- return BindingCaller<JSTestObj>::callOperation<jsTestObjPrototypeFunctionPrivateMethodCaller>(state, "privateMethod");
</del><ins>+ return BindingCaller<JSTestObj>::callOperation<jsTestObjPrototypeFunctionPrivateMethodCaller, CastedThisErrorBehavior::Assert>(state, "privateMethod");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline JSC::EncodedJSValue jsTestObjPrototypeFunctionPrivateMethodCaller(JSC::ExecState* state, JSTestObj* castedThis, JSC::ThrowScope& throwScope)
</span></span></pre>
</div>
</div>
</body>
</html>