From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:02:20 +0100 Subject: Merge WebKit at r70209: Initial merge by Git Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e --- .../dom/DeviceMotion/no-page-cache-expected.txt | 14 +++ .../fast/dom/DeviceMotion/no-page-cache.html | 12 +++ .../dom/DeviceMotion/resources/cached-page-1.html | 11 ++ .../dom/DeviceMotion/resources/cached-page-2.html | 8 ++ .../dom/DeviceMotion/script-tests/no-page-cache.js | 24 +++++ .../create-event-onorientationchange-expected.txt | 16 +++ .../create-event-onorientationchange.html | 13 +++ .../event-after-navigation-expected.txt | 3 + .../DeviceOrientation/event-after-navigation.html | 12 +++ .../DeviceOrientation/no-page-cache-expected.txt | 14 +++ .../fast/dom/DeviceOrientation/no-page-cache.html | 12 +++ .../DeviceOrientation/resources/cached-page-1.html | 11 ++ .../DeviceOrientation/resources/cached-page-2.html | 8 ++ .../resources/event-after-navigation-new.html | 15 +++ .../create-event-onorientationchange.js | 18 ++++ .../script-tests/event-after-navigation.js | 12 +++ .../script-tests/no-page-cache.js | 24 +++++ .../set-href-attribute-prevents-rebase.js | 118 +++++++++++++++++++++ ...set-href-attribute-prevents-rebase-expected.txt | 46 ++++++++ .../set-href-attribute-prevents-rebase.html | 13 +++ 20 files changed, 404 insertions(+) create mode 100644 LayoutTests/fast/dom/DeviceMotion/no-page-cache-expected.txt create mode 100644 LayoutTests/fast/dom/DeviceMotion/no-page-cache.html create mode 100644 LayoutTests/fast/dom/DeviceMotion/resources/cached-page-1.html create mode 100644 LayoutTests/fast/dom/DeviceMotion/resources/cached-page-2.html create mode 100644 LayoutTests/fast/dom/DeviceMotion/script-tests/no-page-cache.js create mode 100644 LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt create mode 100644 LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange.html create mode 100644 LayoutTests/fast/dom/DeviceOrientation/event-after-navigation-expected.txt create mode 100644 LayoutTests/fast/dom/DeviceOrientation/event-after-navigation.html create mode 100644 LayoutTests/fast/dom/DeviceOrientation/no-page-cache-expected.txt create mode 100644 LayoutTests/fast/dom/DeviceOrientation/no-page-cache.html create mode 100644 LayoutTests/fast/dom/DeviceOrientation/resources/cached-page-1.html create mode 100644 LayoutTests/fast/dom/DeviceOrientation/resources/cached-page-2.html create mode 100644 LayoutTests/fast/dom/DeviceOrientation/resources/event-after-navigation-new.html create mode 100644 LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js create mode 100644 LayoutTests/fast/dom/DeviceOrientation/script-tests/event-after-navigation.js create mode 100644 LayoutTests/fast/dom/DeviceOrientation/script-tests/no-page-cache.js create mode 100644 LayoutTests/fast/dom/HTMLAnchorElement/script-tests/set-href-attribute-prevents-rebase.js create mode 100644 LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-prevents-rebase-expected.txt create mode 100644 LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-prevents-rebase.html (limited to 'LayoutTests/fast/dom') 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 @@ + + + + + + +

+
+ + + + 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 @@ + + 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 @@ + + 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; diff --git a/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt b/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt new file mode 100644 index 0000000..0f0aac6 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt @@ -0,0 +1,16 @@ +Tests that document.createEvent() works with orientationChange + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + + +FAIL... orientationChange event doesn't appear to be enabled or implemented. + + +PASS successfullyParsed is true + +TEST COMPLETE + + + + diff --git a/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange.html b/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange.html new file mode 100644 index 0000000..7a033e0 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange.html @@ -0,0 +1,13 @@ + + + + + + +

+

+
+ + + + diff --git a/LayoutTests/fast/dom/DeviceOrientation/event-after-navigation-expected.txt b/LayoutTests/fast/dom/DeviceOrientation/event-after-navigation-expected.txt new file mode 100644 index 0000000..8e6bc39 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/event-after-navigation-expected.txt @@ -0,0 +1,3 @@ +Tests for a crash where an event is fired after the page has been navigated away when the original page is in the page cache. + +SUCCESS diff --git a/LayoutTests/fast/dom/DeviceOrientation/event-after-navigation.html b/LayoutTests/fast/dom/DeviceOrientation/event-after-navigation.html new file mode 100644 index 0000000..ced3703 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/event-after-navigation.html @@ -0,0 +1,12 @@ + + + + + + +

+
+ + + + diff --git a/LayoutTests/fast/dom/DeviceOrientation/no-page-cache-expected.txt b/LayoutTests/fast/dom/DeviceOrientation/no-page-cache-expected.txt new file mode 100644 index 0000000..0217208 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/no-page-cache-expected.txt @@ -0,0 +1,14 @@ +Tests that pages that use DeviceOrientation 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/DeviceOrientation/no-page-cache.html b/LayoutTests/fast/dom/DeviceOrientation/no-page-cache.html new file mode 100644 index 0000000..2e09eac --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/no-page-cache.html @@ -0,0 +1,12 @@ + + + + + + +

+
+ + + + diff --git a/LayoutTests/fast/dom/DeviceOrientation/resources/cached-page-1.html b/LayoutTests/fast/dom/DeviceOrientation/resources/cached-page-1.html new file mode 100644 index 0000000..2d76889 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/resources/cached-page-1.html @@ -0,0 +1,11 @@ + + diff --git a/LayoutTests/fast/dom/DeviceOrientation/resources/cached-page-2.html b/LayoutTests/fast/dom/DeviceOrientation/resources/cached-page-2.html new file mode 100644 index 0000000..5478f9c --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/resources/cached-page-2.html @@ -0,0 +1,8 @@ + + diff --git a/LayoutTests/fast/dom/DeviceOrientation/resources/event-after-navigation-new.html b/LayoutTests/fast/dom/DeviceOrientation/resources/event-after-navigation-new.html new file mode 100644 index 0000000..157e050 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/resources/event-after-navigation-new.html @@ -0,0 +1,15 @@ + + + + + Tests for a crash where an event is fired after the page has been navigated + away when the original page is in the page cache.

+ SUCCESS + + + diff --git a/LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js b/LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js new file mode 100644 index 0000000..a63685b --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js @@ -0,0 +1,18 @@ +description('Tests that document.createEvent() works with orientationChange') + +function handleOrientationChange() +{ + document.getElementById('result').innerHTML = "PASS"; +} + +window.addEventListener('onorientationchange', handleOrientationChange, false); + +try { + var event = document.createEvent("OrientationEvent"); + event.initEvent("orientationchange", false, false); + window.dispatchEvent(event); +} catch(e) { + document.getElementById('result').innerHTML = "FAIL... orientationChange event doesn't appear to be enabled or implemented."; +} + +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/DeviceOrientation/script-tests/event-after-navigation.js b/LayoutTests/fast/dom/DeviceOrientation/script-tests/event-after-navigation.js new file mode 100644 index 0000000..2756e55 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/script-tests/event-after-navigation.js @@ -0,0 +1,12 @@ +description('Tests for a crash where an event is fired after the page has been navigated away when the original page is in the page cache.'); + +if (window.layoutTestController) + layoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey', 1); +else + debug('This test can not be run without the LayoutTestController'); + +window.addEventListener('deviceorientation', function() { } ); +window.location = "resources/event-after-navigation-new.html"; + +window.jsTestIsAsync = true; +window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/DeviceOrientation/script-tests/no-page-cache.js b/LayoutTests/fast/dom/DeviceOrientation/script-tests/no-page-cache.js new file mode 100644 index 0000000..cbfb501 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/script-tests/no-page-cache.js @@ -0,0 +1,24 @@ +description('Tests that pages that use DeviceOrientation 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; diff --git a/LayoutTests/fast/dom/HTMLAnchorElement/script-tests/set-href-attribute-prevents-rebase.js b/LayoutTests/fast/dom/HTMLAnchorElement/script-tests/set-href-attribute-prevents-rebase.js new file mode 100644 index 0000000..139a9e5 --- /dev/null +++ b/LayoutTests/fast/dom/HTMLAnchorElement/script-tests/set-href-attribute-prevents-rebase.js @@ -0,0 +1,118 @@ +description('Tests that when an href attribute is set, the href is no longer subject to updates to the document base URI.'); + +var a = document.createElement('a'); +var base = document.createElement('base'); +document.head.appendChild(base); + + +debug("Search attribute, update document base URI without attribute having been set"); +base.href = "http://old_base/"; +a.href = "?search"; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://new_base/?search'"); + +debug("Search attribute, update document base URI after attribute has been set"); +base.href = "http://old_base/"; +a.href = "?foo"; +a.search = "search"; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://old_base/?search'"); +debug(''); + + +debug("Pathname attribute, update document base URI without attribute having been set"); +base.href = "http://old_base/"; +a.href = "path"; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://new_base/path'"); + +debug("Pathname attribute, update document base URI after attribute has been set"); +base.href = "http://old_base/"; +a.href = "foo"; +a.pathname = "path"; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://old_base/path'"); +debug(''); + + +debug("Hash attribute, update document base URI without attribute having been set"); +base.href = "http://old_base/"; +a.href = "#hash"; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://new_base/#hash'"); + +debug("Pathname attribute, update document base URI after attribute has been set"); +base.href = "http://old_base/"; +a.href = "#foo"; +a.hash = "hash"; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://old_base/#hash'"); +debug(''); + + +debug('Note that for the following attributes, updating the document base URI has no effect because we have to use an abosulte URL for the href in order to set an initial value for the attribute we wish to update. They are included for completeness.'); +debug(''); + + +debug("Host attribute, update document base URI without attribute having been set"); +base.href = "http://old_base/"; +a.href = "http://host:0"; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://host:0/'"); + +debug("Host attribute, update document base URI after attribute has been set"); +base.href = "http://old_base/"; +a.href = "http://foo:80"; +a.host = "host:0"; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://host:0/'"); +debug(''); + + +debug("Hostname attribute, update document base URI without attribute having been set"); +base.href = "http://old_base/"; +a.href = "http://host"; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://host/'"); + +debug("Hostname attribute, update document base URI after attribute has been set"); +base.href = "http://old_base/"; +a.href = "http://foo"; +a.hostname = "host"; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://host/'"); +debug(''); + + +debug("Protocol attribute, update document base URI without attribute having been set"); +base.href = "http://old_base/"; +a.href = "protocol:"; +base.href = "http://new_base/"; +shouldBe("a.href", "'protocol:'"); + +debug("Protocol attribute, update document base URI after attribute has been set"); +base.href = "http://old_base/"; +a.href = "foo:"; +a.protocol = "protocol:"; +base.href = "http://new_base/"; +shouldBe("a.href", "'protocol:'"); +debug(''); + + +debug("Port attribute, update document base URI without attribute having been set"); +base.href = "http://old_base/"; +a.href = "http://host:0"; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://host:0/'"); + +debug("Port attribute, update document base URI after attribute has been set"); +base.href = "http://old_base/"; +a.href = "http://host:80"; +a.port = 0; +base.href = "http://new_base/"; +shouldBe("a.href", "'http://host:0/'"); +debug(''); + + +base.href = ''; +var successfullyParsed = true; diff --git a/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-prevents-rebase-expected.txt b/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-prevents-rebase-expected.txt new file mode 100644 index 0000000..c7de5cb --- /dev/null +++ b/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-prevents-rebase-expected.txt @@ -0,0 +1,46 @@ +Tests that when an href attribute is set, the href is no longer subject to updates to the document base URI. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +Search attribute, update document base URI without attribute having been set +PASS a.href is 'http://new_base/?search' +Search attribute, update document base URI after attribute has been set +PASS a.href is 'http://old_base/?search' + +Pathname attribute, update document base URI without attribute having been set +PASS a.href is 'http://new_base/path' +Pathname attribute, update document base URI after attribute has been set +PASS a.href is 'http://old_base/path' + +Hash attribute, update document base URI without attribute having been set +PASS a.href is 'http://new_base/#hash' +Pathname attribute, update document base URI after attribute has been set +PASS a.href is 'http://old_base/#hash' + +Note that for the following attributes, updating the document base URI has no effect because we have to use an abosulte URL for the href in order to set an initial value for the attribute we wish to update. They are included for completeness. + +Host attribute, update document base URI without attribute having been set +PASS a.href is 'http://host:0/' +Host attribute, update document base URI after attribute has been set +PASS a.href is 'http://host:0/' + +Hostname attribute, update document base URI without attribute having been set +PASS a.href is 'http://host/' +Hostname attribute, update document base URI after attribute has been set +PASS a.href is 'http://host/' + +Protocol attribute, update document base URI without attribute having been set +PASS a.href is 'protocol:' +Protocol attribute, update document base URI after attribute has been set +PASS a.href is 'protocol:' + +Port attribute, update document base URI without attribute having been set +PASS a.href is 'http://host:0/' +Port attribute, update document base URI after attribute has been set +PASS a.href is 'http://host:0/' + +PASS successfullyParsed is true + +TEST COMPLETE + diff --git a/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-prevents-rebase.html b/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-prevents-rebase.html new file mode 100644 index 0000000..bfc1c29 --- /dev/null +++ b/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-prevents-rebase.html @@ -0,0 +1,13 @@ + + + + + + + +

+
+ + + + -- cgit v1.1