diff options
author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /LayoutTests/fast/dom/DeviceMotion | |
parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'LayoutTests/fast/dom/DeviceMotion')
5 files changed, 69 insertions, 0 deletions
diff --git a/LayoutTests/fast/dom/DeviceMotion/no-page-cache-expected.txt b/LayoutTests/fast/dom/DeviceMotion/no-page-cache-expected.txt new file mode 100644 index 0000000..1dee7cd --- /dev/null +++ b/LayoutTests/fast/dom/DeviceMotion/no-page-cache-expected.txt @@ -0,0 +1,14 @@ +Tests that pages that use DeviceMotion are not put in the page cache. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +Main page opening resources/cached-page-1.html +resources/cached-page-1.html onload fired, count = 1 +resources/cached-page-1.html about to navigate to resources/cached-page-2.html +resources/cached-page-2.html about to go back to resources/cached-page-1.html +resources/cached-page-1.html onload fired, count = 2 +PASS successfullyParsed is true + +TEST COMPLETE + diff --git a/LayoutTests/fast/dom/DeviceMotion/no-page-cache.html b/LayoutTests/fast/dom/DeviceMotion/no-page-cache.html new file mode 100644 index 0000000..2e09eac --- /dev/null +++ b/LayoutTests/fast/dom/DeviceMotion/no-page-cache.html @@ -0,0 +1,12 @@ +<html> +<head> +<link rel="stylesheet" href="../../js/resources/js-test-style.css"> +<script src="../../js/resources/js-test-pre.js"></script> +</head> +<body> +<p id="description"></p> +<div id="console"></div> +<script src="script-tests/no-page-cache.js"></script> +<script src="../../js/resources/js-test-post.js"></script> +</body> +</html> diff --git a/LayoutTests/fast/dom/DeviceMotion/resources/cached-page-1.html b/LayoutTests/fast/dom/DeviceMotion/resources/cached-page-1.html new file mode 100644 index 0000000..759fbf9 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceMotion/resources/cached-page-1.html @@ -0,0 +1,11 @@ +<script> +function loadNext() { + window.addEventListener('devicemotion', function() {}); + if (window.opener.reportPageOneOnload() == 1) { + window.opener.debug('resources/cached-page-1.html about to navigate to resources/cached-page-2.html') + // Location changes need to happen outside the onload handler to generate history entries. + setTimeout(function() { location.href = 'cached-page-2.html'; }, 0); + } +} +</script> +<body onload="loadNext()"></body> diff --git a/LayoutTests/fast/dom/DeviceMotion/resources/cached-page-2.html b/LayoutTests/fast/dom/DeviceMotion/resources/cached-page-2.html new file mode 100644 index 0000000..5478f9c --- /dev/null +++ b/LayoutTests/fast/dom/DeviceMotion/resources/cached-page-2.html @@ -0,0 +1,8 @@ +<script> +function init() { + window.opener.pageTwoLoaded = true; + window.opener.debug('resources/cached-page-2.html about to go back to resources/cached-page-1.html'); + history.back(); +} +</script> +<body onload="init()"></body> diff --git a/LayoutTests/fast/dom/DeviceMotion/script-tests/no-page-cache.js b/LayoutTests/fast/dom/DeviceMotion/script-tests/no-page-cache.js new file mode 100644 index 0000000..67cfcf6 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceMotion/script-tests/no-page-cache.js @@ -0,0 +1,24 @@ +description('Tests that pages that use DeviceMotion are not put in the page cache.'); + +if (window.layoutTestController) { + layoutTestController.waitUntilDone(); + layoutTestController.setCanOpenWindows(); + layoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey', 1); +} else + debug('This test can not be run without the LayoutTestController'); + +var pageOneOnloadCount = 0; +function reportPageOneOnload() { + ++pageOneOnloadCount; + debug('resources/cached-page-1.html onload fired, count = ' + pageOneOnloadCount); + if (pageOneOnloadCount == 2) { + finishJSTest(); + } + return pageOneOnloadCount; +} + +debug("Main page opening resources/cached-page-1.html"); +window.open("resources/cached-page-1.html"); + +window.jsTestIsAsync = true; +window.successfullyParsed = true; |