| Index: lib/html/dart2js/html_dart2js.dart
|
| diff --git a/lib/html/dart2js/html_dart2js.dart b/lib/html/dart2js/html_dart2js.dart
|
| index daf6e9f2bd4d3297f67c603f436870f009198038..a5284cb534a0fff6baea569d331ad00cedcabcd5 100644
|
| --- a/lib/html/dart2js/html_dart2js.dart
|
| +++ b/lib/html/dart2js/html_dart2js.dart
|
| @@ -11115,16 +11115,16 @@ abstract class Element implements Node, NodeSelector {
|
| String $dom_className;
|
|
|
| /** @domName Element.clientHeight */
|
| - abstract int get $dom_clientHeight;
|
| + abstract int get clientHeight;
|
|
|
| /** @domName Element.clientLeft */
|
| - abstract int get $dom_clientLeft;
|
| + abstract int get clientLeft;
|
|
|
| /** @domName Element.clientTop */
|
| - abstract int get $dom_clientTop;
|
| + abstract int get clientTop;
|
|
|
| /** @domName Element.clientWidth */
|
| - abstract int get $dom_clientWidth;
|
| + abstract int get clientWidth;
|
|
|
| /** @domName Element.dataset */
|
| abstract Map<String, String> get dataset;
|
| @@ -11139,34 +11139,34 @@ abstract class Element implements Node, NodeSelector {
|
| abstract Element get nextElementSibling;
|
|
|
| /** @domName Element.offsetHeight */
|
| - abstract int get $dom_offsetHeight;
|
| + abstract int get offsetHeight;
|
|
|
| /** @domName Element.offsetLeft */
|
| - abstract int get $dom_offsetLeft;
|
| + abstract int get offsetLeft;
|
|
|
| /** @domName Element.offsetParent */
|
| abstract Element get offsetParent;
|
|
|
| /** @domName Element.offsetTop */
|
| - abstract int get $dom_offsetTop;
|
| + abstract int get offsetTop;
|
|
|
| /** @domName Element.offsetWidth */
|
| - abstract int get $dom_offsetWidth;
|
| + abstract int get offsetWidth;
|
|
|
| /** @domName Element.previousElementSibling */
|
| abstract Element get previousElementSibling;
|
|
|
| /** @domName Element.scrollHeight */
|
| - abstract int get $dom_scrollHeight;
|
| + abstract int get scrollHeight;
|
|
|
| /** @domName Element.scrollLeft */
|
| - int $dom_scrollLeft;
|
| + int scrollLeft;
|
|
|
| /** @domName Element.scrollTop */
|
| - int $dom_scrollTop;
|
| + int scrollTop;
|
|
|
| /** @domName Element.scrollWidth */
|
| - abstract int get $dom_scrollWidth;
|
| + abstract int get scrollWidth;
|
|
|
| /** @domName Element.style */
|
| abstract CSSStyleDeclaration get style;
|
| @@ -11184,10 +11184,10 @@ abstract class Element implements Node, NodeSelector {
|
| String $dom_getAttribute(String name);
|
|
|
| /** @domName Element.getBoundingClientRect */
|
| - ClientRect $dom_getBoundingClientRect();
|
| + ClientRect getBoundingClientRect();
|
|
|
| /** @domName Element.getClientRects */
|
| - List<ClientRect> $dom_getClientRects();
|
| + List<ClientRect> getClientRects();
|
|
|
| /** @domName Element.getElementsByClassName */
|
| List<Node> $dom_getElementsByClassName(String name);
|
| @@ -11961,20 +11961,20 @@ class _ElementRectImpl implements ElementRect {
|
| final _ClientRectListImpl _clientRects;
|
|
|
| _ElementRectImpl(_ElementImpl element) :
|
| - client = new _SimpleClientRect(element.$dom_clientLeft,
|
| - element.$dom_clientTop,
|
| - element.$dom_clientWidth,
|
| - element.$dom_clientHeight),
|
| - offset = new _SimpleClientRect(element.$dom_offsetLeft,
|
| - element.$dom_offsetTop,
|
| - element.$dom_offsetWidth,
|
| - element.$dom_offsetHeight),
|
| - scroll = new _SimpleClientRect(element.$dom_scrollLeft,
|
| - element.$dom_scrollTop,
|
| - element.$dom_scrollWidth,
|
| - element.$dom_scrollHeight),
|
| - _boundingClientRect = element.$dom_getBoundingClientRect(),
|
| - _clientRects = element.$dom_getClientRects();
|
| + client = new _SimpleClientRect(element.clientLeft,
|
| + element.clientTop,
|
| + element.clientWidth,
|
| + element.clientHeight),
|
| + offset = new _SimpleClientRect(element.offsetLeft,
|
| + element.offsetTop,
|
| + element.offsetWidth,
|
| + element.offsetHeight),
|
| + scroll = new _SimpleClientRect(element.scrollLeft,
|
| + element.scrollTop,
|
| + element.scrollWidth,
|
| + element.scrollHeight),
|
| + _boundingClientRect = element.getBoundingClientRect(),
|
| + _clientRects = element.getClientRects();
|
|
|
| _ClientRectImpl get bounding => _boundingClientRect;
|
|
|
| @@ -12165,13 +12165,13 @@ class _ElementImpl extends _NodeImpl implements Element native "*Element" {
|
|
|
| void set $dom_className(String value) native "this.className = value;";
|
|
|
| - int get $dom_clientHeight() native "return this.clientHeight;";
|
| + final int clientHeight;
|
|
|
| - int get $dom_clientLeft() native "return this.clientLeft;";
|
| + final int clientLeft;
|
|
|
| - int get $dom_clientTop() native "return this.clientTop;";
|
| + final int clientTop;
|
|
|
| - int get $dom_clientWidth() native "return this.clientWidth;";
|
| + final int clientWidth;
|
|
|
| final Map<String, String> dataset;
|
|
|
| @@ -12181,29 +12181,25 @@ class _ElementImpl extends _NodeImpl implements Element native "*Element" {
|
|
|
| final _ElementImpl nextElementSibling;
|
|
|
| - int get $dom_offsetHeight() native "return this.offsetHeight;";
|
| + final int offsetHeight;
|
|
|
| - int get $dom_offsetLeft() native "return this.offsetLeft;";
|
| + final int offsetLeft;
|
|
|
| final _ElementImpl offsetParent;
|
|
|
| - int get $dom_offsetTop() native "return this.offsetTop;";
|
| + final int offsetTop;
|
|
|
| - int get $dom_offsetWidth() native "return this.offsetWidth;";
|
| + final int offsetWidth;
|
|
|
| final _ElementImpl previousElementSibling;
|
|
|
| - int get $dom_scrollHeight() native "return this.scrollHeight;";
|
| -
|
| - int get $dom_scrollLeft() native "return this.scrollLeft;";
|
| + final int scrollHeight;
|
|
|
| - void set $dom_scrollLeft(int value) native "this.scrollLeft = value;";
|
| + int scrollLeft;
|
|
|
| - int get $dom_scrollTop() native "return this.scrollTop;";
|
| + int scrollTop;
|
|
|
| - void set $dom_scrollTop(int value) native "this.scrollTop = value;";
|
| -
|
| - int get $dom_scrollWidth() native "return this.scrollWidth;";
|
| + final int scrollWidth;
|
|
|
| final _CSSStyleDeclarationImpl style;
|
|
|
| @@ -12215,9 +12211,9 @@ class _ElementImpl extends _NodeImpl implements Element native "*Element" {
|
|
|
| String $dom_getAttribute(String name) native "getAttribute";
|
|
|
| - _ClientRectImpl $dom_getBoundingClientRect() native "getBoundingClientRect";
|
| + _ClientRectImpl getBoundingClientRect() native;
|
|
|
| - _ClientRectListImpl $dom_getClientRects() native "getClientRects";
|
| + _ClientRectListImpl getClientRects() native;
|
|
|
| List<Node> $dom_getElementsByClassName(String name) native "getElementsByClassName";
|
|
|
| @@ -19566,7 +19562,7 @@ class _MouseEventImpl extends _UIEventImpl implements MouseEvent native "*MouseE
|
| throw const UnsupportedOperationException(
|
| 'offsetX is only supported on elements');
|
| }
|
| - return this.clientX - this.target.$dom_getBoundingClientRect().left;
|
| + return this.clientX - this.target.getBoundingClientRect().left;
|
| }
|
| }
|
|
|
| @@ -19580,7 +19576,7 @@ class _MouseEventImpl extends _UIEventImpl implements MouseEvent native "*MouseE
|
| throw const UnsupportedOperationException(
|
| 'offsetX is only supported on elements');
|
| }
|
| - return this.clientY - this.target.$dom_getBoundingClientRect().top;
|
| + return this.clientY - this.target.getBoundingClientRect().top;
|
| }
|
| }
|
|
|
|
|