<!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>[187085] branches/safari-601.1-branch</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/187085">187085</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-20 21:38:19 -0700 (Mon, 20 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186955">r186955</a>. rdar://problem/14489674</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestsChangeLog">branches/safari-601.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6011branchLayoutTestsfasteventsconstructorscustomeventconstructorexpectedtxt">branches/safari-601.1-branch/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt</a></li>
<li><a href="#branchessafari6011branchLayoutTestsfasteventsconstructorscustomeventconstructorhtml">branches/safari-601.1-branch/LayoutTests/fast/events/constructors/custom-event-constructor.html</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreCMakeListstxt">branches/safari-601.1-branch/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreWebCorexcodeprojprojectpbxproj">branches/safari-601.1-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari6011branchSourceWebCorebindingsjsDOMWrapperWorldh">branches/safari-601.1-branch/Source/WebCore/bindings/js/DOMWrapperWorld.h</a></li>
<li><a href="#branchessafari6011branchSourceWebCorebindingsjsJSBindingsAllInOnecpp">branches/safari-601.1-branch/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCorebindingsjsJSMessageEventCustomcpp">branches/safari-601.1-branch/Source/WebCore/bindings/js/JSMessageEventCustom.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCorebindingsjsJSPopStateEventCustomcpp">branches/safari-601.1-branch/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoredomCustomEventcpp">branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoredomCustomEventh">branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.h</a></li>
<li><a href="#branchessafari6011branchSourceWebCoredomCustomEventidl">branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.idl</a></li>
<li><a href="#branchessafari6011branchSourceWebCoredomMessageEventcpp">branches/safari-601.1-branch/Source/WebCore/dom/MessageEvent.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoredomMessageEventh">branches/safari-601.1-branch/Source/WebCore/dom/MessageEvent.h</a></li>
<li><a href="#branchessafari6011branchSourceWebCoredomPopStateEventcpp">branches/safari-601.1-branch/Source/WebCore/dom/PopStateEvent.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoredomPopStateEventh">branches/safari-601.1-branch/Source/WebCore/dom/PopStateEvent.h</a></li>
<li><a href="#branchessafari6011branchSourceWebCoretestingInternalscpp">branches/safari-601.1-branch/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoretestingInternalsh">branches/safari-601.1-branch/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#branchessafari6011branchSourceWebCoretestingInternalsidl">branches/safari-601.1-branch/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestsfasteventseventleakobjectsexpectedtxt">branches/safari-601.1-branch/LayoutTests/fast/events/event-leak-objects-expected.txt</a></li>
<li><a href="#branchessafari6011branchLayoutTestsfasteventseventleakobjectshtml">branches/safari-601.1-branch/LayoutTests/fast/events/event-leak-objects.html</a></li>
<li><a href="#branchessafari6011branchLayoutTestsfasteventseventpropertiesgcexpectedtxt">branches/safari-601.1-branch/LayoutTests/fast/events/event-properties-gc-expected.txt</a></li>
<li><a href="#branchessafari6011branchLayoutTestsfasteventseventpropertiesgchtml">branches/safari-601.1-branch/LayoutTests/fast/events/event-properties-gc.html</a></li>
<li><a href="#branchessafari6011branchSourceWebCorebindingsjsJSCustomEventCustomcpp">branches/safari-601.1-branch/Source/WebCore/bindings/js/JSCustomEventCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186955. rdar://problem/14489674
+
+ 2015-07-16 Mark Lam <mark.lam@apple.com>
+
+ Remove leak of objects between isolated worlds on custom events, message events, and pop state events.
+ https://bugs.webkit.org/show_bug.cgi?id=118884
+
+ Reviewed by Filip Pizlo and Mark Lam.
+ Patch by Keith Miller <keith_miller@apple.com>.
+
+ These tests ensure ensure objects are not leaked across isolated worlds and that those properties are not prematurely
+ garbage collected.
+
+ * fast/events/constructors/custom-event-constructor-expected.txt:
+ * fast/events/constructors/custom-event-constructor.html:
+ * fast/events/event-leak-objects-expected.txt: Added.
+ * fast/events/event-leak-objects.html: Added.
+ * fast/events/event-properties-gc-expected.txt: Added.
+ * fast/events/event-properties-gc.html: Added.
+
+2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r187031. rdar://problem/21712311
</span><span class="cx">
</span><span class="cx"> 2015-07-20 Andreas Kling <akling@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchLayoutTestsfasteventsconstructorscustomeventconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -13,8 +13,11 @@
</span><span class="cx"> PASS new CustomEvent('eventType', { detail: 'string' }).detail is 'string'
</span><span class="cx"> PASS new CustomEvent('eventType', { detail: detailObject }).detail is detailObject
</span><span class="cx"> PASS new CustomEvent('eventType', { detail: document }).detail is document
</span><ins>+PASS new CustomEvent('eventType', { detail: undefined }).detail is undefined
+PASS new CustomEvent('eventType', { detail: null }).detail is null
</ins><span class="cx"> PASS new CustomEvent('eventType', { get detail() { return true; } }).detail is true
</span><span class="cx"> PASS new CustomEvent('eventType', { get detail() { throw 'Custom Error'; } }) threw exception Custom Error.
</span><ins>+PASS event.detail is detailObject
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="branchessafari6011branchLayoutTestsfasteventsconstructorscustomeventconstructorhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/LayoutTests/fast/events/constructors/custom-event-constructor.html (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/fast/events/constructors/custom-event-constructor.html 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/LayoutTests/fast/events/constructors/custom-event-constructor.html 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -31,11 +31,23 @@
</span><span class="cx"> // Detail is a DOM object
</span><span class="cx"> shouldBe("new CustomEvent('eventType', { detail: document }).detail", "document");
</span><span class="cx">
</span><ins>+// Detail is undefined.
+shouldBe("new CustomEvent('eventType', { detail: undefined }).detail", "undefined");
+
+// Detail is null.
+shouldBe("new CustomEvent('eventType', { detail: null }).detail", "null");
+
</ins><span class="cx"> // Detail is a getter.
</span><span class="cx"> shouldBe("new CustomEvent('eventType', { get detail() { return true; } }).detail", "true");
</span><span class="cx">
</span><span class="cx"> // Detail throws an exeception.
</span><span class="cx"> shouldThrow("new CustomEvent('eventType', { get detail() { throw 'Custom Error'; } })");
</span><ins>+
+// try initCustomEvent
+var event = document.createEvent('CustomEvent');
+event.initCustomEvent('eventType', true, false, detailObject);
+shouldBe("event.detail", "detailObject");
+
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="branchessafari6011branchLayoutTestsfasteventseventleakobjectsexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1-branch/LayoutTests/fast/events/event-leak-objects-expected.txt (0 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/fast/events/event-leak-objects-expected.txt (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/fast/events/event-leak-objects-expected.txt 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS window.internals.isFromCurrentWorld(event) is true
+PASS checkAllPropertiesFromCurrentWorld(resultValue) is true
+PASS Object.pageDefinedVar is undefined.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6011branchLayoutTestsfasteventseventleakobjectshtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1-branch/LayoutTests/fast/events/event-leak-objects.html (0 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/fast/events/event-leak-objects.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/fast/events/event-leak-objects.html 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -0,0 +1,122 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+window.jsTestIsAsync = true;
+
+// The events that we want to test, with the properties that each one uses.
+var events = [
+ { eventKind: "CustomEvent", propName: "detail" },
+ { eventKind: "MessageEvent", propName: "data" },
+ { eventKind: "PopStateEvent", propName: "state" }
+];
+
+// Types we can put in the property of the Event
+var values = [
+ { propValue: "document" },
+ { propValue: '{"bar":1}' },
+ { propValue: "5" },
+ { propValue: '"hello"' },
+ { propValue: "true" },
+ { propValue: "[1,2,3]" }
+];
+
+function merge(obj1, obj2) {
+ var newObj = { };
+ for (var attrname in obj1) { newObj[attrname] = obj1[attrname]; }
+ for (var attrname in obj2) { newObj[attrname] = obj2[attrname]; }
+ return newObj;
+}
+
+// Format the tests so they look like [ { eventKind: ..., propValue: ... }, ... { eventKind: ..., propValue: ... } ]
+var tests = events.map(function(event) {
+ return values.map(function(value) {
+ return merge(event, value);
+ })
+});
+tests = tests.reduce(function(a, b) {
+ return a.concat(b);
+});
+
+// We need to scan all the properies of value to ensure they all came from the current world.
+// Assumes window.internals exists.
+function checkAllPropertiesFromCurrentWorld(value) {
+ var allFromCurrentWorld = true;
+ while (allFromCurrentWorld && value && typeof value === "object") {
+ allFromCurrentWorld = allFromCurrentWorld && window.internals.isFromCurrentWorld(value);
+ for (var prop in value)
+ allFromCurrentWorld = allFromCurrentWorld && checkAllPropertiesFromCurrentWorld(value[prop], seenValues);
+ value = Object.getPrototypeOf(value);
+ }
+
+ return allFromCurrentWorld;
+}
+
+function addListener(eventKind, eventString, prop) {
+ document.addEventListener(eventString, function(event) {
+ eventValue = event
+ resultValue = event[prop]
+
+ if (window.internals) {
+ shouldBeTrue("window.internals.isFromCurrentWorld(event)");
+ shouldBeTrue("checkAllPropertiesFromCurrentWorld(resultValue)");
+ }
+
+ // The property defined in the isolated world should be undefined.
+ shouldBeUndefined("Object.pageDefinedVar");
+ window.postMessage("done", "*");
+ });
+}
+
+function sendDocumentEvent(eventKind, eventString, prop, value) {
+ var constructor = eval(eventKind);
+ var initializer = { };
+ initializer[prop] = value;
+ var newEvent = new constructor(eventString, initializer);
+ // Try to access the property in a different world to make sure caching issues do not occur
+ newEvent[prop];
+ document.dispatchEvent(newEvent);
+}
+
+function runScript(eventKind, propName, propValue, number) {
+ // Final string should have the form:
+ // document.pageDefinedVar = 1; (function sendDocumentObject(eventKind, propName, result) {...})(...);
+ // When evaluated in the isolated world, should initiate the event with the
+ // document object as the specificed property value.
+ var eventString = eventKind + number;
+
+ var script = "Object.pageDefinedVar = 1; "
+ + "(" + sendDocumentEvent.toString() + ")('"
+ + eventKind + "', '" + eventString + "', '" + propName + "', " + propValue + ");";
+ addListener(eventKind, eventString);
+ testRunner.evaluateScriptInIsolatedWorld(0, script);
+}
+
+// Run the tests whenever a notification arrives, which indicates that the
+// previous test has finished.
+window.addEventListener("message", function(message) {
+ runNextTest();
+}, false);
+
+// Keep a count to make a unique string
+var count = 1;
+function runNextTest () {
+ var test = tests.pop();
+ if (!test) {
+ finishJSTest();
+ return;
+ }
+ runScript(test.eventKind, test.propName, test.propValue, count++);
+};
+
+// This test is meaningless without testRunner.
+if (window.testRunner) {
+ runNextTest();
+}
+</script>
+</body>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="branchessafari6011branchLayoutTestsfasteventseventpropertiesgcexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1-branch/LayoutTests/fast/events/event-properties-gc-expected.txt (0 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/fast/events/event-properties-gc-expected.txt (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/fast/events/event-properties-gc-expected.txt 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+PASS event[prop] is "foo"
+PASS event[prop] is "foo"
+PASS event[prop] is "foo"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6011branchLayoutTestsfasteventseventpropertiesgchtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1-branch/LayoutTests/fast/events/event-properties-gc.html (0 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/fast/events/event-properties-gc.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/fast/events/event-properties-gc.html 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+window.jsTestIsAsync = true;
+
+function addListener(eventType, prop) {
+ document.addEventListener(eventType, function(event) {
+ window.prop = prop;
+ // Despite the earlier assignement of the local variable to null and
+ // the following garabage collection, the property should still be
+ // present here.
+ shouldBeEqualToString("event[prop]", "foo");
+ window.prop = undefined;
+ window.postMessage("done", "*");
+ });
+}
+
+// Run the tests whenever a notification arrives, which indicates that the
+// previous test has finished.
+window.addEventListener("message", function(message) {
+ runNextTest();
+}, false);
+
+function newEvent(eventType, prop, value) {
+ return eval("new " + eventType + "('" + eventType + "', { " + prop + ": value })");
+}
+
+// The events that we want to test, with the properties that each one uses.
+var events = [
+ { eventType: "CustomEvent", prop: "detail" },
+ { eventType: "MessageEvent", prop: "data" },
+ { eventType: "PopStateEvent", prop: "state" }
+];
+
+function runNextTest () {
+ var evt = events.pop();
+ if (!evt) {
+ finishJSTest();
+ return;
+ }
+ var value = "foo";
+ var eventToDispatch = newEvent(evt.eventType, evt.prop, value);
+ value = null;
+ gc();
+ addListener(evt.eventType, evt.prop);
+ document.dispatchEvent(eventToDispatch);
+};
+
+// This test is meaningless without testRunner.
+if (window.testRunner) {
+ runNextTest();
+}
+</script>
+</body>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/CMakeLists.txt (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/CMakeLists.txt 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/CMakeLists.txt 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -1096,6 +1096,7 @@
</span><span class="cx"> bindings/js/JSCryptoKeyPairCustom.cpp
</span><span class="cx"> bindings/js/JSCryptoKeySerializationJWK.cpp
</span><span class="cx"> bindings/js/JSCryptoOperationData.cpp
</span><ins>+ bindings/js/JSCustomEventCustom.cpp
</ins><span class="cx"> bindings/js/JSCustomSQLStatementErrorCallback.cpp
</span><span class="cx"> bindings/js/JSCustomXPathNSResolver.cpp
</span><span class="cx"> bindings/js/JSDOMBinding.cpp
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -1,5 +1,56 @@
</span><span class="cx"> 2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186955. rdar://problem/14489674
+
+ 2015-07-17 Mark Lam <mark.lam@apple.com>
+
+ Remove leak of objects between isolated worlds on custom events, message events, and pop state events.
+ https://bugs.webkit.org/show_bug.cgi?id=118884
+
+ Reviewed by Filip Pizlo and Mark Lam.
+ Patch by Keith Miller <keith_miller@apple.com>.
+
+ Tests: fast/events/event-leak-objects.html
+ fast/events/event-properties-gc.html
+
+ Fixes an issue where objects passed as certain properties of events could cross isolated worlds. This
+ was fixed by checking that any object passed by an event must be serializable or originate from the same
+ isolated world as the one it is currently being accessed in. In the case of MessageEvents and PopStateEvents we
+ cache the values of the data and state properties, respectively, as they may be a deserialized object. In case
+ an object was deserialized in a world with elevated privileges we also check the cached value is from the same
+ world, if it is from a different world we recompute it. For testing purposes, I added a new function to Internals
+ that determines whether a JSObject originated in the current world.
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/DOMWrapperWorld.h:
+ (WebCore::worldForDOMObject):
+ * bindings/js/JSBindingsAllInOne.cpp:
+ * bindings/js/JSCustomEventCustom.cpp: Copied from Source/WebCore/dom/CustomEvent.cpp.
+ (WebCore::JSCustomEvent::detail):
+ * bindings/js/JSMessageEventCustom.cpp:
+ (WebCore::JSMessageEvent::data):
+ * bindings/js/JSPopStateEventCustom.cpp:
+ (WebCore::JSPopStateEvent::state):
+ * dom/CustomEvent.cpp:
+ (WebCore::CustomEvent::initCustomEvent):
+ (WebCore::CustomEvent::trySerializeDetail):
+ * dom/CustomEvent.h:
+ * dom/CustomEvent.idl:
+ * dom/MessageEvent.cpp:
+ (WebCore::MessageEvent::initMessageEvent):
+ (WebCore::MessageEvent::trySerializeData):
+ * dom/MessageEvent.h:
+ * dom/PopStateEvent.cpp:
+ (WebCore::PopStateEvent::trySerializeState):
+ * dom/PopStateEvent.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::isFromCurrentWorld):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
+2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r187035. rdar://problem/21712311
</span><span class="cx">
</span><span class="cx"> 2015-07-20 Andreas Kling <akling@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -6030,6 +6030,7 @@
</span><span class="cx"> DEBCCDD216646E8200A452E1 /* RenderMediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = DE49B308165F2FE10010338D /* RenderMediaControlElements.h */; };
</span><span class="cx"> DEBCCDD416646EAF00A452E1 /* MediaControlElementTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = DE49B300165F2FC60010338D /* MediaControlElementTypes.h */; };
</span><span class="cx"> DEBCCDD516646EB200A452E1 /* MediaControlElementTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE49B2FF165F2FC60010338D /* MediaControlElementTypes.cpp */; };
</span><ins>+ DEC297611B4F2F8D005F5945 /* JSCustomEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEC2975D1B4DEB2A005F5945 /* JSCustomEventCustom.cpp */; };
</ins><span class="cx"> DF9AFD7213FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = DF9AFD7013FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h */; };
</span><span class="cx"> DF9AFD7313FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF9AFD7113FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm */; };
</span><span class="cx"> E0FEF372B17C53EAC1C1FBEE /* EventSource.h in Headers */ = {isa = PBXBuildFile; fileRef = E0FEF371B17C53EAC1C1FBEE /* EventSource.h */; };
</span><span class="lines">@@ -13691,6 +13692,7 @@
</span><span class="cx"> DE49B300165F2FC60010338D /* MediaControlElementTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlElementTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> DE49B307165F2FE10010338D /* RenderMediaControlElements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderMediaControlElements.cpp; sourceTree = "<group>"; };
</span><span class="cx"> DE49B308165F2FE10010338D /* RenderMediaControlElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderMediaControlElements.h; sourceTree = "<group>"; };
</span><ins>+ DEC2975D1B4DEB2A005F5945 /* JSCustomEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomEventCustom.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> DF9AFD7013FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateAVFoundationObjC.h; sourceTree = "<group>"; };
</span><span class="cx"> DF9AFD7113FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaPlayerPrivateAVFoundationObjC.mm; sourceTree = "<group>"; };
</span><span class="cx"> E0FEF371B07C53EAC1C1FBEE /* EventSource.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EventSource.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -21387,6 +21389,7 @@
</span><span class="cx"> BC4EDEF70C08F414007EDD49 /* Custom */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ DEC2975D1B4DEB2A005F5945 /* JSCustomEventCustom.cpp */,
</ins><span class="cx"> BC2ED6BB0C6BD2F000920BFF /* JSAttrCustom.cpp */,
</span><span class="cx"> FDEAAAEF12B02EE400DCF33B /* JSAudioBufferSourceNodeCustom.cpp */,
</span><span class="cx"> FDEAAAF012B02EE400DCF33B /* JSAudioContextCustom.cpp */,
</span><span class="lines">@@ -30336,6 +30339,7 @@
</span><span class="cx"> B2227AD90D00BF220071B782 /* SVGTransformable.cpp in Sources */,
</span><span class="cx"> B2227ADC0D00BF220071B782 /* SVGTransformDistance.cpp in Sources */,
</span><span class="cx"> B2227ADE0D00BF220071B782 /* SVGTransformList.cpp in Sources */,
</span><ins>+ DEC297611B4F2F8D005F5945 /* JSCustomEventCustom.cpp in Sources */,
</ins><span class="cx"> B2227AE10D00BF220071B782 /* SVGTRefElement.cpp in Sources */,
</span><span class="cx"> B2227AE40D00BF220071B782 /* SVGTSpanElement.cpp in Sources */,
</span><span class="cx"> B2227AE90D00BF220071B782 /* SVGURIReference.cpp in Sources */,
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCorebindingsjsDOMWrapperWorldh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/bindings/js/DOMWrapperWorld.h (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/bindings/js/DOMWrapperWorld.h 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/bindings/js/DOMWrapperWorld.h 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -74,6 +74,11 @@
</span><span class="cx"> return JSC::jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->world();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline DOMWrapperWorld& worldForDOMObject(JSC::JSObject* object)
+{
+ return JSC::jsCast<JSDOMGlobalObject*>(object->globalObject())->world();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // DOMWrapperWorld_h
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCorebindingsjsJSBindingsAllInOnecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #include "JSCanvasRenderingContextCustom.cpp"
</span><span class="cx"> #include "JSCommandLineAPIHostCustom.cpp"
</span><span class="cx"> #include "JSCryptoCustom.cpp"
</span><ins>+#include "JSCustomEventCustom.cpp"
</ins><span class="cx"> #include "JSCustomSQLStatementErrorCallback.cpp"
</span><span class="cx"> #include "JSCustomXPathNSResolver.cpp"
</span><span class="cx"> #include "JSDOMBinding.cpp"
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCorebindingsjsJSCustomEventCustomcppfromrev187084branchessafari6011branchSourceWebCoredomCustomEventcpp"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1-branch/Source/WebCore/bindings/js/JSCustomEventCustom.cpp (from rev 187084, branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.cpp) (0 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/bindings/js/JSCustomEventCustom.cpp (rev 0)
+++ branches/safari-601.1-branch/Source/WebCore/bindings/js/JSCustomEventCustom.cpp 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -0,0 +1,63 @@
</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 "JSCustomEvent.h"
+
+#include "CustomEvent.h"
+#include "DOMWrapperWorld.h"
+#include <runtime/JSCInlines.h>
+#include <runtime/JSCJSValue.h>
+#include <runtime/Structure.h>
+
+using namespace JSC;
+
+namespace WebCore {
+
+JSValue JSCustomEvent::detail(ExecState* exec) const
+{
+ CustomEvent& event = impl();
+
+ if (event.detail().hasNoValue())
+ return jsNull();
+
+ JSValue detail = event.detail().jsValue();
+
+ if (detail.isObject() && &worldForDOMObject(detail.getObject()) != &currentWorld(exec)) {
+ // We need to make sure CustomEvents do not leak their detail property across isolated DOM worlds.
+ // Ideally, we would check that the worlds have different privileges but that's not possible yet.
+ RefPtr<SerializedScriptValue> serializedDetail = event.trySerializeDetail(exec);
+
+ if (!serializedDetail)
+ return jsNull();
+
+ return serializedDetail->deserialize(exec, globalObject(), nullptr);
+ }
+
+ return detail;
+}
+
+} // namespace WebCore
+
</ins></span></pre></div>
<a id="branchessafari6011branchSourceWebCorebindingsjsJSMessageEventCustomcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/bindings/js/JSMessageEventCustom.cpp (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/bindings/js/JSMessageEventCustom.cpp 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/bindings/js/JSMessageEventCustom.cpp 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -46,8 +46,12 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSMessageEvent::data(ExecState* exec) const
</span><span class="cx"> {
</span><del>- if (JSValue cachedValue = m_data.get())
- return cachedValue;
</del><ins>+ if (JSValue cachedValue = m_data.get()) {
+ // We cannot use a cached object if we are in a different world than the one it was created in.
+ if (!cachedValue.isObject() || &worldForDOMObject(cachedValue.getObject()) == &currentWorld(exec))
+ return cachedValue;
+ ASSERT_NOT_REACHED();
+ }
</ins><span class="cx">
</span><span class="cx"> MessageEvent& event = impl();
</span><span class="cx"> JSValue result;
</span><span class="lines">@@ -56,8 +60,19 @@
</span><span class="cx"> Deprecated::ScriptValue scriptValue = event.dataAsScriptValue();
</span><span class="cx"> if (scriptValue.hasNoValue())
</span><span class="cx"> result = jsNull();
</span><del>- else
- result = scriptValue.jsValue();
</del><ins>+ else {
+ JSValue dataValue = scriptValue.jsValue();
+ // We need to make sure MessageEvents do not leak objects in their state property across isolated DOM worlds.
+ // Ideally, we would check that the worlds have different privileges but that's not possible yet.
+ if (dataValue.isObject() && &worldForDOMObject(dataValue.getObject()) != &currentWorld(exec)) {
+ RefPtr<SerializedScriptValue> serializedValue = event.trySerializeData(exec);
+ if (serializedValue)
+ result = serializedValue->deserialize(exec, globalObject(), nullptr);
+ else
+ result = jsNull();
+ } else
+ result = dataValue;
+ }
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCorebindingsjsJSPopStateEventCustomcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -49,14 +49,29 @@
</span><span class="cx"> JSValue JSPopStateEvent::state(ExecState* exec) const
</span><span class="cx"> {
</span><span class="cx"> JSValue cachedValue = m_state.get();
</span><del>- if (!cachedValue.isEmpty())
- return cachedValue;
</del><ins>+ if (!cachedValue.isEmpty()) {
+ // We cannot use a cached object if we are in a different world than the one it was created in.
+ if (!cachedValue.isObject() || &worldForDOMObject(cachedValue.getObject()) == &currentWorld(exec))
+ return cachedValue;
+ ASSERT_NOT_REACHED();
+ }
</ins><span class="cx">
</span><span class="cx"> PopStateEvent& event = impl();
</span><span class="cx">
</span><del>- if (!event.state().hasNoValue())
- return cacheState(exec, const_cast<JSPopStateEvent*>(this), event.state().jsValue());
-
</del><ins>+ if (!event.state().hasNoValue()) {
+ // We need to make sure a PopStateEvent does not leak objects in its state property across isolated DOM worlds.
+ // Ideally, we would check that the worlds have different privileges but that's not possible yet.
+ JSValue state = event.state().jsValue();
+ if (state.isObject() && &worldForDOMObject(state.getObject()) != &currentWorld(exec)) {
+ if (RefPtr<SerializedScriptValue> serializedValue = event.trySerializeState(exec))
+ state = serializedValue->deserialize(exec, globalObject(), nullptr);
+ else
+ state = jsNull();
+ }
+
+ return cacheState(exec, const_cast<JSPopStateEvent*>(this), state);
+ }
+
</ins><span class="cx"> History* history = event.history();
</span><span class="cx"> if (!history || !event.serializedState())
</span><span class="cx"> return cacheState(exec, const_cast<JSPopStateEvent*>(this), jsNull());
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoredomCustomEventcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.cpp (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.cpp 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.cpp 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -51,15 +51,26 @@
</span><span class="cx">
</span><span class="cx"> void CustomEvent::initCustomEvent(const AtomicString& type, bool canBubble, bool cancelable, const Deprecated::ScriptValue& detail)
</span><span class="cx"> {
</span><del>- ASSERT(!m_serializedScriptValue.get());
</del><span class="cx"> if (dispatched())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> initEvent(type, canBubble, cancelable);
</span><span class="cx">
</span><span class="cx"> m_detail = detail;
</span><ins>+ m_serializedDetail = nullptr;
+ m_triedToSerialize = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<SerializedScriptValue> CustomEvent::trySerializeDetail(JSC::ExecState* exec)
+{
+ if (!m_serializedDetail && !m_triedToSerialize) {
+ m_serializedDetail = SerializedScriptValue::create(exec, m_detail.jsValue(), nullptr, nullptr, NonThrowing);
+ m_triedToSerialize = true;
+ }
+
+ return m_serializedDetail;
+}
+
</ins><span class="cx"> EventInterface CustomEvent::eventInterface() const
</span><span class="cx"> {
</span><span class="cx"> return CustomEventInterfaceType;
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoredomCustomEventh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.h (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.h 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.h 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -57,14 +57,16 @@
</span><span class="cx"> virtual EventInterface eventInterface() const override;
</span><span class="cx">
</span><span class="cx"> const Deprecated::ScriptValue& detail() const { return m_detail; }
</span><del>- PassRefPtr<SerializedScriptValue> serializedScriptValue() { return m_serializedScriptValue; }
</del><ins>+
+ RefPtr<SerializedScriptValue> trySerializeDetail(JSC::ExecState*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CustomEvent();
</span><span class="cx"> CustomEvent(const AtomicString& type, const CustomEventInit& initializer);
</span><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue m_detail;
</span><del>- RefPtr<SerializedScriptValue> m_serializedScriptValue;
</del><ins>+ RefPtr<SerializedScriptValue> m_serializedDetail;
+ bool m_triedToSerialize { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoredomCustomEventidl"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.idl (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.idl 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/dom/CustomEvent.idl 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx"> [
</span><span class="cx"> ConstructorTemplate=Event,
</span><span class="cx"> ] interface CustomEvent : Event {
</span><del>- [InitializedByEventConstructor] readonly attribute any detail;
</del><ins>+ [InitializedByEventConstructor, CustomGetter] readonly attribute any detail;
</ins><span class="cx">
</span><del>- void initCustomEvent([Default=Undefined] optional DOMString typeArg,
- [Default=Undefined] optional boolean canBubbleArg,
- [Default=Undefined] optional boolean cancelableArg,
</del><ins>+ void initCustomEvent([Default=Undefined] optional DOMString typeArg,
+ [Default=Undefined] optional boolean canBubbleArg,
+ [Default=Undefined] optional boolean cancelableArg,
</ins><span class="cx"> [Default=Undefined] optional any detailArg);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoredomMessageEventcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/dom/MessageEvent.cpp (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/dom/MessageEvent.cpp 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/dom/MessageEvent.cpp 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -118,6 +118,8 @@
</span><span class="cx">
</span><span class="cx"> m_dataType = DataTypeScriptValue;
</span><span class="cx"> m_dataAsScriptValue = data;
</span><ins>+ m_dataAsSerializedScriptValue = nullptr;
+ m_triedToSerialize = false;
</ins><span class="cx"> m_origin = origin;
</span><span class="cx"> m_lastEventId = lastEventId;
</span><span class="cx"> m_source = source;
</span><span class="lines">@@ -138,6 +140,18 @@
</span><span class="cx"> m_source = source;
</span><span class="cx"> m_ports = WTF::move(ports);
</span><span class="cx"> }
</span><ins>+
+RefPtr<SerializedScriptValue> MessageEvent::trySerializeData(JSC::ExecState* exec)
+{
+ ASSERT(!m_dataAsScriptValue.hasNoValue());
+
+ if (!m_dataAsSerializedScriptValue && !m_triedToSerialize) {
+ m_dataAsSerializedScriptValue = SerializedScriptValue::create(exec, m_dataAsScriptValue.jsValue(), nullptr, nullptr, NonThrowing);
+ m_triedToSerialize = true;
+ }
+
+ return m_dataAsSerializedScriptValue;
+}
</ins><span class="cx">
</span><span class="cx"> // FIXME: Remove this when we have custom ObjC binding support.
</span><span class="cx"> SerializedScriptValue* MessageEvent::data() const
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoredomMessageEventh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/dom/MessageEvent.h (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/dom/MessageEvent.h 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/dom/MessageEvent.h 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -114,6 +114,8 @@
</span><span class="cx"> Blob* dataAsBlob() const { ASSERT(m_dataType == DataTypeBlob); return m_dataAsBlob.get(); }
</span><span class="cx"> ArrayBuffer* dataAsArrayBuffer() const { ASSERT(m_dataType == DataTypeArrayBuffer); return m_dataAsArrayBuffer.get(); }
</span><span class="cx">
</span><ins>+ RefPtr<SerializedScriptValue> trySerializeData(JSC::ExecState*);
+
</ins><span class="cx"> private:
</span><span class="cx"> MessageEvent();
</span><span class="cx"> MessageEvent(const AtomicString&, const MessageEventInit&);
</span><span class="lines">@@ -127,6 +129,7 @@
</span><span class="cx"> DataType m_dataType;
</span><span class="cx"> Deprecated::ScriptValue m_dataAsScriptValue;
</span><span class="cx"> RefPtr<SerializedScriptValue> m_dataAsSerializedScriptValue;
</span><ins>+ bool m_triedToSerialize { false };
</ins><span class="cx"> String m_dataAsString;
</span><span class="cx"> RefPtr<Blob> m_dataAsBlob;
</span><span class="cx"> RefPtr<ArrayBuffer> m_dataAsArrayBuffer;
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoredomPopStateEventcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/dom/PopStateEvent.cpp (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/dom/PopStateEvent.cpp 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/dom/PopStateEvent.cpp 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "History.h"
</span><del>-#include "SerializedScriptValue.h"
</del><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -79,6 +78,18 @@
</span><span class="cx"> return adoptRef(*new PopStateEvent(type, initializer));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<SerializedScriptValue> PopStateEvent::trySerializeState(JSC::ExecState* exec)
+{
+ ASSERT(!m_state.hasNoValue());
+
+ if (!m_serializedState && !m_triedToSerialize) {
+ m_serializedState = SerializedScriptValue::create(exec, m_state.jsValue(), nullptr, nullptr, NonThrowing);
+ m_triedToSerialize = true;
+ }
+
+ return m_serializedState;
+}
+
</ins><span class="cx"> EventInterface PopStateEvent::eventInterface() const
</span><span class="cx"> {
</span><span class="cx"> return PopStateEventInterfaceType;
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoredomPopStateEventh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/dom/PopStateEvent.h (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/dom/PopStateEvent.h 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/dom/PopStateEvent.h 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #define PopStateEvent_h
</span><span class="cx">
</span><span class="cx"> #include "Event.h"
</span><ins>+#include "SerializedScriptValue.h"
</ins><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -48,7 +49,10 @@
</span><span class="cx"> static Ref<PopStateEvent> create(PassRefPtr<SerializedScriptValue>, PassRefPtr<History>);
</span><span class="cx"> static Ref<PopStateEvent> create(const AtomicString&, const PopStateEventInit&);
</span><span class="cx">
</span><del>- PassRefPtr<SerializedScriptValue> serializedState() const { return m_serializedState; }
</del><ins>+ PassRefPtr<SerializedScriptValue> serializedState() const { ASSERT(m_serializedState); return m_serializedState; }
+
+ RefPtr<SerializedScriptValue> trySerializeState(JSC::ExecState*);
+
</ins><span class="cx"> const Deprecated::ScriptValue& state() const { return m_state; }
</span><span class="cx"> History* history() const { return m_history.get(); }
</span><span class="cx">
</span><span class="lines">@@ -61,6 +65,7 @@
</span><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue m_state;
</span><span class="cx"> RefPtr<SerializedScriptValue> m_serializedState;
</span><ins>+ bool m_triedToSerialize { false };
</ins><span class="cx"> RefPtr<History> m_history;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/testing/Internals.cpp (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/testing/Internals.cpp 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/testing/Internals.cpp 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -2357,6 +2357,16 @@
</span><span class="cx"> return SerializedScriptValue::adopt(bytes);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Internals::isFromCurrentWorld(Deprecated::ScriptValue value) const
+{
+ ASSERT(!value.hasNoValue());
+
+ JSC::ExecState* exec = contextDocument()->vm().topCallFrame;
+ if (!value.isObject() || &worldForDOMObject(value.jsValue().getObject()) == &currentWorld(exec))
+ return true;
+ return false;
+}
+
</ins><span class="cx"> void Internals::setUsesOverlayScrollbars(bool enabled)
</span><span class="cx"> {
</span><span class="cx"> WebCore::Settings::setUsesOverlayScrollbars(enabled);
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/testing/Internals.h (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/testing/Internals.h 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/testing/Internals.h 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -324,6 +324,8 @@
</span><span class="cx"> PassRefPtr<ArrayBuffer> serializeObject(PassRefPtr<SerializedScriptValue>) const;
</span><span class="cx"> PassRefPtr<SerializedScriptValue> deserializeBuffer(PassRefPtr<ArrayBuffer>) const;
</span><span class="cx">
</span><ins>+ bool isFromCurrentWorld(Deprecated::ScriptValue) const;
+
</ins><span class="cx"> void setUsesOverlayScrollbars(bool enabled);
</span><span class="cx">
</span><span class="cx"> String getCurrentCursorInfo(ExceptionCode&);
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/testing/Internals.idl (187084 => 187085)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/testing/Internals.idl 2015-07-21 04:38:11 UTC (rev 187084)
+++ branches/safari-601.1-branch/Source/WebCore/testing/Internals.idl 2015-07-21 04:38:19 UTC (rev 187085)
</span><span class="lines">@@ -311,6 +311,8 @@
</span><span class="cx"> SerializedScriptValue deserializeBuffer(ArrayBuffer buffer);
</span><span class="cx"> ArrayBuffer serializeObject(SerializedScriptValue obj);
</span><span class="cx">
</span><ins>+ boolean isFromCurrentWorld(any obj);
+
</ins><span class="cx"> void setUsesOverlayScrollbars(boolean enabled);
</span><span class="cx">
</span><span class="cx"> void forceReload(boolean endToEnd);
</span></span></pre>
</div>
</div>
</body>
</html>