Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Unified Diff: sdk/lib/html/dart2js/html_dart2js.dart

Issue 11332006: Type unconverted window and event targets correctly (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sdk/lib/html/scripts/generator.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/html/dart2js/html_dart2js.dart
diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart
index 24059cb51ceca84aaec68e7e02e2fa96cd5fbf71..d65a72d7526d681baba30f7c64019768e23b3612 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -5719,7 +5719,7 @@ class Document extends Node
/** @domName Document.defaultView */
Window get window => _convertNativeToDart_Window(this._window);
- Window get _window => JS("Window", "#.defaultView", this);
+ dynamic get _window => JS("dynamic", "#.defaultView", this);
/** @domName Document.documentElement */
final Element documentElement;
@@ -5804,10 +5804,10 @@ class Document extends Node
/** @domName Document.createTouch */
Touch createTouch(LocalWindow window, EventTarget target, int identifier, int pageX, int pageY, int screenX, int screenY, int webkitRadiusX, int webkitRadiusY, num webkitRotationAngle, num webkitForce) {
- EventTarget target_1 = _convertDartToNative_EventTarget(target);
+ var target_1 = _convertDartToNative_EventTarget(target);
return _createTouch_1(window, target_1, identifier, pageX, pageY, screenX, screenY, webkitRadiusX, webkitRadiusY, webkitRotationAngle, webkitForce);
}
- Touch _createTouch_1(LocalWindow window, EventTarget target, identifier, pageX, pageY, screenX, screenY, webkitRadiusX, webkitRadiusY, webkitRotationAngle, webkitForce) native "createTouch";
+ Touch _createTouch_1(LocalWindow window, target, identifier, pageX, pageY, screenX, screenY, webkitRadiusX, webkitRadiusY, webkitRotationAngle, webkitForce) native "createTouch";
/** @domName Document.createTouchList */
TouchList $dom_createTouchList() native "createTouchList";
@@ -7899,7 +7899,7 @@ class Event native "*Event" {
/** @domName Event.currentTarget */
EventTarget get currentTarget => _convertNativeToDart_EventTarget(this._currentTarget);
- EventTarget get _currentTarget => JS("EventTarget", "#.currentTarget", this);
+ dynamic get _currentTarget => JS("dynamic", "#.currentTarget", this);
/** @domName Event.defaultPrevented */
final bool defaultPrevented;
@@ -7912,11 +7912,11 @@ class Event native "*Event" {
/** @domName Event.srcElement */
EventTarget get srcElement => _convertNativeToDart_EventTarget(this._srcElement);
- EventTarget get _srcElement => JS("EventTarget", "#.srcElement", this);
+ dynamic get _srcElement => JS("dynamic", "#.srcElement", this);
/** @domName Event.target */
EventTarget get target => _convertNativeToDart_EventTarget(this._target);
- EventTarget get _target => JS("EventTarget", "#.target", this);
+ dynamic get _target => JS("dynamic", "#.target", this);
/** @domName Event.timeStamp */
final int timeStamp;
@@ -8692,7 +8692,7 @@ class FrameElement extends Element implements Element native "*HTMLFrameElement"
/** @domName HTMLFrameElement.contentWindow */
Window get contentWindow => _convertNativeToDart_Window(this._contentWindow);
- Window get _contentWindow => JS("Window", "#.contentWindow", this);
+ dynamic get _contentWindow => JS("dynamic", "#.contentWindow", this);
/** @domName HTMLFrameElement.frameBorder */
String frameBorder;
@@ -10055,7 +10055,7 @@ class IFrameElement extends Element implements Element native "*HTMLIFrameElemen
/** @domName HTMLIFrameElement.contentWindow */
Window get contentWindow => _convertNativeToDart_Window(this._contentWindow);
- Window get _contentWindow => JS("Window", "#.contentWindow", this);
+ dynamic get _contentWindow => JS("dynamic", "#.contentWindow", this);
/** @domName HTMLIFrameElement.frameBorder */
String frameBorder;
@@ -11194,7 +11194,7 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
/** @domName Window.opener */
Window get opener => _convertNativeToDart_Window(this._opener);
- Window get _opener => JS("Window", "#.opener", this);
+ dynamic get _opener => JS("dynamic", "#.opener", this);
/** @domName Window.outerHeight */
final int outerHeight;
@@ -11213,7 +11213,7 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
/** @domName Window.parent */
Window get parent => _convertNativeToDart_Window(this._parent);
- Window get _parent => JS("Window", "#.parent", this);
+ dynamic get _parent => JS("dynamic", "#.parent", this);
/** @domName Window.performance */
final Performance performance;
@@ -11247,7 +11247,7 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
/** @domName Window.self */
Window get self => _convertNativeToDart_Window(this._self);
- Window get _self => JS("Window", "#.self", this);
+ dynamic get _self => JS("dynamic", "#.self", this);
/** @domName Window.sessionStorage */
final Storage sessionStorage;
@@ -11266,7 +11266,7 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
/** @domName Window.top */
Window get top => _convertNativeToDart_Window(this._top);
- Window get _top => JS("Window", "#.top", this);
+ dynamic get _top => JS("dynamic", "#.top", this);
/** @domName DOMWindow.webkitIndexedDB */
final IDBFactory webkitIndexedDB;
@@ -11279,7 +11279,7 @@ class LocalWindow extends EventTarget implements Window native "@*DOMWindow" {
/** @domName Window.window */
Window get window => _convertNativeToDart_Window(this._window);
- Window get _window => JS("Window", "#.window", this);
+ dynamic get _window => JS("dynamic", "#.window", this);
/** @domName Window.addEventListener */
void $dom_addEventListener(String type, EventListener listener, [bool useCapture]) native "addEventListener";
@@ -12218,7 +12218,7 @@ class MessageEvent extends Event native "*MessageEvent" {
/** @domName MessageEvent.source */
Window get source => _convertNativeToDart_Window(this._source);
- Window get _source => JS("Window", "#.source", this);
+ dynamic get _source => JS("dynamic", "#.source", this);
/** @domName MessageEvent.initMessageEvent */
void initMessageEvent(String typeArg, bool canBubbleArg, bool cancelableArg, Object dataArg, String originArg, String lastEventIdArg, LocalWindow sourceArg, List messagePorts) native;
@@ -12384,7 +12384,7 @@ class MouseEvent extends UIEvent native "*MouseEvent" {
/** @domName MouseEvent.relatedTarget */
EventTarget get relatedTarget => _convertNativeToDart_EventTarget(this._relatedTarget);
- EventTarget get _relatedTarget => JS("EventTarget", "#.relatedTarget", this);
+ dynamic get _relatedTarget => JS("dynamic", "#.relatedTarget", this);
/** @domName MouseEvent.screenX */
final int screenX;
@@ -12412,11 +12412,11 @@ class MouseEvent extends UIEvent native "*MouseEvent" {
/** @domName MouseEvent.initMouseEvent */
void $dom_initMouseEvent(String type, bool canBubble, bool cancelable, LocalWindow view, int detail, int screenX, int screenY, int clientX, int clientY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, int button, EventTarget relatedTarget) {
- EventTarget relatedTarget_1 = _convertDartToNative_EventTarget(relatedTarget);
+ var relatedTarget_1 = _convertDartToNative_EventTarget(relatedTarget);
_$dom_initMouseEvent_1(type, canBubble, cancelable, view, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget_1);
return;
}
- void _$dom_initMouseEvent_1(type, canBubble, cancelable, LocalWindow view, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, EventTarget relatedTarget) native "initMouseEvent";
+ void _$dom_initMouseEvent_1(type, canBubble, cancelable, LocalWindow view, detail, screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget) native "initMouseEvent";
int get offsetX {
@@ -21746,7 +21746,7 @@ class Touch native "*Touch" {
/** @domName Touch.target */
EventTarget get target => _convertNativeToDart_EventTarget(this._target);
- EventTarget get _target => JS("EventTarget", "#.target", this);
+ dynamic get _target => JS("dynamic", "#.target", this);
/** @domName Touch.webkitForce */
final num webkitForce;
@@ -22005,7 +22005,7 @@ class UIEvent extends Event native "*UIEvent" {
/** @domName UIEvent.view */
Window get view => _convertNativeToDart_Window(this._view);
- Window get _view => JS("Window", "#.view", this);
+ dynamic get _view => JS("dynamic", "#.view", this);
/** @domName UIEvent.which */
final int which;
« no previous file with comments | « no previous file | sdk/lib/html/scripts/generator.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698