Title: [139898] branches/chromium/1364
- Revision
- 139898
- Author
- [email protected]
- Date
- 2013-01-16 11:07:23 -0800 (Wed, 16 Jan 2013)
Log Message
Merge 138808
> Existence of window.Touch can break websites mobile device detection
> https://bugs.webkit.org/show_bug.cgi?id=106071
>
> Source/WebCore:
>
> Patch by Rick Byers <[email protected]> on 2013-01-04
> Reviewed by Ojan Vafai.
>
> Revert http://trac.webkit.org/changeset/135562 for now while I work
> on a slightly safer version.
>
> * page/DOMWindow.idl:
>
> LayoutTests:
>
> Revert http://trac.webkit.org/changeset/135562 for now while I work
> on a slightly safer version.
>
> Patch by Rick Byers <[email protected]> on 2013-01-04
> Reviewed by Ojan Vafai.
>
> * fast/events/touch/document-create-touch-list-expected.txt:
> * fast/events/touch/script-tests/document-create-touch-list.js:
> * platform/efl/fast/js/global-constructors-expected.txt:
> * platform/qt-5.0/fast/js/global-constructors-expected.txt:
> * platform/qt/fast/js/global-constructors-expected.txt:
[email protected]
Review URL: https://codereview.chromium.org/11970016
Modified Paths
Diff
Modified: branches/chromium/1364/LayoutTests/fast/events/touch/document-create-touch-list-expected.txt (139897 => 139898)
--- branches/chromium/1364/LayoutTests/fast/events/touch/document-create-touch-list-expected.txt 2013-01-16 19:04:23 UTC (rev 139897)
+++ branches/chromium/1364/LayoutTests/fast/events/touch/document-create-touch-list-expected.txt 2013-01-16 19:07:23 UTC (rev 139898)
@@ -9,10 +9,7 @@
PASS touchList.item(0) is null
PASS touchList.item(1) is null
PASS touchList.item() threw exception TypeError: Not enough arguments.
-PASS ts instanceof TouchEvent is true
-PASS ts.touches instanceof TouchList is true
PASS ts.touches.length is 2
-PASS ts.touches[0] instanceof Touch is true
PASS ts.touches[0].identifier is 12341
PASS ts.touches[0].clientX is 60
PASS ts.touches[1].screenY is 120
Modified: branches/chromium/1364/LayoutTests/fast/events/touch/script-tests/document-create-touch-list.js (139897 => 139898)
--- branches/chromium/1364/LayoutTests/fast/events/touch/script-tests/document-create-touch-list.js 2013-01-16 19:04:23 UTC (rev 139897)
+++ branches/chromium/1364/LayoutTests/fast/events/touch/script-tests/document-create-touch-list.js 2013-01-16 19:07:23 UTC (rev 139898)
@@ -21,10 +21,7 @@
document.body.addEventListener("touchstart", function handleTouchStart(ev) {
ts = ev;
- shouldBeTrue("ts instanceof TouchEvent");
- shouldBeTrue("ts.touches instanceof TouchList");
shouldBe("ts.touches.length", "2");
- shouldBeTrue("ts.touches[0] instanceof Touch");
shouldBe("ts.touches[0].identifier", "12341");
shouldBe("ts.touches[0].clientX", "60");
shouldBe("ts.touches[1].screenY", "120");
Modified: branches/chromium/1364/LayoutTests/platform/efl/fast/js/global-constructors-expected.txt (139897 => 139898)
--- branches/chromium/1364/LayoutTests/platform/efl/fast/js/global-constructors-expected.txt 2013-01-16 19:04:23 UTC (rev 139897)
+++ branches/chromium/1364/LayoutTests/platform/efl/fast/js/global-constructors-expected.txt 2013-01-16 19:07:23 UTC (rev 139898)
@@ -318,9 +318,7 @@
PASS TextTrackCueList.toString() is '[object TextTrackCueListConstructor]'
PASS TextTrackList.toString() is '[object TextTrackListConstructor]'
PASS TimeRanges.toString() is '[object TimeRangesConstructor]'
-PASS Touch.toString() is '[object TouchConstructor]'
PASS TouchEvent.toString() is '[object TouchEventConstructor]'
-PASS TouchList.toString() is '[object TouchListConstructor]'
PASS TrackEvent.toString() is '[object TrackEventConstructor]'
PASS UIEvent.toString() is '[object UIEventConstructor]'
PASS URL.toString() is '[object URLConstructor]'
Modified: branches/chromium/1364/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt (139897 => 139898)
--- branches/chromium/1364/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt 2013-01-16 19:04:23 UTC (rev 139897)
+++ branches/chromium/1364/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt 2013-01-16 19:07:23 UTC (rev 139898)
@@ -295,9 +295,7 @@
PASS TextEvent.toString() is '[object TextEventConstructor]'
PASS TextMetrics.toString() is '[object TextMetricsConstructor]'
PASS TimeRanges.toString() is '[object TimeRangesConstructor]'
-PASS Touch.toString() is '[object TouchConstructor]'
PASS TouchEvent.toString() is '[object TouchEventConstructor]'
-PASS TouchList.toString() is '[object TouchListConstructor]'
PASS UIEvent.toString() is '[object UIEventConstructor]'
PASS WebGLContextEvent.toString() is '[object WebGLContextEventConstructor]'
PASS WebKitAnimationEvent.toString() is '[object WebKitAnimationEventConstructor]'
Modified: branches/chromium/1364/LayoutTests/platform/qt-5.0/fast/js/global-constructors-expected.txt (139897 => 139898)
--- branches/chromium/1364/LayoutTests/platform/qt-5.0/fast/js/global-constructors-expected.txt 2013-01-16 19:04:23 UTC (rev 139897)
+++ branches/chromium/1364/LayoutTests/platform/qt-5.0/fast/js/global-constructors-expected.txt 2013-01-16 19:07:23 UTC (rev 139898)
@@ -311,9 +311,7 @@
PASS TextEvent.toString() is '[object TextEventConstructor]'
PASS TextMetrics.toString() is '[object TextMetricsConstructor]'
PASS TimeRanges.toString() is '[object TimeRangesConstructor]'
-PASS Touch.toString() is '[object TouchConstructor]'
PASS TouchEvent.toString() is '[object TouchEventConstructor]'
-PASS TouchList.toString() is '[object TouchListConstructor]'
PASS UIEvent.toString() is '[object UIEventConstructor]'
PASS URL.toString() is '[object URLConstructor]'
PASS WebGLContextEvent.toString() is '[object WebGLContextEventConstructor]'
Modified: branches/chromium/1364/Source/WebCore/page/DOMWindow.idl (139897 => 139898)
--- branches/chromium/1364/Source/WebCore/page/DOMWindow.idl 2013-01-16 19:04:23 UTC (rev 139897)
+++ branches/chromium/1364/Source/WebCore/page/DOMWindow.idl 2013-01-16 19:07:23 UTC (rev 139898)
@@ -564,9 +564,7 @@
attribute XMLHttpRequestProgressEventConstructor XMLHttpRequestProgressEvent;
[Conditional=DEVICE_ORIENTATION, V8EnabledAtRuntime] attribute DeviceMotionEventConstructor DeviceMotionEvent;
[Conditional=DEVICE_ORIENTATION, V8EnabledAtRuntime] attribute DeviceOrientationEventConstructor DeviceOrientationEvent;
- [Conditional=TOUCH_EVENTS] attribute TouchConstructor Touch;
[Conditional=TOUCH_EVENTS] attribute TouchEventConstructor TouchEvent;
- [Conditional=TOUCH_EVENTS] attribute TouchListConstructor TouchList;
attribute StorageEventConstructor StorageEvent;
[Conditional=INPUT_SPEECH] attribute SpeechInputEventConstructor SpeechInputEvent;
[Conditional=WEBGL] attribute WebGLContextEventConstructor WebGLContextEvent;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
