From 4576aa36e9a9671459299c7963ac95aa94beaea9 Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Tue, 7 Dec 2010 17:22:45 -0800 Subject: Merge WebKit at r73109: Initial merge by git. Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8 --- .../create-event-onorientationchange-expected.txt | 16 ---------------- .../create-event-onorientationchange.html | 13 ------------- .../script-tests/create-event-onorientationchange.js | 18 ------------------ .../script-tests/event-after-navigation.js | 6 ++++-- .../fast/encoding/xml-utf-8-default-expected.txt | 2 ++ LayoutTests/fast/encoding/xml-utf-8-default.xml | 1 + LayoutTests/fast/js/resources/standalone-pre.js | 2 ++ 7 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt delete mode 100644 LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange.html delete mode 100644 LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js (limited to 'LayoutTests/fast') diff --git a/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt b/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt deleted file mode 100644 index 0f0aac6..0000000 --- a/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index 7a033e0..0000000 --- a/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - -

-

-
- - - - diff --git a/LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js b/LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js deleted file mode 100644 index a63685b..0000000 --- a/LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js +++ /dev/null @@ -1,18 +0,0 @@ -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 index 2756e55..77e4ec7 100644 --- a/LayoutTests/fast/dom/DeviceOrientation/script-tests/event-after-navigation.js +++ b/LayoutTests/fast/dom/DeviceOrientation/script-tests/event-after-navigation.js @@ -5,8 +5,10 @@ if (window.layoutTestController) else debug('This test can not be run without the LayoutTestController'); -window.addEventListener('deviceorientation', function() { } ); -window.location = "resources/event-after-navigation-new.html"; +document.body.onload = function() { + window.addEventListener('deviceorientation', function() { } ); + window.location = "resources/event-after-navigation-new.html"; +} window.jsTestIsAsync = true; window.successfullyParsed = true; diff --git a/LayoutTests/fast/encoding/xml-utf-8-default-expected.txt b/LayoutTests/fast/encoding/xml-utf-8-default-expected.txt index 04a1c26..f70fd7f 100644 --- a/LayoutTests/fast/encoding/xml-utf-8-default-expected.txt +++ b/LayoutTests/fast/encoding/xml-utf-8-default-expected.txt @@ -1,3 +1,5 @@ When dumped into a text file by the test controller, this needs to be viewed as UTF-8: This is an em dash, —, this is is a delta symbol, ∆, this is an uppercase pi, ∏, and this is a lowercase pi, π. + +Characters from unicode plane 1, like mathematical bold script capital a, 𝓐, and mathematical bold fraktur small u, 𝖚, work too. diff --git a/LayoutTests/fast/encoding/xml-utf-8-default.xml b/LayoutTests/fast/encoding/xml-utf-8-default.xml index 1f07505..705bbaf 100644 --- a/LayoutTests/fast/encoding/xml-utf-8-default.xml +++ b/LayoutTests/fast/encoding/xml-utf-8-default.xml @@ -4,6 +4,7 @@

When dumped into a text file by the test controller, this needs to be viewed as UTF-8:

This is an em dash, —, this is is a delta symbol, ∆, this is an uppercase pi, ∏, and this is a lowercase pi, π.

+

Characters from unicode plane 1, like mathematical bold script capital a, 𝓐, and mathematical bold fraktur small u, 𝖚, work too.

diff --git a/LayoutTests/fast/js/resources/standalone-pre.js b/LayoutTests/fast/js/resources/standalone-pre.js index 692f1c1..b80c3cb 100644 --- a/LayoutTests/fast/js/resources/standalone-pre.js +++ b/LayoutTests/fast/js/resources/standalone-pre.js @@ -27,6 +27,8 @@ function testFailed(msg) function areArraysEqual(_a, _b) { + if (Object.prototype.toString.call(_a) != Object.prototype.toString.call([])) + return false; if (_a.length !== _b.length) return false; for (var i = 0; i < _a.length; i++) -- cgit v1.1