[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
steveblock at google.com
steveblock at google.com
Wed Dec 22 12:04:28 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 61cb516bf0106607fcf3dbdb2659c35d18d58948
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 13 16:22:20 2010 +0000
2010-08-13 Steve Block <steveblock at google.com>
Reviewed by Alexey Proskuryakov.
Need a LayoutTest to check that pages using Geolocation are not put in the page cache
https://bugs.webkit.org/show_bug.cgi?id=43957
* fast/dom/Geolocation/no-page-cache-expected.txt: Added.
* fast/dom/Geolocation/no-page-cache.html: Added.
* fast/dom/Geolocation/resources/cached-page-1.html: Added.
* fast/dom/Geolocation/resources/cached-page-2.html: Added.
* fast/dom/Geolocation/script-tests/no-page-cache.js: Added.
(reportPageOneOnload):
* platform/gtk/Skipped: Added new test to GTK skipped list
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65325 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3353c53..7b79938 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-13 Steve Block <steveblock at google.com>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Need a LayoutTest to check that pages using Geolocation are not put in the page cache
+ https://bugs.webkit.org/show_bug.cgi?id=43957
+
+ * fast/dom/Geolocation/no-page-cache-expected.txt: Added.
+ * fast/dom/Geolocation/no-page-cache.html: Added.
+ * fast/dom/Geolocation/resources/cached-page-1.html: Added.
+ * fast/dom/Geolocation/resources/cached-page-2.html: Added.
+ * fast/dom/Geolocation/script-tests/no-page-cache.js: Added.
+ (reportPageOneOnload):
+ * platform/gtk/Skipped: Added new test to GTK skipped list
+
2010-08-13 Nate Chapin <japhet at chromium.org>
Unreviewed, Chromium test_expectations.txt updates + a rebaseline
diff --git a/LayoutTests/fast/dom/Geolocation/no-page-cache-expected.txt b/LayoutTests/fast/dom/Geolocation/no-page-cache-expected.txt
new file mode 100644
index 0000000..66cbe1b
--- /dev/null
+++ b/LayoutTests/fast/dom/Geolocation/no-page-cache-expected.txt
@@ -0,0 +1,16 @@
+Tests that pages that use Geolocation are not put in the page cache.
+
+Currently, Geolocation does not work with the page cache so pages that use Geolocation are explicitly prevented from entering the cache. This test checks for accidental enabling of the page Cache for Geolocation. See https://bugs.webkit.org/show_bug.cgi?id=43956 for details.
+
+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 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 fired, count = 2
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/dom/Geolocation/no-page-cache.html b/LayoutTests/fast/dom/Geolocation/no-page-cache.html
new file mode 100644
index 0000000..36975b4
--- /dev/null
+++ b/LayoutTests/fast/dom/Geolocation/no-page-cache.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<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/Geolocation/resources/cached-page-1.html b/LayoutTests/fast/dom/Geolocation/resources/cached-page-1.html
new file mode 100644
index 0000000..305baae
--- /dev/null
+++ b/LayoutTests/fast/dom/Geolocation/resources/cached-page-1.html
@@ -0,0 +1,10 @@
+<script>
+function loadNext() {
+ var geolocation = navigator.geolocation;
+ if (window.opener.reportPageOneOnload() == 1) {
+ window.opener.debug('resources/cached-page-1.html about to navigate to resources/cached-page-2.html')
+ location.href = 'cached-page-2.html';
+ }
+}
+</script>
+<body onload="loadNext()"></body>
diff --git a/LayoutTests/fast/dom/Geolocation/resources/cached-page-2.html b/LayoutTests/fast/dom/Geolocation/resources/cached-page-2.html
new file mode 100644
index 0000000..5478f9c
--- /dev/null
+++ b/LayoutTests/fast/dom/Geolocation/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/Geolocation/script-tests/no-page-cache.js b/LayoutTests/fast/dom/Geolocation/script-tests/no-page-cache.js
new file mode 100644
index 0000000..76afbce
--- /dev/null
+++ b/LayoutTests/fast/dom/Geolocation/script-tests/no-page-cache.js
@@ -0,0 +1,24 @@
+description("Tests that pages that use Geolocation are not put in the page cache.<br><br>Currently, Geolocation does not work with the page cache so pages that use Geolocation are explicitly prevented from entering the cache. This test checks for accidental enabling of the page Cache for Geolocation. See https://bugs.webkit.org/show_bug.cgi?id=43956 for details.");
+
+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 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;
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 0e7251f..4f5e687 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -1094,6 +1094,7 @@ fast/dom/Geolocation/delayed-permission-allowed.html
fast/dom/Geolocation/delayed-permission-denied.html
fast/dom/Geolocation/error.html
fast/dom/Geolocation/multiple-requests.html
+fast/dom/Geolocation/no-page-cache.html
fast/dom/Geolocation/permission-denied-already-clear-watch.html
fast/dom/Geolocation/position-string.html
fast/dom/Geolocation/reentrant-error.html
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list