<!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>[166249] 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/166249">166249</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-03-25 13:43:27 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/166070">r166070</a>.
Rollout <a href="http://trac.webkit.org/projects/webkit/changeset/166070">r166070</a> due to 2% performance loss in page load times
Reverted changeset:
"Change CodeGeneratorJS.pm special cases for "DOMWindow" to be
general purpose"
https://bugs.webkit.org/show_bug.cgi?id=130553
http://trac.webkit.org/changeset/166070</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsIDLAttributestxt">trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowidl">trunk/Source/WebCore/page/DOMWindow.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166248 => 166249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-25 20:40:34 UTC (rev 166248)
+++ trunk/Source/WebCore/ChangeLog 2014-03-25 20:43:27 UTC (rev 166249)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-03-25 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ Unreviewed, rolling out r166070.
+
+ Rollout r166070 due to 2% performance loss in page load times
+
+ Reverted changeset:
+
+ "Change CodeGeneratorJS.pm special cases for "DOMWindow" to be
+ general purpose"
+ https://bugs.webkit.org/show_bug.cgi?id=130553
+ http://trac.webkit.org/changeset/166070
+
+2014-03-25 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> Unreviewed, rolling out r166126.
</span><span class="cx">
</span><span class="cx"> Rollout r166126 in prepartion to roll out prerequisite r166070
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (166248 => 166249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-03-25 20:40:34 UTC (rev 166248)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-03-25 20:43:27 UTC (rev 166249)
</span><span class="lines">@@ -2127,8 +2127,12 @@
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx">
</span><span class="cx"> if (!$attribute->isStatic || $attribute->signature->type =~ /Constructor$/) {
</span><del>- if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
- push(@implContent, " ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
</del><ins>+ if ($interfaceName eq "DOMWindow") {
+ push(@implContent, " ${className}* castedThis = jsDynamicCast<$className*>(JSValue::decode(thisValue));\n");
+ push(@implContent, " if (UNLIKELY(!castedThis)) {\n");
+ push(@implContent, " if (JSDOMWindowShell* shell = jsDynamicCast<JSDOMWindowShell*>(JSValue::decode(thisValue)))\n");
+ push(@implContent, " castedThis = shell->window();\n");
+ push(@implContent, " }\n");
</ins><span class="cx"> push(@implContent, " UNUSED_PARAM(slotBase);\n");
</span><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " ${className}* castedThis = jsDynamicCast<$className*>(JSValue::decode(thisValue));\n");
</span><span class="lines">@@ -2346,8 +2350,12 @@
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(baseValue);\n");
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(thisValue);\n");
</span><del>- if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
- push(@implContent, " ${className}* domObject = to${className}(JSValue::decode(thisValue));\n");
</del><ins>+ if ($interfaceName eq "DOMWindow") {
+ push(@implContent, " ${className}* domObject = jsDynamicCast<$className*>(JSValue::decode(thisValue));\n");
+ push(@implContent, " if (!domObject) {\n");
+ push(@implContent, " if (JSDOMWindowShell* shell = jsDynamicCast<JSDOMWindowShell*>(JSValue::decode(thisValue)))\n");
+ push(@implContent, " domObject = shell->window();\n");
+ push(@implContent, " }\n");
</ins><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " ${className}* domObject = jsDynamicCast<${className}*>(JSValue::decode(thisValue));\n") if ConstructorShouldBeOnInstance($interface);
</span><span class="cx"> push(@implContent, " ${className}Prototype* domObject = jsDynamicCast<${className}Prototype*>(baseValue);\n") if !ConstructorShouldBeOnInstance($interface);
</span><span class="lines">@@ -2371,10 +2379,12 @@
</span><span class="cx"> push(@implContent, "void ${constructorFunctionName}(ExecState* exec, JSObject*, EncodedJSValue thisValue, EncodedJSValue encodedValue)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> push(@implContent, " JSValue value = JSValue::decode(encodedValue);");
</span><del>- if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
- push(@implContent, " ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
- } else {
- push(@implContent, " ${className}* castedThis = jsDynamicCast<${className}*>(JSValue::decode(thisValue));\n");
</del><ins>+ push(@implContent, " ${className}* castedThis = jsDynamicCast<${className}*>(JSValue::decode(thisValue));\n");
+ if ($interfaceName eq "DOMWindow") {
+ push(@implContent, " if (UNLIKELY(!castedThis)) {\n");
+ push(@implContent, " if (JSDOMWindowShell* shell = jsDynamicCast<JSDOMWindowShell*>(JSValue::decode(thisValue)))\n");
+ push(@implContent, " castedThis = shell->window();\n");
+ push(@implContent, " }\n");
</ins><span class="cx"> }
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!castedThis)) {\n");
</span><span class="cx"> push(@implContent, " throwVMTypeError(exec);\n");
</span><span class="lines">@@ -2478,10 +2488,12 @@
</span><span class="cx"> push(@implContent, " JSValue value = JSValue::decode(encodedValue);\n");
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(exec);\n");
</span><span class="cx"> if (!$attribute->isStatic) {
</span><del>- if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
- push(@implContent, " ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
- } else {
- push(@implContent, " ${className}* castedThis = jsDynamicCast<${className}*>(JSValue::decode(thisValue));\n");
</del><ins>+ push(@implContent, " ${className}* castedThis = jsDynamicCast<${className}*>(JSValue::decode(thisValue));\n");
+ if ($interfaceName eq "DOMWindow") {
+ push(@implContent, " if (UNLIKELY(!castedThis)) {\n");
+ push(@implContent, " if (JSDOMWindowShell* shell = jsDynamicCast<JSDOMWindowShell*>(JSValue::decode(thisValue)))\n");
+ push(@implContent, " castedThis = shell->window();\n");
+ push(@implContent, " }\n");
</ins><span class="cx"> }
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!castedThis)) {\n");
</span><span class="cx"> push(@implContent, " throwVMTypeError(exec, makeDOMBindingsTypeErrorString(\"The \", \"$interfaceName\", \".\", \"$name\", \" setter can only be used on instances of \", \"$interfaceName\"));\n");
</span><span class="lines">@@ -2706,8 +2718,8 @@
</span><span class="cx"> GenerateImplementationFunctionCall($function, $functionString, " ", $svgPropertyType, $interfaceName);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
- push(@implContent, " $className* castedThis = to${className}(exec->hostThisValue().toThis(exec, NotStrictMode));\n");
</del><ins>+ if ($interfaceName eq "DOMWindow") {
+ push(@implContent, " $className* castedThis = toJSDOMWindow(exec->hostThisValue().toThis(exec, NotStrictMode));\n");
</ins><span class="cx"> push(@implContent, " if (UNLIKELY(!castedThis))\n");
</span><span class="cx"> push(@implContent, " return throwVMTypeError(exec);\n");
</span><span class="cx"> } elsif ($interface->extendedAttributes->{"WorkerGlobalScope"}) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsIDLAttributestxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt (166248 => 166249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt 2014-03-25 20:40:34 UTC (rev 166248)
+++ trunk/Source/WebCore/bindings/scripts/IDLAttributes.txt 2014-03-25 20:43:27 UTC (rev 166249)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> CustomIsReachable
</span><span class="cx"> CustomNamedGetter
</span><span class="cx"> CustomNamedSetter
</span><del>-CustomProxyToJSObject
</del><span class="cx"> CustomPutFunction
</span><span class="cx"> CustomReturn
</span><span class="cx"> CustomSetter
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.idl (166248 => 166249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.idl 2014-03-25 20:40:34 UTC (rev 166248)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2014-03-25 20:43:27 UTC (rev 166249)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> CustomDeleteProperty,
</span><span class="cx"> CustomGetOwnPropertySlot,
</span><span class="cx"> CustomEnumerateProperty,
</span><del>- CustomProxyToJSObject,
</del><span class="cx"> JSCustomMarkFunction,
</span><span class="cx"> JSCustomToNativeObject,
</span><span class="cx"> CustomPutFunction,
</span></span></pre>
</div>
</div>
</body>
</html>