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

Unified Diff: sdk/lib/html/dartium/html_dartium.dart

Issue 1876363006: Fix a few strong mode errors in dart:html (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Reverted the move of fullscreenEnabled, causes duplicate definitions in dart2js Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
Download patch
« no previous file with comments | « sdk/lib/html/dart2js/html_dart2js.dart ('k') | tools/dom/scripts/htmldartgenerator.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/html/dartium/html_dartium.dart
diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart
index 5ff3bb57dd84f5fbbd3d46686a4abdae4992739b..6c82c02018620b51be9436e6888f25690b9f34aa 100644
--- a/sdk/lib/html/dartium/html_dartium.dart
+++ b/sdk/lib/html/dartium/html_dartium.dart
@@ -829,7 +829,7 @@ class AnchorElement extends HtmlElement implements UrlUtils {
@DomName('HTMLAnchorElement.HTMLAnchorElement')
@DocsEditable()
factory AnchorElement({String href}) {
- var e = document.createElement("a");
+ AnchorElement e = document.createElement("a");
if (href != null) e.href = href;
return e;
}
@@ -3058,7 +3058,7 @@ class CanvasElement extends HtmlElement implements CanvasImageSource {
@DomName('HTMLCanvasElement.HTMLCanvasElement')
@DocsEditable()
factory CanvasElement({int width, int height}) {
- var e = document.createElement("canvas");
+ CanvasElement e = document.createElement("canvas");
if (width != null) e.width = width;
if (height != null) e.height = height;
return e;
@@ -4462,7 +4462,7 @@ class CompositionEvent extends UIEvent {
if (view == null) {
view = window;
}
- var e = document._createEvent("CompositionEvent");
+ CompositionEvent e = document._createEvent("CompositionEvent");
e._initCompositionEvent(type, canBubble, cancelable, view, data);
@@ -4592,7 +4592,7 @@ class CompositorWorker extends EventTarget implements AbstractWorker {
@DomName('CompositorWorker.errorEvent')
@DocsEditable()
@Experimental() // untriaged
- static const EventStreamProvider<Event> errorEvent = const EventStreamProvider<Event>('error');
+ static const EventStreamProvider<ErrorEvent> errorEvent = const EventStreamProvider<ErrorEvent>('error');
@DomName('CompositorWorker.messageEvent')
@DocsEditable()
@@ -4630,7 +4630,7 @@ class CompositorWorker extends EventTarget implements AbstractWorker {
@DomName('CompositorWorker.onerror')
@DocsEditable()
@Experimental() // untriaged
- Stream<Event> get onError => errorEvent.forTarget(this);
+ Stream<ErrorEvent> get onError => errorEvent.forTarget(this);
@DomName('CompositorWorker.onmessage')
@DocsEditable()
@@ -9763,7 +9763,7 @@ class DeviceOrientationEvent extends Event {
factory DeviceOrientationEvent(String type,
{bool canBubble: true, bool cancelable: true, num alpha: 0, num beta: 0,
num gamma: 0, bool absolute: false}) {
- var e = document._createEvent("DeviceOrientationEvent");
+ DeviceOrientationEvent e = document._createEvent("DeviceOrientationEvent");
e._initDeviceOrientationEvent(type, canBubble, cancelable, alpha, beta,
gamma, absolute);
return e;
@@ -13136,8 +13136,8 @@ abstract class ElementList<T extends Element> extends ListBase<T> {
// declared to return `ElementList`. This provides all the static analysis
// benefit so there is no need for this class have a constrained type parameter.
//
-class _FrozenElementList extends ListBase
- implements ElementList, NodeListWrapper {
+class _FrozenElementList extends ListBase<Element>
+ implements ElementList<Element>, NodeListWrapper {
final List<Node> _nodeList;
var dartClass_instance;
@@ -13184,7 +13184,7 @@ class _FrozenElementList extends ListBase
//
// as the code below converts the Iterable[value] to a string multiple
// times. Maybe compute the string and set className here.
- _nodeList.forEach((e) => e.classes = value);
+ forEach((e) => e.classes = value);
}
CssRect get contentEdge => new _ContentCssListRect(this);
@@ -14498,7 +14498,7 @@ class Element extends Node implements NonDocumentTypeChildNode, GlobalEventHandl
// Workaround for Safari bug. Was also previously Chrome bug 229142
// - URIs are not resolved in new doc.
- var base = _parseDocument.createElement('base');
+ BaseElement base = _parseDocument.createElement('base');
base.href = document.baseUri;
_parseDocument.head.append(base);
}
@@ -16640,7 +16640,7 @@ class Event extends DartHtmlDomObject {
e._initEvent(name, canBubble, cancelable);
return e;
}
-
+
/** The CSS selector involved with event delegation. */
String _selector;
@@ -16654,8 +16654,8 @@ class Event extends DartHtmlDomObject {
throw new UnsupportedError('Cannot call matchingTarget if this Event did'
' not arise as a result of event delegation.');
}
- var currentTarget = this.currentTarget;
- var target = this.target;
+ Element currentTarget = this.currentTarget;
+ Element target = this.target;
var matchedTarget;
do {
if (target.matches(_selector)) return target;
@@ -16945,26 +16945,24 @@ class Events {
}
class ElementEvents extends Events {
- /* Raw event target. */
- final Element _ptr;
static final webkitEvents = {
- 'animationend' : 'webkitAnimationEnd',
- 'animationiteration' : 'webkitAnimationIteration',
- 'animationstart' : 'webkitAnimationStart',
- 'fullscreenchange' : 'webkitfullscreenchange',
+ 'animationend' : 'webkitAnimationEnd',
+ 'animationiteration' : 'webkitAnimationIteration',
+ 'animationstart' : 'webkitAnimationStart',
+ 'fullscreenchange' : 'webkitfullscreenchange',
'fullscreenerror' : 'webkitfullscreenerror',
- 'keyadded' : 'webkitkeyadded',
- 'keyerror' : 'webkitkeyerror',
- 'keymessage' : 'webkitkeymessage',
- 'needkey' : 'webkitneedkey',
- 'pointerlockchange' : 'webkitpointerlockchange',
- 'pointerlockerror' : 'webkitpointerlockerror',
- 'resourcetimingbufferfull' : 'webkitresourcetimingbufferfull',
+ 'keyadded' : 'webkitkeyadded',
+ 'keyerror' : 'webkitkeyerror',
+ 'keymessage' : 'webkitkeymessage',
+ 'needkey' : 'webkitneedkey',
+ 'pointerlockchange' : 'webkitpointerlockchange',
+ 'pointerlockerror' : 'webkitpointerlockerror',
+ 'resourcetimingbufferfull' : 'webkitresourcetimingbufferfull',
'transitionend': 'webkitTransitionEnd',
'speechchange' : 'webkitSpeechChange'
};
- ElementEvents(Element ptr) : this._ptr = ptr, super(ptr);
+ ElementEvents(Element ptr) : super(ptr);
Stream operator [](String type) {
if (webkitEvents.keys.contains(type.toLowerCase())) {
@@ -19919,22 +19917,6 @@ class HtmlDocument extends Document {
@Experimental()
Element get fullscreenElement => _webkitFullscreenElement;
- /**
- * Returns true if this document can display elements in fullscreen mode.
- *
- * ## Other resources
- *
- * * [Using the fullscreen
- * API](http://docs.webplatform.org/wiki/tutorials/using_the_full-screen_api)
- * from WebPlatform.org.
- * * [Fullscreen specification](http://www.w3.org/TR/fullscreen/) from W3C.
- */
- @DomName('Document.webkitFullscreenEnabled')
- @SupportedBrowser(SupportedBrowser.CHROME)
- @SupportedBrowser(SupportedBrowser.SAFARI)
- @Experimental()
- bool get fullscreenEnabled => _webkitFullscreenEnabled;
-
@DomName('Document.webkitHidden')
@SupportedBrowser(SupportedBrowser.CHROME)
@SupportedBrowser(SupportedBrowser.SAFARI)
@@ -22122,7 +22104,7 @@ class ImageElement extends HtmlElement implements CanvasImageSource {
@DomName('HTMLImageElement.HTMLImageElement')
@DocsEditable()
factory ImageElement({String src, int width, int height}) {
- var e = document.createElement("img");
+ ImageElement e = document.createElement("img");
if (src != null) e.src = src;
if (width != null) e.width = width;
if (height != null) e.height = height;
@@ -25910,7 +25892,7 @@ class MessageEvent extends Event {
if (source == null) {
source = window;
}
- var event = document._createEvent("MessageEvent");
+ MessageEvent event = document._createEvent("MessageEvent");
event._initMessageEvent(type, canBubble, cancelable, data, origin,
lastEventId, source, messagePorts);
return event;
@@ -33698,7 +33680,7 @@ class SharedWorker extends EventTarget implements AbstractWorker {
@DomName('SharedWorker.errorEvent')
@DocsEditable()
@Experimental() // untriaged
- static const EventStreamProvider<Event> errorEvent = const EventStreamProvider<Event>('error');
+ static const EventStreamProvider<ErrorEvent> errorEvent = const EventStreamProvider<ErrorEvent>('error');
@DomName('SharedWorker.SharedWorker')
@DocsEditable()
@@ -33726,7 +33708,7 @@ class SharedWorker extends EventTarget implements AbstractWorker {
@DomName('SharedWorker.onerror')
@DocsEditable()
@Experimental() // untriaged
- Stream<Event> get onError => errorEvent.forTarget(this);
+ Stream<ErrorEvent> get onError => errorEvent.forTarget(this);
}
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
@@ -35258,7 +35240,7 @@ class StorageEvent extends Event {
{bool canBubble: false, bool cancelable: false, String key, String oldValue,
String newValue, String url, Storage storageArea}) {
- var e = document._createEvent("StorageEvent");
+ StorageEvent e = document._createEvent("StorageEvent");
e._initStorageEvent(type, canBubble, cancelable, key, oldValue,
newValue, url, storageArea);
return e;
@@ -36403,7 +36385,7 @@ class TextEvent extends UIEvent {
if (view == null) {
view = window;
}
- var e = document._createEvent("TextEvent");
+ TextEvent e = document._createEvent("TextEvent");
e._initTextEvent(type, canBubble, cancelable, view, data);
return e;
}
@@ -37086,7 +37068,7 @@ class TouchEvent extends UIEvent {
if (view == null) {
view = window;
}
- var e = document._createEvent("TouchEvent");
+ TouchEvent e = document._createEvent("TouchEvent");
e._initTouchEvent(touches, targetTouches, changedTouches, type, view,
screenX, screenY, clientX, clientY, ctrlKey, altKey, shiftKey, metaKey);
return e;
@@ -37602,7 +37584,7 @@ class UIEvent extends Event {
if (view == null) {
view = window;
}
- final e = document._createEvent("UIEvent");
+ UIEvent e = document._createEvent("UIEvent");
e._initUIEvent(type, canBubble, cancelable, view, detail);
return e;
}
@@ -40997,7 +40979,7 @@ class Worker extends EventTarget implements AbstractWorker {
@DomName('Worker.errorEvent')
@DocsEditable()
@Experimental() // untriaged
- static const EventStreamProvider<Event> errorEvent = const EventStreamProvider<Event>('error');
+ static const EventStreamProvider<ErrorEvent> errorEvent = const EventStreamProvider<ErrorEvent>('error');
/**
* Static factory designed to expose `message` events to event
@@ -41043,7 +41025,7 @@ class Worker extends EventTarget implements AbstractWorker {
@DomName('Worker.onerror')
@DocsEditable()
@Experimental() // untriaged
- Stream<Event> get onError => errorEvent.forTarget(this);
+ Stream<ErrorEvent> get onError => errorEvent.forTarget(this);
/// Stream of `message` events handled by this [Worker].
@DomName('Worker.onmessage')
@@ -42704,7 +42686,7 @@ class _MutationEvent extends Event {
{bool canBubble: false, bool cancelable: false, Node relatedNode,
String prevValue, String newValue, String attrName, int attrChange: 0}) {
- var event = document._createEvent('MutationEvent');
+ MutationEvent event = document._createEvent('MutationEvent');
event._initMutationEvent(type, canBubble, cancelable, relatedNode,
prevValue, newValue, attrName, attrChange);
return event;
« no previous file with comments | « sdk/lib/html/dart2js/html_dart2js.dart ('k') | tools/dom/scripts/htmldartgenerator.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698