Title: [225689] tags/Safari-605.1.16.1/LayoutTests

Diff

Modified: tags/Safari-605.1.16.1/LayoutTests/ChangeLog (225688 => 225689)


--- tags/Safari-605.1.16.1/LayoutTests/ChangeLog	2017-12-08 19:34:26 UTC (rev 225688)
+++ tags/Safari-605.1.16.1/LayoutTests/ChangeLog	2017-12-08 19:34:30 UTC (rev 225689)
@@ -1,3 +1,19 @@
+2017-12-08  Jason Marcell  <jmarc...@apple.com>
+
+        Cherry-pick r225670. rdar://problem/35410390
+
+    2017-12-07  Ryosuke Niwa  <rn...@webkit.org>
+
+            iOS: Many AMP pages hit a release assertion inside Document::updateStyleIfNeeded
+            https://bugs.webkit.org/show_bug.cgi?id=180550
+
+            Reviewed by Simon Fraser.
+
+            Add a test for r225647.
+
+            * fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash-expected.txt: Added.
+            * fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash.html: Added.
+
 2017-12-05  Fujii Hironori  <hironori.fu...@sony.com>
 
         [GTK] Layout test media/track/track-in-band-duplicate-tracks-when-source-changes.html crashes and times out

Added: tags/Safari-605.1.16.1/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash-expected.txt (0 => 225689)


--- tags/Safari-605.1.16.1/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash-expected.txt	                        (rev 0)
+++ tags/Safari-605.1.16.1/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash-expected.txt	2017-12-08 19:34:30 UTC (rev 225689)
@@ -0,0 +1,3 @@
+This tests that WebKit doesn't crash when there is an non-flattened iframe inside a flattened iframe.
+
+PASS. WebKit did not crash.

Added: tags/Safari-605.1.16.1/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash.html (0 => 225689)


--- tags/Safari-605.1.16.1/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash.html	                        (rev 0)
+++ tags/Safari-605.1.16.1/LayoutTests/fast/frames/flattening/non-flattening-frame-inside-flattening-iframe-crash.html	2017-12-08 19:34:30 UTC (rev 225689)
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p>This tests that WebKit doesn't crash when there is an non-flattened iframe inside a flattened iframe.</p>
+<div id="container"></div>
+<script>
+
+if (window.testRunner && window.internals) {
+    testRunner.dumpAsText();
+    internals.settings.setFrameFlattening("FullyEnabled");
+}
+
+const container = document.getElementById('container');
+const outerIFrame = document.createElement('iframe');
+container.appendChild(outerIFrame);
+
+const innerIFrame = document.createElement('iframe');
+innerIFrame.setAttribute('scrolling', 'no');
+innerIFrame.style.width = '100px';
+innerIFrame.style.height = '100px';
+
+outerIFrame.contentDocument.body.appendChild(innerIFrame);
+
+let content = '';
+for (let i = 0; i < 50; i++)
+    content += `some text ${i}<br>`;
+
+innerIFrame.contentDocument.body.innerHTML = content;
+
+document.body.getBoundingClientRect();
+container.textContent = 'PASS. WebKit did not crash.';
+
+</script>
+</body>
+</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to