diff options
| author | Steve Block <steveblock@google.com> | 2011-05-13 06:44:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-13 06:44:40 -0700 |
| commit | 08014c20784f3db5df3a89b73cce46037b77eb59 (patch) | |
| tree | 47749210d31e19e6e2f64036fa8fae2ad693476f /Source/WebCore/manual-tests/compositing/show-composited-iframe-on-back-button.html | |
| parent | 860220379e56aeb66424861ad602b07ee22b4055 (diff) | |
| parent | 4c3661f7918f8b3f139f824efb7855bedccb4c94 (diff) | |
| download | external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.zip external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.gz external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.bz2 | |
Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3
* changes:
Merge WebKit at r75315: Update WebKit version
Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
Merge WebKit at r75315: Stub out AXObjectCache::remove()
Merge WebKit at r75315: Fix ImageBuffer
Merge WebKit at r75315: Fix PluginData::initPlugins()
Merge WebKit at r75315: Fix conflicts
Merge WebKit at r75315: Fix Makefiles
Merge WebKit at r75315: Move Android-specific WebCore files to Source
Merge WebKit at r75315: Initial merge by git.
Diffstat (limited to 'Source/WebCore/manual-tests/compositing/show-composited-iframe-on-back-button.html')
| -rw-r--r-- | Source/WebCore/manual-tests/compositing/show-composited-iframe-on-back-button.html | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/Source/WebCore/manual-tests/compositing/show-composited-iframe-on-back-button.html b/Source/WebCore/manual-tests/compositing/show-composited-iframe-on-back-button.html new file mode 100644 index 0000000..fff8888 --- /dev/null +++ b/Source/WebCore/manual-tests/compositing/show-composited-iframe-on-back-button.html @@ -0,0 +1,76 @@ +<!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> |