From 2dfdfe554ed98c339682d9ccd2795a2db564932b Mon Sep 17 00:00:00 2001 From: Alan Knight Date: Tue, 12 Jan 2016 13:52:38 -0800 Subject: [PATCH] Mark supportsPointConversions deprecated and always true rather than testing DOMPoint BUG= Review URL: https://codereview.chromium.org/1580203002 . --- sdk/lib/html/dart2js/html_dart2js.dart | 8 +++----- sdk/lib/html/dartium/html_dartium.dart | 8 +++----- tests/html/css_test.dart | 18 +++++++----------- tests/html/html.status | 7 ------- .../html/impl/impl_Window.darttemplate | 8 +++----- 5 files changed, 16 insertions(+), 33 deletions(-) diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart index 2e82f344cc8..b1507583290 100644 --- a/sdk/lib/html/dart2js/html_dart2js.dart +++ b/sdk/lib/html/dart2js/html_dart2js.dart @@ -32119,11 +32119,9 @@ class Window extends EventTarget implements WindowEventHandlers, WindowBase, Glo return _requestFileSystem(persistent? 1 : 0, size); } - /** - * convertPointFromNodeToPage and convertPointFromPageToNode are removed. - * see http://dev.w3.org/csswg/cssom-view/#geometry - */ - static bool get supportsPointConversions => DomPoint.supported; + /// Obsolete API for testing if Geometry APIs supported. + @Deprecated("Obsolete") + static bool get supportsPointConversions => true; // To suppress missing implicit constructor warnings. factory Window._() { throw new UnsupportedError("Not supported"); } diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart index 6b85ade3654..f91d05dafe6 100644 --- a/sdk/lib/html/dartium/html_dartium.dart +++ b/sdk/lib/html/dartium/html_dartium.dart @@ -39008,11 +39008,9 @@ class Window extends EventTarget implements WindowEventHandlers, WindowBase, Glo return _requestFileSystem(persistent? 1 : 0, size); } - /** - * convertPointFromNodeToPage and convertPointFromPageToNode are removed. - * see http://dev.w3.org/csswg/cssom-view/#geometry - */ - static bool get supportsPointConversions => DomPoint.supported; + /// Obsolete API for testing if Geometry APIs supported. + @Deprecated("Obsolete") + static bool get supportsPointConversions => true; // To suppress missing implicit constructor warnings. factory Window._() { throw new UnsupportedError("Not supported"); } diff --git a/tests/html/css_test.dart b/tests/html/css_test.dart index bb3b9142b73..09979640a73 100644 --- a/tests/html/css_test.dart +++ b/tests/html/css_test.dart @@ -1,4 +1,5 @@ library CssTest; + import 'package:unittest/unittest.dart'; import 'package:unittest/html_individual_config.dart'; import 'dart:html'; @@ -14,12 +15,8 @@ main() { group('functional', () { test('DomPoint', () { - var expectation = Window.supportsPointConversions ? - returnsNormally : throws; - expect(() { - Element element = new Element.tag('div'); - element.attributes['style'] = - ''' + Element element = new Element.tag('div'); + element.attributes['style'] = ''' position: absolute; width: 60px; height: 100px; @@ -29,13 +26,12 @@ main() { -webkit-transform: translate3d(250px, 100px, 0px); -moz-transform: translate3d(250px, 100px, 0px); '''; - document.body.append(element); + document.body.append(element); - var elemRect = element.getBoundingClientRect(); + var elemRect = element.getBoundingClientRect(); - checkPoint(250, 100, new Point(elemRect.left, elemRect.top)); - checkPoint(310, 200, new Point(elemRect.right, elemRect.bottom)); - }, expectation); + checkPoint(250, 100, new Point(elemRect.left, elemRect.top)); + checkPoint(310, 200, new Point(elemRect.right, elemRect.bottom)); }); }); } diff --git a/tests/html/html.status b/tests/html/html.status index cf288b21bba..8b0e3af45d4 100644 --- a/tests/html/html.status +++ b/tests/html/html.status @@ -154,7 +154,6 @@ request_animation_frame_test: Skip # Times out. Issue 22167 audiobuffersourcenode_test/supported: Fail audiocontext_test/supported: Fail crypto_test/supported: Fail -css_test/supportsPointConversions: Fail document_test/supports_cssCanvasContext: Fail element_types_test/supported_content: Fail element_types_test/supported_details: Fail @@ -197,10 +196,6 @@ transferables_test: Fail # Issue 9846 [ $compiler == dart2js && $minified ] canvas_pixel_array_type_alias_test/types2_runtimeTypeName: Fail, OK # Issue 12605 -[ $compiler == dart2js && $runtime == chrome ] -css_test/supportsPointConversions: Fail # Issues 21710 -css_test/functional: Fail # Issues 21710 - [ $runtime == ie11 ] custom/document_register_type_extensions_test/single-parameter: Fail # Issue 13193. canvasrenderingcontext2d_test/arc: Pass, Fail # Pixel unexpected value. Please triage this failure. @@ -213,7 +208,6 @@ transferables_test: Pass, Fail # Issues 20659. audiobuffersourcenode_test/supported: Fail audiocontext_test/supported: Fail crypto_test/supported: Fail -css_test/supportsPointConversions: Fail document_test/supports_cssCanvasContext: Fail element_types_test/supported_content: Fail element_types_test/supported_details: Fail @@ -333,7 +327,6 @@ url_test: Fail audiobuffersourcenode_test/supported: Fail audiocontext_test/supported: Fail crypto_test/supported: Fail -css_test/supportsPointConversions: Fail document_test/supports_cssCanvasContext: Fail element_types_test/supported_template: Fail indexeddb_1_test/supported: Fail diff --git a/tools/dom/templates/html/impl/impl_Window.darttemplate b/tools/dom/templates/html/impl/impl_Window.darttemplate index d891762e968..857f2730c64 100644 --- a/tools/dom/templates/html/impl/impl_Window.darttemplate +++ b/tools/dom/templates/html/impl/impl_Window.darttemplate @@ -217,11 +217,9 @@ $endif return _requestFileSystem(persistent? 1 : 0, size); } - /** - * convertPointFromNodeToPage and convertPointFromPageToNode are removed. - * see http://dev.w3.org/csswg/cssom-view/#geometry - */ - static bool get supportsPointConversions => DomPoint.supported; + /// Obsolete API for testing if Geometry APIs supported. + @Deprecated("Obsolete") + static bool get supportsPointConversions => true; $!MEMBERS /**