<!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>[189490] 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/189490">189490</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-08 09:01:47 -0700 (Tue, 08 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert manual test added in http://trac.webkit.org/changeset/70321 to an automated test
https://bugs.webkit.org/show_bug.cgi?id=74729
<rdar://problem/22550195>
Reviewed by Jon Honeycutt.
.:
* ManualTests/compositing/resources/composited-subframe.html: Removed.
* ManualTests/compositing/show-composited-iframe-on-back-button.html: Removed.
LayoutTests:
* compositing/resources/composited-subframe.html: Added.
* compositing/resources/show-composited-iframe-on-back-button.css: Added.
(.container):
(.box):
* compositing/show-composited-iframe-on-back-button-expected.html: Added.
* compositing/show-composited-iframe-on-back-button.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingresourcescompositedsubframehtml">trunk/LayoutTests/compositing/resources/composited-subframe.html</a></li>
<li><a href="#trunkLayoutTestscompositingresourcesshowcompositediframeonbackbuttoncss">trunk/LayoutTests/compositing/resources/show-composited-iframe-on-back-button.css</a></li>
<li><a href="#trunkLayoutTestscompositingshowcompositediframeonbackbuttonexpectedhtml">trunk/LayoutTests/compositing/show-composited-iframe-on-back-button-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositingshowcompositediframeonbackbuttonhtml">trunk/LayoutTests/compositing/show-composited-iframe-on-back-button.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkManualTestscompositingresourcescompositedsubframehtml">trunk/ManualTests/compositing/resources/composited-subframe.html</a></li>
<li><a href="#trunkManualTestscompositingshowcompositediframeonbackbuttonhtml">trunk/ManualTests/compositing/show-composited-iframe-on-back-button.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (189489 => 189490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-09-08 15:58:33 UTC (rev 189489)
+++ trunk/ChangeLog 2015-09-08 16:01:47 UTC (rev 189490)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-09-08 Daniel Bates <dabates@apple.com>
+
+ Convert manual test added in http://trac.webkit.org/changeset/70321 to an automated test
+ https://bugs.webkit.org/show_bug.cgi?id=74729
+ <rdar://problem/22550195>
+
+ Reviewed by Jon Honeycutt.
+
+ * ManualTests/compositing/resources/composited-subframe.html: Removed.
+ * ManualTests/compositing/show-composited-iframe-on-back-button.html: Removed.
+
</ins><span class="cx"> 2015-09-06 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit.xcworkspace should be be able to build iOS platforms
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189489 => 189490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-08 15:58:33 UTC (rev 189489)
+++ trunk/LayoutTests/ChangeLog 2015-09-08 16:01:47 UTC (rev 189490)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-09-08 Daniel Bates <dabates@apple.com>
+
+ Convert manual test added in http://trac.webkit.org/changeset/70321 to an automated test
+ https://bugs.webkit.org/show_bug.cgi?id=74729
+ <rdar://problem/22550195>
+
+ Reviewed by Jon Honeycutt.
+
+ * compositing/resources/composited-subframe.html: Added.
+ * compositing/resources/show-composited-iframe-on-back-button.css: Added.
+ (.container):
+ (.box):
+ * compositing/show-composited-iframe-on-back-button-expected.html: Added.
+ * compositing/show-composited-iframe-on-back-button.html: Added.
+
</ins><span class="cx"> 2015-09-08 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed GTK gardening.
</span></span></pre></div>
<a id="trunkLayoutTestscompositingresourcescompositedsubframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/resources/composited-subframe.html (0 => 189490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/resources/composited-subframe.html (rev 0)
+++ trunk/LayoutTests/compositing/resources/composited-subframe.html 2015-09-08 16:01:47 UTC (rev 189490)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<link rel="stylesheet" href="show-composited-iframe-on-back-button.css">
+</head>
+<body style="margin: 0">
+<div class="box"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingresourcesshowcompositediframeonbackbuttoncss"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/resources/show-composited-iframe-on-back-button.css (0 => 189490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/resources/show-composited-iframe-on-back-button.css (rev 0)
+++ trunk/LayoutTests/compositing/resources/show-composited-iframe-on-back-button.css 2015-09-08 16:01:47 UTC (rev 189490)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+.container {
+ height: 200px;
+ width: 200px;
+ border: 1px solid black;
+}
+
+.box {
+ height: 200px;
+ width: 200px;
+ background-color: blue;
+ -webkit-transform: translateZ(0);
+ overflow: hidden;
+}
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingshowcompositediframeonbackbuttonexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/show-composited-iframe-on-back-button-expected.html (0 => 189490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/show-composited-iframe-on-back-button-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/show-composited-iframe-on-back-button-expected.html 2015-09-08 16:01:47 UTC (rev 189490)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>Show composited iframe contents when navigating back to page</title>
+<link rel="stylesheet" href="resources/show-composited-iframe-on-back-button.css">
+</head>
+<body>
+<p>This page has a composited iframe. When navigating to a new page and then back to this one, the iframe contents should show up.</p>
+<p>To run this test manually, perform the following:</p>
+<ol>
+ <li>Click <a href="http://apple.com">here</a>.</li>
+ <li>Click the back button in the browser.</li>
+</ol>
+<p>This test PASSED if a blue box is visible below. Otherwise, it FAILED.</p>
+<div class="container"><div class="box"></div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingshowcompositediframeonbackbuttonhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/show-composited-iframe-on-back-button.html (0 => 189490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/show-composited-iframe-on-back-button.html (rev 0)
+++ trunk/LayoutTests/compositing/show-composited-iframe-on-back-button.html 2015-09-08 16:01:47 UTC (rev 189490)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>Show composited iframe contents when navigating back to page</title>
+<link rel="stylesheet" href="resources/show-composited-iframe-on-back-button.css">
+<script>
+function handleOnPageShow(pageTransitionEvent)
+{
+ console.assert(window.testRunner);
+ if (pageTransitionEvent.persisted)
+ return;
+
+ // First time the page has been loaded.
+ testRunner.queueLoad("about:blank");
+ testRunner.queueBackNavigation(1);
+}
+
+if (window.testRunner) {
+ testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
+
+ window.onpageshow = handleOnPageShow;
+}
+</script>
+</head>
+<body>
+<p>This page has a composited iframe. When navigating to a new page and then back to this one, the iframe contents should show up.</p>
+<p>To run this test manually, perform the following:</p>
+<ol>
+ <li>Click <a href="http://apple.com">here</a>.</li>
+ <li>Click the back button in the browser.</li>
+</ol>
+<p>This test PASSED if a blue box is visible below. Otherwise, it FAILED.</p>
+<iframe class="container" scrolling="no" src="resources/composited-subframe.html"></iframe>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkManualTestscompositingresourcescompositedsubframehtml"></a>
<div class="delfile"><h4>Deleted: trunk/ManualTests/compositing/resources/composited-subframe.html (189489 => 189490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ManualTests/compositing/resources/composited-subframe.html 2015-09-08 15:58:33 UTC (rev 189489)
+++ trunk/ManualTests/compositing/resources/composited-subframe.html 2015-09-08 16:01:47 UTC (rev 189490)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-<!DOCTYPE html>
-
-<html>
-<head>
- <style type="text/css" media="screen">
- body { background-color:silver }
-
- .box {
- height: 200px;
- width: 200px;
- margin: 10px;
- padding: 5px;
- background-color: blue;
- -webkit-transform: translateZ(0);
- overflow:hidden;
- }
- .box:hover {
- -webkit-transform: none;
- }
- </style>
-</head>
-<body>
-
- <div id="iframe-content" class="box">
- </div>
-
-</body>
-</html>
</del></span></pre></div>
<a id="trunkManualTestscompositingshowcompositediframeonbackbuttonhtml"></a>
<div class="delfile"><h4>Deleted: trunk/ManualTests/compositing/show-composited-iframe-on-back-button.html (189489 => 189490)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ManualTests/compositing/show-composited-iframe-on-back-button.html 2015-09-08 15:58:33 UTC (rev 189489)
+++ trunk/ManualTests/compositing/show-composited-iframe-on-back-button.html 2015-09-08 16:01:47 UTC (rev 189490)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-<!DOCTYPE html>
-
-<html>
-<head>
- <!--
- This content was originally intended as a layout test, but the sequencing performed by
- queueBackNavigation/queueForwardNavigation differs somehow from what occurs when hitting
- the back and forward buttons, so the error does not occur. I've left all the LayoutTestController
- logic in the test in case this is fixed in the future.
- -->
-
- <title>Show composited iframe contents when navigating back to page</title>
- <style type="text/css" media="screen">
- #box {
- background-color: red;
- width: 100px;
- height: 100px;
- -webkit-transform: translateZ(0);
- }
- iframe {
- margin: 20px;
- height: 250px;
- width: 250px;
- border: 1px solid black;
- }
-
- .composited {
- -webkit-transform: translateZ(0);
- }
-
- </style>
- <script type="text/javascript" charset="utf-8">
- var dumpLayerTree = function()
- {
- if (window.layoutTestController) {
- document.getElementById('layers').innerHTML += "Layer Tree after\n\n"+layoutTestController.layerTreeAsText()+"\n\n";
- }
- }
-
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- }
-
- function onPageShow(evt)
- {
- if (!evt.persisted && window.layoutTestController) {
- // this is the first time the page has been loaded, then setup the
- // to-be-tested scenario.
- document.getElementById('layers').innerHTML = "Layer Tree before\n\n"+layoutTestController.layerTreeAsText()+"\n\n";
- layoutTestController.queueLoad("resources/subframe.html");
- layoutTestController.queueBackNavigation(1);
- layoutTestController.queueForwardNavigation(1);
- layoutTestController.queueBackNavigation(1);
- layoutTestController.queueNonLoadingScript("dumpLayerTree()");
- }
- }
-
- window.onpageshow = onPageShow;
- </script>
-</head>
-<body>
-<p>
- This page has a composited iframe. When navigating to a new page and then back to this one, the iframe contents should show up.
-</p>
- Click on the following URL and then click back. When navigating back to this page, the blue box inside the black rectangle
- should show up.
-</p>
-<pre>
- <a href="http://apple.com">http://apple.com</a>
-</pre>
- <div id=box></div>
- <iframe id="iframe" scrolling="no" src="resources/composited-subframe.html"></iframe>
-<br>
-<pre id="layers"></pre>
-</body>
-</html>
</del></span></pre>
</div>
</div>
</body>
</html>