From 0617145a89917ae7735fe1c9538688ab9a577df5 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Fri, 30 Jul 2010 10:46:49 +0100 Subject: Merge WebKit at r64264 : Initial merge by git. Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1 --- .../fast/dom/DeviceOrientation/script-tests/window-property.js | 5 +++-- LayoutTests/fast/dom/DeviceOrientation/window-property-expected.txt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'LayoutTests/fast') diff --git a/LayoutTests/fast/dom/DeviceOrientation/script-tests/window-property.js b/LayoutTests/fast/dom/DeviceOrientation/script-tests/window-property.js index e7458b4..8e65059 100644 --- a/LayoutTests/fast/dom/DeviceOrientation/script-tests/window-property.js +++ b/LayoutTests/fast/dom/DeviceOrientation/script-tests/window-property.js @@ -9,7 +9,8 @@ function hasDeviceOrientationEventProperty() return false; } -shouldBeTrue("typeof window.DeviceOrientationEvent == 'function'"); +shouldBeTrue("typeof window.DeviceOrientationEvent == 'object'"); +shouldBeFalse("typeof window.DeviceOrientationEvent == 'function'"); shouldBeTrue("hasDeviceOrientationEventProperty()"); shouldBeTrue("'DeviceOrientationEvent' in window"); shouldBeTrue("window.hasOwnProperty('DeviceOrientationEvent')"); @@ -26,6 +27,6 @@ function hasOnDeviceOrientationProperty() shouldBeTrue("typeof window.ondeviceorientation == 'object'"); shouldBeTrue("hasOnDeviceOrientationProperty()"); shouldBeTrue("'ondeviceorientation' in window"); -shouldBeFalse("window.hasOwnProperty('ondeviceorientation')"); +shouldBeTrue("window.hasOwnProperty('ondeviceorientation')"); window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/DeviceOrientation/window-property-expected.txt b/LayoutTests/fast/dom/DeviceOrientation/window-property-expected.txt index 95075a0..308ab7a 100644 --- a/LayoutTests/fast/dom/DeviceOrientation/window-property-expected.txt +++ b/LayoutTests/fast/dom/DeviceOrientation/window-property-expected.txt @@ -3,14 +3,15 @@ Tests that the window.DeviceOrientationEvent and window.ondeviceorientation prop On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS typeof window.DeviceOrientationEvent == 'function' is true +PASS typeof window.DeviceOrientationEvent == 'object' is true +PASS typeof window.DeviceOrientationEvent == 'function' is false PASS hasDeviceOrientationEventProperty() is true PASS 'DeviceOrientationEvent' in window is true PASS window.hasOwnProperty('DeviceOrientationEvent') is true PASS typeof window.ondeviceorientation == 'object' is true PASS hasOnDeviceOrientationProperty() is true PASS 'ondeviceorientation' in window is true -PASS window.hasOwnProperty('ondeviceorientation') is false +PASS window.hasOwnProperty('ondeviceorientation') is true PASS successfullyParsed is true TEST COMPLETE -- cgit v1.1