<!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>[168048] trunk/LayoutTests</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/168048">168048</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2014-04-30 15:03:57 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable snapshot tests on mac wk2.
https://bugs.webkit.org/show_bug.cgi?id=131871.
Reviewed by Darin Adler.
* platform/mac-wk2/TestExpectations:
* platform/mac-wk2/plugins/snapshotting/autoplay-dominant-expected.txt:
* platform/mac-wk2/plugins/snapshotting/autoplay-plugin-blocked-by-image-expected.txt:
* platform/mac-wk2/plugins/snapshotting/autoplay-plugin-blocked-by-image-expected.txt:
* platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-after-delay-expected.txt:
* platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-expected.txt:
* platform/mac-wk2/plugins/snapshotting/quicktime-plugin-snapshotted-expected.txt:
* platform/mac-wk2/plugins/snapshotting/restart-expected.txt:
* platform/mac-wk2/plugins/snapshotting/set-plugin-size-to-tiny-expected.txt:
* platform/mac-wk2/plugins/snapshotting/simple-expected.txt:
* platform/mac-wk2/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image-expected.txt:
* plugins/snapshotting/autoplay-dominant.html:
* plugins/snapshotting/autoplay-plugin-blocked-by-image.html:
* plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image.html:
* plugins/snapshotting/autoplay-similar-to-dominant-after-delay.html:
* plugins/snapshotting/autoplay-similar-to-dominant.html:
* plugins/snapshotting/quicktime-plugin-snapshotted.html:
* plugins/snapshotting/restart.html:
* plugins/snapshotting/set-plugin-size-to-tiny.html:
* plugins/snapshotting/simple.html:
* plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2pluginssnapshottingautoplaydominantexpectedtxt">trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-dominant-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2pluginssnapshottingautoplaypluginblockedbyimageexpectedtxt">trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-plugin-blocked-by-image-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2pluginssnapshottingautoplaypluginmostlyblockedbyimageexpectedtxt">trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2pluginssnapshottingautoplaysimilartodominantafterdelayexpectedtxt">trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-after-delay-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2pluginssnapshottingautoplaysimilartodominantexpectedtxt">trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2pluginssnapshottingquicktimepluginsnapshottedexpectedtxt">trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/quicktime-plugin-snapshotted-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2pluginssnapshottingrestartexpectedtxt">trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/restart-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2pluginssnapshottingsetpluginsizetotinyexpectedtxt">trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/set-plugin-size-to-tiny-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2pluginssnapshottingsimpleexpectedtxt">trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/simple-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2pluginssnapshottingsnapshotpluginnotquiteblockedbyimageexpectedtxt">trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image-expected.txt</a></li>
<li><a href="#trunkLayoutTestspluginssnapshottingautoplaydominanthtml">trunk/LayoutTests/plugins/snapshotting/autoplay-dominant.html</a></li>
<li><a href="#trunkLayoutTestspluginssnapshottingautoplaypluginblockedbyimagehtml">trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-blocked-by-image.html</a></li>
<li><a href="#trunkLayoutTestspluginssnapshottingautoplaypluginmostlyblockedbyimagehtml">trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image.html</a></li>
<li><a href="#trunkLayoutTestspluginssnapshottingautoplaysimilartodominantafterdelayhtml">trunk/LayoutTests/plugins/snapshotting/autoplay-similar-to-dominant-after-delay.html</a></li>
<li><a href="#trunkLayoutTestspluginssnapshottingautoplaysimilartodominanthtml">trunk/LayoutTests/plugins/snapshotting/autoplay-similar-to-dominant.html</a></li>
<li><a href="#trunkLayoutTestspluginssnapshottingquicktimepluginsnapshottedhtml">trunk/LayoutTests/plugins/snapshotting/quicktime-plugin-snapshotted.html</a></li>
<li><a href="#trunkLayoutTestspluginssnapshottingrestarthtml">trunk/LayoutTests/plugins/snapshotting/restart.html</a></li>
<li><a href="#trunkLayoutTestspluginssnapshottingsetpluginsizetotinyhtml">trunk/LayoutTests/plugins/snapshotting/set-plugin-size-to-tiny.html</a></li>
<li><a href="#trunkLayoutTestspluginssnapshottingsimplehtml">trunk/LayoutTests/plugins/snapshotting/simple.html</a></li>
<li><a href="#trunkLayoutTestspluginssnapshottingsnapshotpluginnotquiteblockedbyimagehtml">trunk/LayoutTests/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/ChangeLog 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-04-30 Roger Fong <roger_fong@apple.com>
+
+ Enable snapshot tests on mac wk2.
+ https://bugs.webkit.org/show_bug.cgi?id=131871.
+
+ Reviewed by Darin Adler.
+
+ * platform/mac-wk2/TestExpectations:
+ * platform/mac-wk2/plugins/snapshotting/autoplay-dominant-expected.txt:
+ * platform/mac-wk2/plugins/snapshotting/autoplay-plugin-blocked-by-image-expected.txt:
+ * platform/mac-wk2/plugins/snapshotting/autoplay-plugin-blocked-by-image-expected.txt:
+ * platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-after-delay-expected.txt:
+ * platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-expected.txt:
+ * platform/mac-wk2/plugins/snapshotting/quicktime-plugin-snapshotted-expected.txt:
+ * platform/mac-wk2/plugins/snapshotting/restart-expected.txt:
+ * platform/mac-wk2/plugins/snapshotting/set-plugin-size-to-tiny-expected.txt:
+ * platform/mac-wk2/plugins/snapshotting/simple-expected.txt:
+ * platform/mac-wk2/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image-expected.txt:
+ * plugins/snapshotting/autoplay-dominant.html:
+ * plugins/snapshotting/autoplay-plugin-blocked-by-image.html:
+ * plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image.html:
+ * plugins/snapshotting/autoplay-similar-to-dominant-after-delay.html:
+ * plugins/snapshotting/autoplay-similar-to-dominant.html:
+ * plugins/snapshotting/quicktime-plugin-snapshotted.html:
+ * plugins/snapshotting/restart.html:
+ * plugins/snapshotting/set-plugin-size-to-tiny.html:
+ * plugins/snapshotting/simple.html:
+ * plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html:
+
</ins><span class="cx"> 2014-04-30 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Enable new multi-column mode
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -418,9 +418,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/128315 editing/caret/caret-color.html [ Pass Failure ]
</span><span class="cx">
</span><del>-# Temporarily disabled while working out compositing failures
-plugins/snapshotting [ Skip ]
-
</del><span class="cx"> webkit.org/b/129468 [ MountainLion Debug ] css3/compositing/isolation-isolate-blended-child.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><span class="cx"> ### END OF (3) Unclassified failures
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2pluginssnapshottingautoplaydominantexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-dominant-expected.txt (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-dominant-expected.txt 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-dominant-expected.txt 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,12 +1,4 @@
</span><del>-layer at (0,0) size 785x650
- RenderView at (0,0) size 785x600
-layer at (0,0) size 785x650
- RenderBlock {HTML} at (0,0) size 785x650
- RenderBody {BODY} at (8,8) size 769x634
- RenderBlock {P} at (0,0) size 769x18
- RenderText {#text} at (0,0) size 334x18
- text run at (0,0) width 334: "This test's dominant plugin should play automatically"
- RenderBlock (anonymous) at (0,34) size 769x600
- RenderText {#text} at (0,0) size 0x0
-layer at (8,42) size 600x600
- RenderEmbeddedObject {EMBED} at (0,0) size 600x600
</del><ins>+This test's dominant plugin should play automatically
+
+PASS
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2pluginssnapshottingautoplaypluginblockedbyimageexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-plugin-blocked-by-image-expected.txt (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-plugin-blocked-by-image-expected.txt 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-plugin-blocked-by-image-expected.txt 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,16 +1,4 @@
</span><del>-layer at (0,0) size 785x1254
- RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1254
- RenderBlock {HTML} at (0,0) size 785x1254
- RenderBody {BODY} at (8,8) size 769x1238
- RenderBlock {P} at (0,0) size 769x18
- RenderText {#text} at (0,0) size 623x18
- text run at (0,0) width 623: "This tests that a dominant plugin should play automatically even if an image is on top of the plugin."
- RenderBlock (anonymous) at (0,34) size 769x1204
- RenderText {#text} at (600,586) size 4x18
- text run at (600,586) width 4: " "
- RenderText {#text} at (0,0) size 0x0
-layer at (8,42) size 600x600
- RenderEmbeddedObject {EMBED} at (0,0) size 600x600
-layer at (8,46) size 600x600
- RenderImage {IMG} at (0,604) size 600x600
</del><ins>+This tests that a dominant plugin should play automatically even if an image is on top of the plugin.
+
+PASS
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2pluginssnapshottingautoplaypluginmostlyblockedbyimageexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image-expected.txt (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image-expected.txt 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image-expected.txt 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,14 +1,4 @@
</span><del>-layer at (0,0) size 785x650
- RenderView at (0,0) size 785x600
-layer at (0,0) size 785x650
- RenderBlock {HTML} at (0,0) size 785x650
- RenderBody {BODY} at (8,8) size 769x634
- RenderBlock {P} at (0,0) size 769x18
- RenderText {#text} at (0,0) size 635x18
- text run at (0,0) width 635: "This tests that a dominant plugin should play automatically if an image is mostly on top of the plugin."
- RenderBlock (anonymous) at (0,34) size 769x600
- RenderText {#text} at (0,0) size 0x0
-layer at (8,42) size 600x600
- RenderEmbeddedObject {EMBED} at (0,0) size 600x600
-layer at (0,20) size 600x600
- RenderImage {IMG} at (0,20) size 600x600
</del><ins>+This tests that a dominant plugin should play automatically if an image is mostly on top of the plugin.
+
+PASS
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2pluginssnapshottingautoplaysimilartodominantafterdelayexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-after-delay-expected.txt (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-after-delay-expected.txt 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-after-delay-expected.txt 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,15 +1,5 @@
</span><del>-layer at (0,0) size 785x850
- RenderView at (0,0) size 785x600
-layer at (0,0) size 785x850
- RenderBlock {HTML} at (0,0) size 785x850
- RenderBody {BODY} at (8,8) size 769x834
- RenderBlock {P} at (0,0) size 769x18
- RenderText {#text} at (0,0) size 696x18
- text run at (0,0) width 696: "The dominant plugin should play automatically, and then so should the identical plugin that is added a bit later."
- RenderBlock {DIV} at (0,34) size 769x600
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {DIV} at (0,634) size 769x200
-layer at (8,42) size 600x600
- RenderEmbeddedObject {EMBED} at (0,0) size 600x600
-layer at (8,642) size 200x200
- RenderEmbeddedObject {EMBED} at (0,0) size 200x200
</del><ins>+The dominant plugin should play automatically, and then so should the identical plugin that is added a bit later.
+
+PASS
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2pluginssnapshottingautoplaysimilartodominantexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-expected.txt (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-expected.txt 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/autoplay-similar-to-dominant-expected.txt 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,24 +1,10 @@
</span><del>-layer at (0,0) size 785x1056
- RenderView at (0,0) size 785x600
-layer at (0,0) size 785x1056
- RenderBlock {HTML} at (0,0) size 785x1056
- RenderBody {BODY} at (8,8) size 769x1032
- RenderBlock {P} at (0,0) size 769x18
- RenderText {#text} at (0,0) size 750x18
- text run at (0,0) width 750: "The dominant plugin should play automatically, and trigger all the others to play as well, since they are the same origin."
- RenderBlock {P} at (0,34) size 769x600
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {P} at (0,650) size 769x200
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {P} at (0,866) size 769x100
- RenderText {#text} at (0,0) size 0x0
- RenderBlock {P} at (0,982) size 769x50
- RenderText {#text} at (0,0) size 0x0
-layer at (8,42) size 600x600
- RenderEmbeddedObject {EMBED} at (0,0) size 600x600
-layer at (8,658) size 200x200
- RenderEmbeddedObject {EMBED} at (0,0) size 200x200
-layer at (8,874) size 100x100
- RenderEmbeddedObject {EMBED} at (0,0) size 100x100
-layer at (8,990) size 50x50
- RenderEmbeddedObject {EMBED} at (0,0) size 50x50
</del><ins>+The dominant plugin should play automatically, and trigger all the others to play as well, since they are the same origin.
+
+PASS
+
+
+
+
+
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2pluginssnapshottingquicktimepluginsnapshottedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/quicktime-plugin-snapshotted-expected.txt (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/quicktime-plugin-snapshotted-expected.txt 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/quicktime-plugin-snapshotted-expected.txt 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,14 +1,4 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x36
- RenderText {#text} at (0,0) size 784x36
- text run at (0,0) width 407: "This test ensures that quicktime plugins can also be snapshotted. "
- text run at (407,0) width 377: "We make the plugin here to small to be primary plugin, thus"
- text run at (0,18) width 159: "it should get snapshotted."
- RenderBlock (anonymous) at (0,52) size 784x300
- RenderText {#text} at (0,0) size 0x0
-layer at (8,60) size 300x300
- RenderEmbeddedObject {EMBED} at (0,0) size 300x300
</del><ins>+This test ensures that quicktime plugins can also be snapshotted. We make the plugin here too small to be the primary plugin, thus it should get snapshotted.
+
+PASS
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2pluginssnapshottingrestartexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/restart-expected.txt (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/restart-expected.txt 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/restart-expected.txt 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,12 +1,4 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 445x18
- text run at (0,0) width 445: "This test forces a plugin to snapshot immediately, then tries to restart it."
- RenderBlock (anonymous) at (0,34) size 784x150
- RenderText {#text} at (0,0) size 0x0
-layer at (8,42) size 300x150
- RenderEmbeddedObject {EMBED} at (0,0) size 300x150
</del><ins>+This test forces a plugin to snapshot immediately, then tries to restart it.
+
+PASS
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2pluginssnapshottingsetpluginsizetotinyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/set-plugin-size-to-tiny-expected.txt (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/set-plugin-size-to-tiny-expected.txt 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/set-plugin-size-to-tiny-expected.txt 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,31 +1,6 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 642x18
- text run at (0,0) width 642: "This test ensures that if we have set a plugin to be too small after the initial load that it still gets played."
- RenderBlock {P} at (0,34) size 784x18
- RenderText {#text} at (0,0) size 701x18
- text run at (0,0) width 701: "Also ensure that the plugin remains snapshotted if the size was initially specified but made too small afterwards."
- RenderBlock (anonymous) at (0,68) size 784x44
- RenderText {#text} at (40,26) size 4x18
- text run at (40,26) width 4: " "
- RenderSnapshottedPlugIn {EMBED} at (44,0) size 40x40
- RenderText {#text} at (0,0) size 0x0
-layer at (8,76) size 40x40
- RenderEmbeddedObject {EMBED} at (0,0) size 40x40
-layer at (52,76) size 40x40
- RenderBlock (relative positioned) {DIV} at (0,0) size 40x40
-layer at (57,81) size 30x30
- RenderFlexibleBox {DIV} at (5,5) size 30x30 [bgcolor=#FFFFFFBF]
- RenderBlock {DIV} at (0,-3) size 30x36
-layer at (57,78) size 30x18 scrollWidth 139
- RenderBlock {DIV} at (0,0) size 30x18
- RenderText {#text} at (0,0) size 139x18
- text run at (0,0) width 139: "Snapshotted Plug-In"
-layer at (57,96) size 30x18 scrollWidth 94
- RenderBlock {DIV} at (0,18) size 30x18 [color=#444444]
- RenderText {#text} at (0,0) size 94x18
- text run at (0,0) width 94: "Click to restart"
</del><ins>+This test ensures that if we have set a plugin to be too small after the initial load that it still gets played.
+
+Also ensure that the plugin remains snapshotted if the size was initially specified but made too small afterwards.
+
+PASS
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2pluginssnapshottingsimpleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/simple-expected.txt (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/simple-expected.txt 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/simple-expected.txt 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><span class="cx"> This test forces a plugin to snapshot immediately
</span><span class="cx">
</span><del>-FAIL
</del><ins>+PASS
</ins><span class="cx">
</span><del>-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2pluginssnapshottingsnapshotpluginnotquiteblockedbyimageexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image-expected.txt (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image-expected.txt 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image-expected.txt 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,52 +1,6 @@
</span><del>-layer at (0,0) size 785x2214
- RenderView at (0,0) size 785x600
-layer at (0,0) size 785x2214
- RenderBlock {HTML} at (0,0) size 785x2214
- RenderBody {BODY} at (8,8) size 769x2198
- RenderBlock {P} at (0,0) size 769x36
- RenderText {#text} at (0,0) size 719x36
- text run at (0,0) width 719: "This tests that a plugin should be snapshotted if it is partially covered by an image but not enough to be considered"
- text run at (0,18) width 59: "blocking."
- RenderBlock {P} at (0,52) size 769x18
- RenderText {#text} at (0,0) size 353x18
- text run at (0,0) width 353: "It additionally tests that we take transforms into account."
- RenderBlock (anonymous) at (0,86) size 769x2112
- RenderSnapshottedPlugIn {EMBED} at (0,0) size 600x600
- RenderText {#text} at (600,586) size 4x18
- text run at (600,586) width 4: " "
- RenderText {#text} at (600,1190) size 4x18
- text run at (600,1190) width 4: " "
- RenderSnapshottedPlugIn {EMBED} at (0,1208) size 600x600
- RenderText {#text} at (600,1794) size 4x18
- text run at (600,1794) width 4: " "
- RenderText {#text} at (0,0) size 0x0
-layer at (8,94) size 600x600
- RenderBlock (relative positioned) {DIV} at (0,0) size 600x600
-layer at (13,99) size 590x590
- RenderFlexibleBox {DIV} at (5,5) size 590x590 [bgcolor=#FFFFFFBF]
- RenderBlock {DIV} at (225,277) size 140x36
-layer at (239,376) size 139x18
- RenderBlock {DIV} at (0,0) size 139x18
- RenderText {#text} at (0,0) size 139x18
- text run at (0,0) width 139: "Snapshotted Plug-In"
-layer at (239,394) size 139x18
- RenderBlock {DIV} at (0,18) size 139x18 [color=#444444]
- RenderText {#text} at (0,0) size 94x18
- text run at (0,0) width 94: "Click to restart"
-layer at (8,173) size 600x600
- RenderImage {IMG} at (0,604) size 600x600
-layer at (8,1302) size 600x600
- RenderBlock (relative positioned) {DIV} at (0,0) size 600x600
-layer at (13,1307) size 590x590
- RenderFlexibleBox {DIV} at (5,5) size 590x590 [bgcolor=#FFFFFFBF]
- RenderBlock {DIV} at (225,277) size 140x36
-layer at (239,1584) size 139x18
- RenderBlock {DIV} at (0,0) size 139x18
- RenderText {#text} at (0,0) size 139x18
- text run at (0,0) width 139: "Snapshotted Plug-In"
-layer at (239,1602) size 139x18
- RenderBlock {DIV} at (0,18) size 139x18 [color=#444444]
- RenderText {#text} at (0,0) size 94x18
- text run at (0,0) width 94: "Click to restart"
-layer at (8,1906) size 300x300
- RenderImage {IMG} at (0,1812) size 300x300
</del><ins>+This tests that a plugin should be snapshotted if it is partially covered by an image but not enough to be considered blocking.
+
+It additionally tests that we take transforms into account.
+
+PASS
+
</ins></span></pre></div>
<a id="trunkLayoutTestspluginssnapshottingautoplaydominanthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/snapshotting/autoplay-dominant.html (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/snapshotting/autoplay-dominant.html 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/plugins/snapshotting/autoplay-dominant.html 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,12 +1,18 @@
</span><span class="cx"> <p>This test's dominant plugin should play automatically</p>
</span><ins>+<div id="result">FAIL</div>
</ins><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><del>- window.internals.settings.setPlugInSnapshottingEnabled(true);
- window.internals.settings.setMaximumPlugInSnapshotAttempts(0);
</del><ins>+ internals.settings.setPlugInSnapshottingEnabled(true);
+ internals.settings.setMaximumPlugInSnapshotAttempts(0);
</ins><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ //testRunner.dumpAsText();
</ins><span class="cx"> setTimeout(function () {
</span><ins>+ var result = document.getElementById("result");
+ var embed = document.getElementById("plugin");
+ if (!internals.isPluginSnapshotted(embed))
+ result.innerHTML = "PASS";
</ins><span class="cx"> testRunner.notifyDone();
</span><del>- }, 500);
</del><ins>+ }, 1000);
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<embed src="../resources/lines.swf" width="600" height="600"></embed>
</del><ins>+<embed id="plugin" src="../resources/lines.swf" width="600" height="600"></embed>
</ins></span></pre></div>
<a id="trunkLayoutTestspluginssnapshottingautoplaypluginblockedbyimagehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-blocked-by-image.html (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-blocked-by-image.html 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-blocked-by-image.html 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,13 +1,19 @@
</span><span class="cx"> <p>This tests that a dominant plugin should play automatically even if an image is on top of the plugin.</p>
</span><ins>+<div id="result">FAIL</div>
</ins><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><del>- window.internals.settings.setPlugInSnapshottingEnabled(true);
- window.internals.settings.setMaximumPlugInSnapshotAttempts(0);
</del><ins>+ internals.settings.setPlugInSnapshottingEnabled(true);
+ internals.settings.setMaximumPlugInSnapshotAttempts(0);
</ins><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ testRunner.dumpAsText();
</ins><span class="cx"> setTimeout(function () {
</span><ins>+ var result = document.getElementById("result");
+ var embed = document.getElementById("plugin");
+ if (!internals.isPluginSnapshotted(embed))
+ result.innerHTML = "PASS";
</ins><span class="cx"> testRunner.notifyDone();
</span><span class="cx"> }, 1000);
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<embed src="../resources/lines.swf" width="600" height="600"></embed>
</del><ins>+<embed id="plugin" src="../resources/lines.swf" width="600" height="600"></embed>
</ins><span class="cx"> <img src="../resources/apple.gif" width="600" height="600" style="position:relative; top:-600px;">
</span></span></pre></div>
<a id="trunkLayoutTestspluginssnapshottingautoplaypluginmostlyblockedbyimagehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image.html (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image.html 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/plugins/snapshotting/autoplay-plugin-mostly-blocked-by-image.html 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,13 +1,19 @@
</span><span class="cx"> <p>This tests that a dominant plugin should play automatically if an image is mostly on top of the plugin.</p>
</span><ins>+<div id="result">FAIL</div>
</ins><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><del>- window.internals.settings.setPlugInSnapshottingEnabled(true);
- window.internals.settings.setMaximumPlugInSnapshotAttempts(0);
</del><ins>+ internals.settings.setPlugInSnapshottingEnabled(true);
+ internals.settings.setMaximumPlugInSnapshotAttempts(0);
</ins><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ testRunner.dumpAsText();
</ins><span class="cx"> setTimeout(function () {
</span><ins>+ var result = document.getElementById("result");
+ var embed = document.getElementById("plugin");
+ if (!internals.isPluginSnapshotted(embed))
+ result.innerHTML = "PASS";
</ins><span class="cx"> testRunner.notifyDone();
</span><span class="cx"> }, 1000);
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<embed src="../resources/lines.swf" width="600" height="600"></embed>
-<img src="../resources/apple.gif" width="600" height="600" style="position:absolute; top:20px; left:0px">
</del><ins>+<embed id="plugin" src="../resources/lines.swf" width="600" height="600"></embed>
+<img src="../resources/apple.gif" width="600" height="600" style="position:absolute; top:45px; left:0px">
</ins></span></pre></div>
<a id="trunkLayoutTestspluginssnapshottingautoplaysimilartodominantafterdelayhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/snapshotting/autoplay-similar-to-dominant-after-delay.html (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/snapshotting/autoplay-similar-to-dominant-after-delay.html 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/plugins/snapshotting/autoplay-similar-to-dominant-after-delay.html 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,19 +1,27 @@
</span><span class="cx"> <p>The dominant plugin should play automatically, and then so should the identical plugin that is added a bit later.</p>
</span><ins>+<div id="result">FAIL</div>
</ins><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><del>- window.internals.settings.setPlugInSnapshottingEnabled(true);
- window.internals.settings.setMaximumPlugInSnapshotAttempts(0);
</del><ins>+ internals.settings.setPlugInSnapshottingEnabled(true);
+ internals.settings.setMaximumPlugInSnapshotAttempts(0);
</ins><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ testRunner.dumpAsText();
</ins><span class="cx"> setTimeout(function () {
</span><span class="cx"> var div = document.createElement("div");
</span><del>- div.innerHTML = '<embed src="../resources/lines.swf" width="200" height="200"></embed>';
</del><ins>+ div.innerHTML = '<embed id="plugin2" src="../resources/lines.swf" width="200" height="200"></embed>';
</ins><span class="cx"> document.body.appendChild(div);
</span><span class="cx"> setTimeout(function () {
</span><ins>+ var result = document.getElementById("result");
+ var embed1 = document.getElementById("plugin1");
+ var embed2 = document.getElementById("plugin2");
+ if (!(internals.isPluginSnapshotted(embed1)
+ || internals.isPluginSnapshotted(embed2)))
+ result.innerHTML = "PASS";
</ins><span class="cx"> testRunner.notifyDone();
</span><del>- }, 500);
</del><ins>+ }, 1000);
</ins><span class="cx"> }, 500);
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> <div>
</span><del>-<embed src="../resources/lines.swf" width="600" height="600"></embed>
</del><ins>+<embed id="plugin1" src="../resources/lines.swf" width="600" height="600"></embed>
</ins><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestspluginssnapshottingautoplaysimilartodominanthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/snapshotting/autoplay-similar-to-dominant.html (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/snapshotting/autoplay-similar-to-dominant.html 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/plugins/snapshotting/autoplay-similar-to-dominant.html 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,23 +1,35 @@
</span><span class="cx"> <p>The dominant plugin should play automatically, and trigger all the others to play as well, since they are the same origin.</p>
</span><ins>+<div id="result">FAIL</div>
</ins><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><del>- window.internals.settings.setPlugInSnapshottingEnabled(true);
- window.internals.settings.setMaximumPlugInSnapshotAttempts(0);
</del><ins>+ internals.settings.setPlugInSnapshottingEnabled(true);
+ internals.settings.setMaximumPlugInSnapshotAttempts(0);
</ins><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ testRunner.dumpAsText();
</ins><span class="cx"> setTimeout(function () {
</span><ins>+ var result = document.getElementById("result");
+ var embed1 = document.getElementById("plugin1");
+ var embed2 = document.getElementById("plugin2");
+ var embed3 = document.getElementById("plugin3");
+ var embed4 = document.getElementById("plugin4");
+ if (!(internals.isPluginSnapshotted(embed1)
+ || internals.isPluginSnapshotted(embed2)
+ || internals.isPluginSnapshotted(embed3)
+ || internals.isPluginSnapshotted(embed4)))
+ result.innerHTML = "PASS";
</ins><span class="cx"> testRunner.notifyDone();
</span><del>- }, 500);
</del><ins>+ }, 2000);
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> <p>
</span><del>-<embed src="../resources/lines.swf" width="600" height="600"></embed>
</del><ins>+<embed id="plugin1" src="../resources/lines.swf" width="600" height="600"></embed>
</ins><span class="cx"> </p>
</span><span class="cx"> <p>
</span><del>-<embed src="../resources/lines.swf" width="200" height="200"></embed>
</del><ins>+<embed id="plugin2" src="../resources/lines.swf" width="200" height="200"></embed>
</ins><span class="cx"> </p>
</span><span class="cx"> <p>
</span><del>-<embed src="../resources/lines.swf" width="100" height="100"></embed>
</del><ins>+<embed id="plugin3" src="../resources/lines.swf" width="100" height="100"></embed>
</ins><span class="cx"> </p>
</span><span class="cx"> <p>
</span><del>-<embed src="../resources/lines.swf" width="50" height="50"></embed>
</del><ins>+<embed id="plugin4" src="../resources/lines.swf" width="50" height="50"></embed>
</ins><span class="cx"> </p>
</span></span></pre></div>
<a id="trunkLayoutTestspluginssnapshottingquicktimepluginsnapshottedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/snapshotting/quicktime-plugin-snapshotted.html (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/snapshotting/quicktime-plugin-snapshotted.html 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/plugins/snapshotting/quicktime-plugin-snapshotted.html 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,13 +1,19 @@
</span><span class="cx"> <p>This test ensures that quicktime plugins can also be snapshotted.
</span><span class="cx"> We make the plugin here too small to be the primary plugin, thus it should get snapshotted.</p>
</span><ins>+<div id="result">FAIL</div>
</ins><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><del>- window.internals.settings.setPlugInSnapshottingEnabled(true);
- window.internals.settings.setMaximumPlugInSnapshotAttempts(0);
</del><ins>+ internals.settings.setPlugInSnapshottingEnabled(true);
+ internals.settings.setMaximumPlugInSnapshotAttempts(0);
</ins><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ testRunner.dumpAsText();
</ins><span class="cx"> setTimeout(function () {
</span><ins>+ var result = document.getElementById("result");
+ var embed = document.getElementById("plugin");
+ if (internals.isPluginSnapshotted(embed))
+ result.innerHTML = "PASS";
</ins><span class="cx"> testRunner.notifyDone();
</span><span class="cx"> }, 500);
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<embed src="../resources/orange.mov" width="300" height="300"></embed>
</del><ins>+<embed id="plugin" src="../resources/orange.mov" width="300" height="300"></embed>
</ins></span></pre></div>
<a id="trunkLayoutTestspluginssnapshottingrestarthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/snapshotting/restart.html (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/snapshotting/restart.html 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/plugins/snapshotting/restart.html 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,19 +1,25 @@
</span><span class="cx"> <p>This test forces a plugin to snapshot immediately, then tries to restart it.</p>
</span><ins>+<div id="result">FAIL</div>
</ins><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><del>- window.internals.settings.setPlugInSnapshottingEnabled(true);
- window.internals.settings.setMaximumPlugInSnapshotAttempts(0);
</del><ins>+ internals.settings.setPlugInSnapshottingEnabled(true);
+ internals.settings.setMaximumPlugInSnapshotAttempts(0);
</ins><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ testRunner.dumpAsText();
</ins><span class="cx"> setTimeout(function () {
</span><del>- var embed = document.querySelector("embed");
</del><ins>+ var embed = document.getElementById("plugin");
</ins><span class="cx"> var rect = embed.getBoundingClientRect();
</span><span class="cx"> eventSender.mouseMoveTo(rect.left + 10, rect.top + 10);
</span><span class="cx"> eventSender.mouseDown();
</span><span class="cx"> eventSender.mouseUp();
</span><span class="cx"> setTimeout(function () {
</span><ins>+ var result = document.getElementById("result");
+ var embed = document.getElementById("plugin");
+ if (!internals.isPluginSnapshotted(embed))
+ result.innerHTML = "PASS";
</ins><span class="cx"> testRunner.notifyDone();
</span><del>- }, 500);
- }, 500);
</del><ins>+ }, 1000);
+ }, 1000);
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<embed src="../resources/lines.swf"></embed>
</del><ins>+<embed id="plugin" src="../resources/lines.swf"></embed>
</ins></span></pre></div>
<a id="trunkLayoutTestspluginssnapshottingsetpluginsizetotinyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/snapshotting/set-plugin-size-to-tiny.html (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/snapshotting/set-plugin-size-to-tiny.html 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/plugins/snapshotting/set-plugin-size-to-tiny.html 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,20 +1,25 @@
</span><span class="cx"> <p>This test ensures that if we have set a plugin to be too small after the initial load that it still gets played.</p>
</span><span class="cx"> <p>Also ensure that the plugin remains snapshotted if the size was initially specified but made too small afterwards.</p>
</span><ins>+<div id="result">FAIL</div>
</ins><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><del>- window.internals.settings.setPlugInSnapshottingEnabled(true);
- window.internals.settings.setMaximumPlugInSnapshotAttempts(0);
</del><ins>+ internals.settings.setPlugInSnapshottingEnabled(true);
+ internals.settings.setMaximumPlugInSnapshotAttempts(0);
</ins><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ testRunner.dumpAsText();
</ins><span class="cx"> setTimeout(function () {
</span><del>- var embedElement = document.getElementById("embed");
- embedElement.style.width = 40;
- embedElement.style.height = 40;
- var embedElement2 = document.getElementById("embed2");
- embedElement2.style.width = 40;
- embedElement2.style.height = 40;
</del><ins>+ var result = document.getElementById("result");
+ var embed1 = document.getElementById("plugin1");
+ embed1.style.width = 40;
+ embed1.style.height = 40;
+ var embed2 = document.getElementById("plugin2");
+ embed2.style.width = 40;
+ embed2.style.height = 40;
+ if (!internals.isPluginSnapshotted(embed1) && internals.isPluginSnapshotted(embed2))
+ result.innerHTML = "PASS";
</ins><span class="cx"> testRunner.notifyDone();
</span><span class="cx"> }, 2000);
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<embed id="embed" src="../resources/lines.swf"></embed>
-<embed id="embed2" src="../resources/lines.swf" style="width:300px; height:300px"></embed>
</del><ins>+<embed id="plugin1" src="../resources/lines.swf"></embed>
+<embed id="plugin2" src="../resources/lines.swf" style="width:300px; height:300px"></embed>
</ins></span></pre></div>
<a id="trunkLayoutTestspluginssnapshottingsimplehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/snapshotting/simple.html (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/snapshotting/simple.html 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/plugins/snapshotting/simple.html 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,18 +1,18 @@
</span><span class="cx"> <p>This test forces a plugin to snapshot immediately</p>
</span><del>-<p id="passStatus">PASS</p>
</del><ins>+<div id="result">FAIL</div>
</ins><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><del>- window.internals.settings.setPlugInSnapshottingEnabled(true);
- window.internals.settings.setMaximumPlugInSnapshotAttempts(0);
</del><ins>+ internals.settings.setPlugInSnapshottingEnabled(true);
+ internals.settings.setMaximumPlugInSnapshotAttempts(0);
</ins><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> setTimeout(function () {
</span><del>- var plugin = document.getElementById("plugin");
- var passStatus = document.getElementById("passStatus");
- if (!window.internals.isPluginSnapshotted(plugin))
- passStatus.innerHTML = "FAIL";
</del><ins>+ var result = document.getElementById("result");
+ var embed = document.getElementById("plugin");
+ if (internals.isPluginSnapshotted(embed))
+ result.innerHTML = "PASS";
</ins><span class="cx"> testRunner.notifyDone();
</span><del>- }, 500);
</del><ins>+ }, 1000);
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> <embed id="plugin" src="../resources/lines.swf"></embed>
</span></span></pre></div>
<a id="trunkLayoutTestspluginssnapshottingsnapshotpluginnotquiteblockedbyimagehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html (168047 => 168048)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html 2014-04-30 22:02:19 UTC (rev 168047)
+++ trunk/LayoutTests/plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html 2014-04-30 22:03:57 UTC (rev 168048)
</span><span class="lines">@@ -1,16 +1,23 @@
</span><span class="cx"> <p>This tests that a plugin should be snapshotted if it is partially covered by an image but not enough to be considered blocking.</p>
</span><span class="cx"> <p> It additionally tests that we take transforms into account. </p>
</span><ins>+<div id="result">FAIL</div>
</ins><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><del>- window.internals.settings.setPlugInSnapshottingEnabled(true);
- window.internals.settings.setMaximumPlugInSnapshotAttempts(0);
</del><ins>+ internals.settings.setPlugInSnapshottingEnabled(true);
+ internals.settings.setMaximumPlugInSnapshotAttempts(0);
</ins><span class="cx"> testRunner.waitUntilDone();
</span><ins>+ testRunner.dumpAsText();
</ins><span class="cx"> setTimeout(function () {
</span><ins>+ var result = document.getElementById("result");
+ var embed1 = document.getElementById("plugin1");
+ var embed2 = document.getElementById("plugin2");
+ if (internals.isPluginSnapshotted(embed1) && internals.isPluginSnapshotted(embed2))
+ result.innerHTML = "PASS";
</ins><span class="cx"> testRunner.notifyDone();
</span><span class="cx"> }, 1000);
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>-<embed src="../resources/lines.swf" width="600" height="600"></embed>
</del><ins>+<embed id="plugin1" src="../resources/lines.swf" width="600" height="600"></embed>
</ins><span class="cx"> <img src="../resources/apple.gif" width="600" height="600" style="position:relative; top:-525px; left:0px">
</span><del>-<embed src="../resources/lines.swf" width="600" height="600"></embed>
</del><ins>+<embed id="plugin2" src="../resources/lines.swf" width="600" height="600"></embed>
</ins><span class="cx"> <img src="../resources/apple.gif" width="300" height="300" style="-webkit-transform:translate(-500px,-200px)">
</span></span></pre>
</div>
</div>
</body>
</html>