<!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>[168914] 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/168914">168914</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-05-15 16:03:06 -0700 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSDOMWindow should not claim HasImpureGetOwnPropertySlot
https://bugs.webkit.org/show_bug.cgi?id=132918
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
* jit/Repatch.cpp:
(JSC::tryRepatchIn): We forgot to check for watchpoints when repatching "in".
Source/WebCore:
Tests: js/cached-window-properties.html
js/cached-window-prototype-properties.html
We now correctly handle the impurity of JSDOMWindow's custom getOwnPropertySlot without needing the
blanket HasImpureGetOwnPropertySlot. We do this through the use of watchpoints and by explicitly forbidding
any caching beyond a certain point using PropertySlot::disableCaching. Getting rid of this flag will allow
us to cache many properties/methods on both the JSDOMWindow and its prototype, which are very commonly used
across the web.
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::JSDOMWindow::getOwnPropertySlot):
* bindings/scripts/CodeGeneratorJS.pm:
(HasComplexGetOwnProperty):
(InterfaceRequiresAttributesOnInstance):
(InstanceOverridesGetOwnPropertySlot):
(GenerateHeader):
LayoutTests:
We now correctly handle the impurity of JSDOMWindow's custom getOwnPropertySlot without needing the
blanket HasImpureGetOwnPropertySlot. We do this through the use of watchpoints and by explicitly forbidding
any caching beyond a certain point using PropertySlot::disableCaching. Getting rid of this flag will allow
us to cache many properties/methods on both the JSDOMWindow and its prototype, which are very commonly used
across the web.
These tests trigger inline caching of window and window prototype properties.
* js/cached-window-properties-expected.txt: Added.
* js/cached-window-properties.html: Added.
* js/cached-window-prototype-properties-expected.txt: Added.
* js/cached-window-prototype-properties.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjscachedwindowpropertiesexpectedtxt">trunk/LayoutTests/js/cached-window-properties-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjscachedwindowpropertieshtml">trunk/LayoutTests/js/cached-window-properties.html</a></li>
<li><a href="#trunkLayoutTestsjscachedwindowprototypepropertiesexpectedtxt">trunk/LayoutTests/js/cached-window-prototype-properties-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjscachedwindowprototypepropertieshtml">trunk/LayoutTests/js/cached-window-prototype-properties.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168913 => 168914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-15 21:27:31 UTC (rev 168913)
+++ trunk/LayoutTests/ChangeLog 2014-05-15 23:03:06 UTC (rev 168914)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-05-15 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ JSDOMWindow should not claim HasImpureGetOwnPropertySlot
+ https://bugs.webkit.org/show_bug.cgi?id=132918
+
+ Reviewed by Geoffrey Garen.
+
+ We now correctly handle the impurity of JSDOMWindow's custom getOwnPropertySlot without needing the
+ blanket HasImpureGetOwnPropertySlot. We do this through the use of watchpoints and by explicitly forbidding
+ any caching beyond a certain point using PropertySlot::disableCaching. Getting rid of this flag will allow
+ us to cache many properties/methods on both the JSDOMWindow and its prototype, which are very commonly used
+ across the web.
+
+ These tests trigger inline caching of window and window prototype properties.
+
+ * js/cached-window-properties-expected.txt: Added.
+ * js/cached-window-properties.html: Added.
+ * js/cached-window-prototype-properties-expected.txt: Added.
+ * js/cached-window-prototype-properties.html: Added.
+
</ins><span class="cx"> 2014-05-15 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Automatically zip document bundles used via File API
</span></span></pre></div>
<a id="trunkLayoutTestsjscachedwindowpropertiesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/cached-window-properties-expected.txt (0 => 168914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/cached-window-properties-expected.txt (rev 0)
+++ trunk/LayoutTests/js/cached-window-properties-expected.txt 2014-05-15 23:03:06 UTC (rev 168914)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjscachedwindowpropertieshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/cached-window-properties.html (0 => 168914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/cached-window-properties.html (rev 0)
+++ trunk/LayoutTests/js/cached-window-properties.html 2014-05-15 23:03:06 UTC (rev 168914)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+var foo = function(o) {
+ return o.screenX;
+};
+
+var x = window.screenX;
+var niters = 100000;
+var sum = 0;
+for (var i = 0; i < niters; ++i) {
+ sum += foo(window);
+}
+if (sum !== x * niters)
+ throw new Error("Incorrect sum");
+
+window.screenX = 42;
+
+sum = 0;
+for (var i = 0; i < niters; ++i) {
+ sum += foo(window);
+}
+if (sum !== 42 * niters)
+ throw new Error("Incorrect sum");
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjscachedwindowprototypepropertiesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/cached-window-prototype-properties-expected.txt (0 => 168914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/cached-window-prototype-properties-expected.txt (rev 0)
+++ trunk/LayoutTests/js/cached-window-prototype-properties-expected.txt 2014-05-15 23:03:06 UTC (rev 168914)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjscachedwindowprototypepropertieshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/cached-window-prototype-properties.html (0 => 168914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/cached-window-prototype-properties.html (rev 0)
+++ trunk/LayoutTests/js/cached-window-prototype-properties.html 2014-05-15 23:03:06 UTC (rev 168914)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+var foo = function(o) {
+ return o.setTimeout;
+};
+
+var realSetTimeout = window.setTimeout;
+var niters = 100000;
+for (var i = 0; i < niters; ++i) {
+ if (foo(window) !== realSetTimeout)
+ throw new Error("Incorrect setTimeout");
+}
+
+var fakeSetTimeout = function() {
+ return;
+};
+
+window.setTimeout = fakeSetTimeout;
+
+for (var i = 0; i < niters; ++i) {
+ if (foo(window) !== fakeSetTimeout)
+ throw new Error("Incorrect setTimeout");
+}
+</script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (168913 => 168914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-05-15 21:27:31 UTC (rev 168913)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-05-15 23:03:06 UTC (rev 168914)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-15 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ JSDOMWindow should not claim HasImpureGetOwnPropertySlot
+ https://bugs.webkit.org/show_bug.cgi?id=132918
+
+ Reviewed by Geoffrey Garen.
+
+ * jit/Repatch.cpp:
+ (JSC::tryRepatchIn): We forgot to check for watchpoints when repatching "in".
+
</ins><span class="cx"> 2014-05-15 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add pointer lock to features without enabling it.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (168913 => 168914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-05-15 21:27:31 UTC (rev 168913)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-05-15 23:03:06 UTC (rev 168914)
</span><span class="lines">@@ -1458,6 +1458,9 @@
</span><span class="cx"> if (structure->typeInfo().newImpurePropertyFiresWatchpoints())
</span><span class="cx"> vm->registerWatchpointForImpureProperty(ident, stubInfo.addWatchpoint(codeBlock));
</span><span class="cx">
</span><ins>+ if (slot.watchpointSet())
+ slot.watchpointSet()->add(stubInfo.addWatchpoint(codeBlock));
+
</ins><span class="cx"> Structure* currStructure = structure;
</span><span class="cx"> WriteBarrier<Structure>* it = chain->head();
</span><span class="cx"> for (unsigned i = 0; i < count; ++i, ++it) {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168913 => 168914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-15 21:27:31 UTC (rev 168913)
+++ trunk/Source/WebCore/ChangeLog 2014-05-15 23:03:06 UTC (rev 168914)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-05-15 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ JSDOMWindow should not claim HasImpureGetOwnPropertySlot
+ https://bugs.webkit.org/show_bug.cgi?id=132918
+
+ Reviewed by Geoffrey Garen.
+
+ Tests: js/cached-window-properties.html
+ js/cached-window-prototype-properties.html
+
+ We now correctly handle the impurity of JSDOMWindow's custom getOwnPropertySlot without needing the
+ blanket HasImpureGetOwnPropertySlot. We do this through the use of watchpoints and by explicitly forbidding
+ any caching beyond a certain point using PropertySlot::disableCaching. Getting rid of this flag will allow
+ us to cache many properties/methods on both the JSDOMWindow and its prototype, which are very commonly used
+ across the web.
+
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::JSDOMWindow::getOwnPropertySlot):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (HasComplexGetOwnProperty):
+ (InterfaceRequiresAttributesOnInstance):
+ (InstanceOverridesGetOwnPropertySlot):
+ (GenerateHeader):
+
</ins><span class="cx"> 2014-05-15 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> NetworkProcess crashes at ResourceHandle::continueDidReceiveResponse
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (168913 => 168914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2014-05-15 21:27:31 UTC (rev 168913)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2014-05-15 23:03:06 UTC (rev 168914)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx">
</span><span class="cx"> entry = JSDOMWindow::info()->propHashTable(exec)->entry(exec, propertyName);
</span><span class="cx"> if (entry) {
</span><del>- slot.setCustom(thisObject, allowsAccess ? entry->attributes() : ReadOnly | DontDelete | DontEnum, entry->propertyGetter());
</del><ins>+ slot.setCacheableCustom(thisObject, allowsAccess ? entry->attributes() : ReadOnly | DontDelete | DontEnum, entry->propertyGetter());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (168913 => 168914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-05-15 21:27:31 UTC (rev 168913)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-05-15 23:03:06 UTC (rev 168914)
</span><span class="lines">@@ -589,11 +589,11 @@
</span><span class="cx"> my $indexedGetterFunction = GetIndexedGetterFunction($interface);
</span><span class="cx">
</span><span class="cx"> my $hasImpureNamedGetter = $namedGetterFunction
</span><del>- || $interface->extendedAttributes->{"CustomNamedGetter"}
- || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"};
</del><ins>+ || $interface->extendedAttributes->{"CustomNamedGetter"};
</ins><span class="cx">
</span><span class="cx"> my $hasComplexGetter = $indexedGetterFunction
</span><span class="cx"> || $interface->extendedAttributes->{"JSCustomGetOwnPropertySlotAndDescriptor"}
</span><ins>+ || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"}
</ins><span class="cx"> || $hasImpureNamedGetter;
</span><span class="cx">
</span><span class="cx"> return 1 if $interface->extendedAttributes->{"CheckSecurity"};
</span><span class="lines">@@ -616,9 +616,9 @@
</span><span class="cx"> # FIXME: We should rearrange how custom named getters and getOwnPropertySlot
</span><span class="cx"> # overrides are handled so that we get the correct semantics and lookup ordering
</span><span class="cx"> my $hasImpureNamedGetter = $namedGetterFunction
</span><del>- || $interface->extendedAttributes->{"CustomNamedGetter"}
- || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"};
- return 1 if $hasImpureNamedGetter;
</del><ins>+ || $interface->extendedAttributes->{"CustomNamedGetter"};
+ return 1 if $hasImpureNamedGetter
+ || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"};
</ins><span class="cx">
</span><span class="cx"> # FIXME: These two should be fixed by removing the custom override of message, etc
</span><span class="cx"> return 1 if $interfaceName =~ "Exception";
</span><span class="lines">@@ -727,11 +727,11 @@
</span><span class="cx"> my $indexedGetterFunction = GetIndexedGetterFunction($interface);
</span><span class="cx">
</span><span class="cx"> my $hasImpureNamedGetter = $namedGetterFunction
</span><del>- || $interface->extendedAttributes->{"CustomNamedGetter"}
- || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"};
</del><ins>+ || $interface->extendedAttributes->{"CustomNamedGetter"};
</ins><span class="cx">
</span><span class="cx"> my $hasComplexGetter = $indexedGetterFunction
</span><span class="cx"> || $interface->extendedAttributes->{"JSCustomGetOwnPropertySlotAndDescriptor"}
</span><ins>+ || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"}
</ins><span class="cx"> || $hasImpureNamedGetter;
</span><span class="cx">
</span><span class="cx"> return $numInstanceAttributes > 0 || !$interface->extendedAttributes->{"NoInterfaceObject"} || $hasComplexGetter;
</span><span class="lines">@@ -891,14 +891,13 @@
</span><span class="cx"> my $namedGetterFunction = GetNamedGetterFunction($interface);
</span><span class="cx"> my $indexedGetterFunction = GetIndexedGetterFunction($interface);
</span><span class="cx">
</span><del>- my $hasImpureNamedGetter =
- $namedGetterFunction
- || $interface->extendedAttributes->{"CustomNamedGetter"}
- || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"};
</del><ins>+ my $hasImpureNamedGetter = $namedGetterFunction
+ || $interface->extendedAttributes->{"CustomNamedGetter"};
</ins><span class="cx">
</span><span class="cx"> my $hasComplexGetter =
</span><span class="cx"> $indexedGetterFunction
</span><span class="cx"> || $interface->extendedAttributes->{"JSCustomGetOwnPropertySlotAndDescriptor"}
</span><ins>+ || $interface->extendedAttributes->{"CustomGetOwnPropertySlot"}
</ins><span class="cx"> || $hasImpureNamedGetter;
</span><span class="cx">
</span><span class="cx"> my $hasGetter = InstanceOverridesGetOwnPropertySlot($interface);
</span></span></pre>
</div>
</div>
</body>
</html>