Title: [190461] branches/safari-601.1.46-branch/LayoutTests
- Revision
- 190461
- Author
- [email protected]
- Date
- 2015-10-02 00:57:49 -0700 (Fri, 02 Oct 2015)
Log Message
Merged r188016. rdar://problem/22707482
Modified Paths
Added Paths
Diff
Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (190460 => 190461)
--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-02 07:56:56 UTC (rev 190460)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-10-02 07:57:49 UTC (rev 190461)
@@ -1,5 +1,20 @@
2015-10-02 Babak Shafiei <[email protected]>
+ Merge r188016.
+
+ 2015-08-05 Zalan Bujtas <[email protected]>
+
+ Add missing test case (r187994).
+
+ Unreviewed.
+
+ * fast/frames/flattening/crash-when-sibling-iframe-is-destroyed-with-subtree-layoutroot-expected.txt: Added.
+ * fast/frames/flattening/crash-when-sibling-iframe-is-destroyed-with-subtree-layoutroot.html: Added.
+ * fast/frames/flattening/resources/childframe1.html: Added.
+ * fast/frames/flattening/resources/childframe2.html: Added.
+
+2015-10-02 Babak Shafiei <[email protected]>
+
Merge r187921.
2015-08-04 Chris Dumez <[email protected]>
Copied: branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/crash-when-sibling-iframe-is-destroyed-with-subtree-layoutroot-expected.txt (from rev 188016, trunk/LayoutTests/fast/frames/flattening/crash-when-sibling-iframe-is-destroyed-with-subtree-layoutroot-expected.txt) (0 => 190461)
--- branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/crash-when-sibling-iframe-is-destroyed-with-subtree-layoutroot-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/crash-when-sibling-iframe-is-destroyed-with-subtree-layoutroot-expected.txt 2015-10-02 07:57:49 UTC (rev 190461)
@@ -0,0 +1 @@
+PASSED
Copied: branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/crash-when-sibling-iframe-is-destroyed-with-subtree-layoutroot.html (from rev 188016, trunk/LayoutTests/fast/frames/flattening/crash-when-sibling-iframe-is-destroyed-with-subtree-layoutroot.html) (0 => 190461)
--- branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/crash-when-sibling-iframe-is-destroyed-with-subtree-layoutroot.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/crash-when-sibling-iframe-is-destroyed-with-subtree-layoutroot.html 2015-10-02 07:57:49 UTC (rev 190461)
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests if subtree layout crashes when the tree is mutated while the document is being destroyed.</title>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ if (window.internals)
+ internals.settings.setFrameFlatteningEnabled(true);
+
+ window._onload_ = function() {
+ if (location.hash == "#1") {
+ document.body.innerHTML = "PASSED";
+ if (window.testRunner)
+ testRunner.notifyDone();
+ } else {
+ location.hash = "#1";
+ setTimeout( function() { window.location.reload(); }, 0 );
+ }
+ }
+
+ window._onpagehide_ = function () {
+ var frame2 = document.getElementById("frame2");
+ frame2.style.padding = "20px";
+ frame2.contentDocument.getElementById("frame2textcontrol").innerText = "new text";
+ }
+</script>
+</head>
+<body>
+<iframe id=frame1 src=""
+<iframe id=frame2 src=""
+<div id=mainframediv></div>
+</body>
+</html>
\ No newline at end of file
Copied: branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/resources/childframe1.html (from rev 188016, trunk/LayoutTests/fast/frames/flattening/resources/childframe1.html) (0 => 190461)
--- branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/resources/childframe1.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/resources/childframe1.html 2015-10-02 07:57:49 UTC (rev 190461)
@@ -0,0 +1,7 @@
+<script>
+window._onpagehide_ = function () {
+ var mainframediv = parent.document.getElementById("mainframediv");
+ mainframediv.style.padding = "30px";
+ mainframediv.offsetWidth;
+}
+</script>
\ No newline at end of file
Copied: branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/resources/childframe2.html (from rev 188016, trunk/LayoutTests/fast/frames/flattening/resources/childframe2.html) (0 => 190461)
--- branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/resources/childframe2.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/frames/flattening/resources/childframe2.html 2015-10-02 07:57:49 UTC (rev 190461)
@@ -0,0 +1 @@
+<textarea id=frame2textcontrol>child frame 2</textarea>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
