From 665339880a86425d0441f1788ba7677c1cb4c19c Mon Sep 17 00:00:00 2001 From: "blois@google.com" Date: Tue, 5 Mar 2013 19:02:51 +0000 Subject: [PATCH] Renaming CSS primitive types to have CSS prefixes. BUG= Review URL: https://codereview.chromium.org//12387106 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@19504 260f80e4-7a28-3924-810f-c04153c831b5 --- sdk/lib/html/dart2js/html_dart2js.dart | 96 ++++++++++----------- sdk/lib/html/dartium/html_dartium.dart | 112 ++++++++++++------------- sdk/lib/svg/dart2js/svg_dart2js.dart | 2 +- sdk/lib/svg/dartium/svg_dartium.dart | 2 +- tools/dom/scripts/htmlrenamer.py | 2 + 5 files changed, 108 insertions(+), 106 deletions(-) diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart index 9ad2ec5fc7b..3f6afb8ead6 100644 --- a/sdk/lib/html/dart2js/html_dart2js.dart +++ b/sdk/lib/html/dart2js/html_dart2js.dart @@ -2228,11 +2228,11 @@ class CssPrimitiveValue extends CssValue native "*CSSPrimitiveValue" { @JSName('getRGBColorValue') @DomName('CSSPrimitiveValue.getRGBColorValue') @DocsEditable - RgbColor getRgbColorValue() native; + CssRgbColor getRgbColorValue() native; @DomName('CSSPrimitiveValue.getRectValue') @DocsEditable - Rect getRectValue() native; + CssRect getRectValue() native; @DomName('CSSPrimitiveValue.getStringValue') @DocsEditable @@ -2251,6 +2251,52 @@ class CssPrimitiveValue extends CssValue native "*CSSPrimitiveValue" { // BSD-style license that can be found in the LICENSE file. +@DocsEditable +@DomName('Rect') +class CssRect native "*Rect" { + + @DomName('Rect.bottom') + @DocsEditable + final CssPrimitiveValue bottom; + + @DomName('Rect.left') + @DocsEditable + final CssPrimitiveValue left; + + @DomName('Rect.right') + @DocsEditable + final CssPrimitiveValue right; + + @DomName('Rect.top') + @DocsEditable + final CssPrimitiveValue top; +} +// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + + +@DocsEditable +@DomName('RGBColor') +class CssRgbColor native "*RGBColor" { + + @DomName('RGBColor.blue') + @DocsEditable + final CssPrimitiveValue blue; + + @DomName('RGBColor.green') + @DocsEditable + final CssPrimitiveValue green; + + @DomName('RGBColor.red') + @DocsEditable + final CssPrimitiveValue red; +} +// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + + @DocsEditable @DomName('CSSRule') class CssRule native "*CSSRule" { @@ -18889,31 +18935,6 @@ class RangeException native "*RangeException" { // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. - -@DocsEditable -@DomName('Rect') -class Rect native "*Rect" { - - @DomName('Rect.bottom') - @DocsEditable - final CssPrimitiveValue bottom; - - @DomName('Rect.left') - @DocsEditable - final CssPrimitiveValue left; - - @DomName('Rect.right') - @DocsEditable - final CssPrimitiveValue right; - - @DomName('Rect.top') - @DocsEditable - final CssPrimitiveValue top; -} -// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file -// for details. All rights reserved. Use of this source code is governed by a -// BSD-style license that can be found in the LICENSE file. - // WARNING: Do not edit - generated code. @@ -18923,27 +18944,6 @@ typedef void RequestAnimationFrameCallback(num highResTime); // BSD-style license that can be found in the LICENSE file. -@DocsEditable -@DomName('RGBColor') -class RgbColor native "*RGBColor" { - - @DomName('RGBColor.blue') - @DocsEditable - final CssPrimitiveValue blue; - - @DomName('RGBColor.green') - @DocsEditable - final CssPrimitiveValue green; - - @DomName('RGBColor.red') - @DocsEditable - final CssPrimitiveValue red; -} -// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file -// for details. All rights reserved. Use of this source code is governed by a -// BSD-style license that can be found in the LICENSE file. - - @DocsEditable @DomName('RTCDataChannel') class RtcDataChannel extends EventTarget native "*RTCDataChannel" { diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart index f395d3668dd..985be3bddf1 100644 --- a/sdk/lib/html/dartium/html_dartium.dart +++ b/sdk/lib/html/dartium/html_dartium.dart @@ -2796,11 +2796,11 @@ class CssPrimitiveValue extends CssValue { @DomName('CSSPrimitiveValue.getRGBColorValue') @DocsEditable - RgbColor getRgbColorValue() native "CSSPrimitiveValue_getRGBColorValue_Callback"; + CssRgbColor getRgbColorValue() native "CSSPrimitiveValue_getRGBColorValue_Callback"; @DomName('CSSPrimitiveValue.getRectValue') @DocsEditable - Rect getRectValue() native "CSSPrimitiveValue_getRectValue_Callback"; + CssRect getRectValue() native "CSSPrimitiveValue_getRectValue_Callback"; @DomName('CSSPrimitiveValue.getStringValue') @DocsEditable @@ -2822,6 +2822,60 @@ class CssPrimitiveValue extends CssValue { // WARNING: Do not edit - generated code. +@DocsEditable +@DomName('Rect') +class CssRect extends NativeFieldWrapperClass1 { + CssRect.internal(); + + @DomName('Rect.bottom') + @DocsEditable + CssPrimitiveValue get bottom native "Rect_bottom_Getter"; + + @DomName('Rect.left') + @DocsEditable + CssPrimitiveValue get left native "Rect_left_Getter"; + + @DomName('Rect.right') + @DocsEditable + CssPrimitiveValue get right native "Rect_right_Getter"; + + @DomName('Rect.top') + @DocsEditable + CssPrimitiveValue get top native "Rect_top_Getter"; + +} +// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +// WARNING: Do not edit - generated code. + + +@DocsEditable +@DomName('RGBColor') +class CssRgbColor extends NativeFieldWrapperClass1 { + CssRgbColor.internal(); + + @DomName('RGBColor.blue') + @DocsEditable + CssPrimitiveValue get blue native "RGBColor_blue_Getter"; + + @DomName('RGBColor.green') + @DocsEditable + CssPrimitiveValue get green native "RGBColor_green_Getter"; + + @DomName('RGBColor.red') + @DocsEditable + CssPrimitiveValue get red native "RGBColor_red_Getter"; + +} +// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +// WARNING: Do not edit - generated code. + + @DocsEditable @DomName('CSSRule') class CssRule extends NativeFieldWrapperClass1 { @@ -20597,35 +20651,6 @@ class RangeException extends NativeFieldWrapperClass1 { // WARNING: Do not edit - generated code. -@DocsEditable -@DomName('Rect') -class Rect extends NativeFieldWrapperClass1 { - Rect.internal(); - - @DomName('Rect.bottom') - @DocsEditable - CssPrimitiveValue get bottom native "Rect_bottom_Getter"; - - @DomName('Rect.left') - @DocsEditable - CssPrimitiveValue get left native "Rect_left_Getter"; - - @DomName('Rect.right') - @DocsEditable - CssPrimitiveValue get right native "Rect_right_Getter"; - - @DomName('Rect.top') - @DocsEditable - CssPrimitiveValue get top native "Rect_top_Getter"; - -} -// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file -// for details. All rights reserved. Use of this source code is governed by a -// BSD-style license that can be found in the LICENSE file. - -// WARNING: Do not edit - generated code. - - typedef void RequestAnimationFrameCallback(num highResTime); // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a @@ -20634,31 +20659,6 @@ typedef void RequestAnimationFrameCallback(num highResTime); // WARNING: Do not edit - generated code. -@DocsEditable -@DomName('RGBColor') -class RgbColor extends NativeFieldWrapperClass1 { - RgbColor.internal(); - - @DomName('RGBColor.blue') - @DocsEditable - CssPrimitiveValue get blue native "RGBColor_blue_Getter"; - - @DomName('RGBColor.green') - @DocsEditable - CssPrimitiveValue get green native "RGBColor_green_Getter"; - - @DomName('RGBColor.red') - @DocsEditable - CssPrimitiveValue get red native "RGBColor_red_Getter"; - -} -// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file -// for details. All rights reserved. Use of this source code is governed by a -// BSD-style license that can be found in the LICENSE file. - -// WARNING: Do not edit - generated code. - - @DocsEditable @DomName('RTCDataChannel') class RtcDataChannel extends EventTarget { diff --git a/sdk/lib/svg/dart2js/svg_dart2js.dart b/sdk/lib/svg/dart2js/svg_dart2js.dart index 92d990abc84..e09bc4aa58d 100644 --- a/sdk/lib/svg/dart2js/svg_dart2js.dart +++ b/sdk/lib/svg/dart2js/svg_dart2js.dart @@ -755,7 +755,7 @@ class Color extends CssValue native "*SVGColor" { @DomName('SVGColor.rgbColor') @DocsEditable - final RgbColor rgbColor; + final CssRgbColor rgbColor; @DomName('SVGColor.setColor') @DocsEditable diff --git a/sdk/lib/svg/dartium/svg_dartium.dart b/sdk/lib/svg/dartium/svg_dartium.dart index 1544209e493..bfe65b7b49e 100644 --- a/sdk/lib/svg/dartium/svg_dartium.dart +++ b/sdk/lib/svg/dartium/svg_dartium.dart @@ -857,7 +857,7 @@ class Color extends CssValue { @DomName('SVGColor.rgbColor') @DocsEditable - RgbColor get rgbColor native "SVGColor_rgbColor_Getter"; + CssRgbColor get rgbColor native "SVGColor_rgbColor_Getter"; @DomName('SVGColor.setColor') @DocsEditable diff --git a/tools/dom/scripts/htmlrenamer.py b/tools/dom/scripts/htmlrenamer.py index 705232a1424..28cd3cca6f5 100644 --- a/tools/dom/scripts/htmlrenamer.py +++ b/tools/dom/scripts/htmlrenamer.py @@ -25,6 +25,8 @@ html_interface_renames = monitored.Dict('htmlrenamer.html_interface_renames', { 'NavigatorUserMediaSuccessCallback': '_NavigatorUserMediaSuccessCallback', 'PositionCallback': '_PositionCallback', 'PositionErrorCallback': '_PositionErrorCallback', + 'Rect': 'CssRect', + 'RGBColor': 'CssRgbColor', 'SVGDocument': 'SvgDocument', # Manual to avoid name conflicts. 'SVGElement': 'SvgElement', # Manual to avoid name conflicts. 'SVGException': 'SvgException', # Manual of avoid conflict with Exception.