[dart:html] Changes to template/src to handle compat data

Mostly null-assertions to make code compatible with compat
data changes.

Change-Id: I8f7c6c2421d6427851a44588978910deae8440bd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/152047
Reviewed-by: Sigmund Cherem <sigmund@google.com>
This commit is contained in:
Srujan Gaddam 2020-07-01 22:06:34 +00:00 committed by commit-bot@chromium.org
parent 76d7739cf7
commit 7349385185
18 changed files with 100 additions and 103 deletions

View file

@ -9137,9 +9137,9 @@ class DataTransferItem extends Interceptor {
Entry getAsEntry() {
Entry entry = _webkitGetAsEntry() as Entry;
if (entry.isFile)
if (entry.isFile!)
applyExtension('FileEntry', entry);
else if (entry.isDirectory)
else if (entry.isDirectory!)
applyExtension('DirectoryEntry', entry);
else
applyExtension('Entry', entry);
@ -9754,9 +9754,9 @@ class DirectoryReader extends Interceptor {
values.forEach((value) {
applyExtension('Entry', value);
Entry entry = value as Entry;
if (entry.isFile)
if (entry.isFile!)
applyExtension('FileEntry', entry);
else if (entry.isDirectory) applyExtension('DirectoryEntry', entry);
else if (entry.isDirectory!) applyExtension('DirectoryEntry', entry);
});
completer.complete(new List<Entry>.from(values));
}, (error) {
@ -13144,7 +13144,7 @@ class Element extends Node
* Gets the position of this element relative to the client area of the page.
*/
Rectangle get client =>
new Rectangle(clientLeft, clientTop, clientWidth, clientHeight);
new Rectangle(clientLeft!, clientTop!, clientWidth, clientHeight);
/**
* Gets the offset of this element relative to its offsetParent.
@ -13687,13 +13687,13 @@ class Element extends Node
}
if (_parseDocument == null) {
_parseDocument = document.implementation.createHtmlDocument('');
_parseDocument = document.implementation!.createHtmlDocument('');
_parseRange = _parseDocument!.createRange();
// Workaround for Safari bug. Was also previously Chrome bug 229142
// - URIs are not resolved in new doc.
BaseElement base = _parseDocument!.createElement('base') as BaseElement;
base.href = document.baseUri;
base.href = document.baseUri!;
_parseDocument!.head!.append(base);
}
@ -13815,7 +13815,7 @@ class Element extends Node
}
}
String get innerHtml => _innerHtml;
String? get innerHtml => _innerHtml;
@JSName('innerText')
String get innerText native;
@ -17681,7 +17681,7 @@ class HtmlDocument extends Document {
HeadElement? get head => _head;
String get lastModified => _lastModified;
String? get lastModified => _lastModified;
String? get preferredStylesheetSet => _preferredStylesheetSet;
@ -17692,7 +17692,7 @@ class HtmlDocument extends Document {
_selectedStylesheetSet = value;
}
List<StyleSheet> get styleSheets => _styleSheets;
List<StyleSheet>? get styleSheets => _styleSheets;
String get title => _title;
@ -17992,7 +17992,7 @@ class HttpRequest extends HttpRequestEventTarget {
{bool? withCredentials, void onProgress(ProgressEvent e)?}) {
return request(url,
withCredentials: withCredentials, onProgress: onProgress)
.then((HttpRequest xhr) => xhr.responseText);
.then((HttpRequest xhr) => xhr.responseText!);
}
/**
@ -18140,15 +18140,16 @@ class HttpRequest extends HttpRequestEventTarget {
}
xhr.onLoad.listen((e) {
var accepted = xhr.status >= 200 && xhr.status < 300;
var fileUri = xhr.status == 0; // file:// URIs have status of 0.
var notModified = xhr.status == 304;
var status = xhr.status!;
var accepted = status >= 200 && status < 300;
var fileUri = status == 0; // file:// URIs have status of 0.
var notModified = status == 304;
// Redirect status is specified up to 307, but others have been used in
// practice. Notably Google Drive uses 308 Resume Incomplete for
// resumable uploads, and it's also been used as a redirect. The
// redirect case will be handled by the browser before it gets to us,
// so if we see it we should pass it through to the user.
var unknownRedirect = xhr.status > 307 && xhr.status < 400;
var unknownRedirect = status > 307 && status < 400;
if (accepted || fileUri || notModified || unknownRedirect) {
completer.complete(xhr);
@ -18215,7 +18216,7 @@ class HttpRequest extends HttpRequestEventTarget {
{String? method, String? sendData}) {
if (supportsCrossOrigin) {
return request(url, method: method, sendData: sendData).then((xhr) {
return xhr.responseText;
return xhr.responseText!;
});
}
var completer = new Completer<String>();
@ -20032,7 +20033,7 @@ class KeyboardEvent extends UIEvent {
int get charCode native;
int get which => _which;
int? get which => _which;
factory KeyboardEvent._(String type, [Map? eventInitDict]) {
if (eventInitDict != null) {
@ -22325,7 +22326,7 @@ class MouseEvent extends UIEvent {
@SupportedBrowser(SupportedBrowser.CHROME)
@SupportedBrowser(SupportedBrowser.FIREFOX)
Point get movement => new Point(_movementX, _movementY);
Point get movement => new Point(_movementX!, _movementY!);
/**
* The coordinates of the mouse pointer in target node coordinates.
@ -22352,9 +22353,9 @@ class MouseEvent extends UIEvent {
Point get screen => new Point(_screenX, _screenY);
Point get layer => new Point(_layerX, _layerY);
Point get layer => new Point(_layerX!, _layerY!);
Point get page => new Point(_pageX, _pageY);
Point get page => new Point(_pageX!, _pageY!);
DataTransfer get dataTransfer =>
JS('DataTransfer', "#['dataTransfer']", this);
@ -27231,7 +27232,7 @@ class RtcTrackEvent extends Event {
@Native("Screen")
class Screen extends Interceptor {
Rectangle get available =>
new Rectangle(_availLeft, _availTop, _availWidth, _availHeight);
new Rectangle(_availLeft!, _availTop!, _availWidth!, _availHeight!);
// To suppress missing implicit constructor warnings.
factory Screen._() {
throw new UnsupportedError("Not supported");
@ -27580,11 +27581,11 @@ class SelectElement extends HtmlElement {
List<OptionElement> get selectedOptions {
// IE does not change the selected flag for single-selection items.
if (this.multiple) {
if (this.multiple!) {
var options = this.options.where((o) => o.selected).toList();
return new UnmodifiableListView(options);
} else {
return [this.options[this.selectedIndex]];
return [this.options[this.selectedIndex!]];
}
}
}
@ -29647,11 +29648,11 @@ class TemplateElement extends HtmlElement {
void setInnerHtml(String? html,
{NodeValidator? validator, NodeTreeSanitizer? treeSanitizer}) {
text = null;
content.nodes.clear();
content!.nodes.clear();
var fragment = createFragment(html,
validator: validator, treeSanitizer: treeSanitizer);
content.append(fragment);
content!.append(fragment);
}
}
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
@ -31857,10 +31858,9 @@ class WheelEvent extends MouseEvent {
* * [WheelEvent.deltaY](http://dev.w3.org/2006/webapi/DOM-Level-3-Events/html/DOM3-Events.html#events-WheelEvent-deltaY) from the W3C.
*/
num get deltaY {
if (JS('bool', '#.deltaY !== undefined', this)) {
// W3C WheelEvent
return this._deltaY;
}
// deltaY may be missing or undefined.
num? value = JS('', '#.deltaY', this);
if (value != null) return value;
throw new UnsupportedError('deltaY is not supported');
}
@ -31873,10 +31873,9 @@ class WheelEvent extends MouseEvent {
* * [WheelEvent.deltaX](http://dev.w3.org/2006/webapi/DOM-Level-3-Events/html/DOM3-Events.html#events-WheelEvent-deltaX) from the W3C.
*/
num get deltaX {
if (JS('bool', '#.deltaX !== undefined', this)) {
// W3C WheelEvent
return this._deltaX;
}
// deltaX may be missing or undefined.
num? value = JS('', '#.deltaX', this);
if (value != null) return value;
throw new UnsupportedError('deltaX is not supported');
}
@ -35722,12 +35721,12 @@ abstract class _AttributeMap extends MapBase<String, String> {
Iterable<String> get keys {
// TODO: generate a lazy collection instead.
var attributes = _element._attributes;
var attributes = _element._attributes!;
var keys = <String>[];
for (int i = 0, len = attributes.length; i < len; i++) {
_Attr attr = attributes[i] as _Attr;
if (_matches(attr)) {
keys.add(attr.name);
keys.add(attr.name!);
}
}
return keys;
@ -35735,12 +35734,12 @@ abstract class _AttributeMap extends MapBase<String, String> {
Iterable<String> get values {
// TODO: generate a lazy collection instead.
var attributes = _element._attributes;
var attributes = _element._attributes!;
var values = <String>[];
for (int i = 0, len = attributes.length; i < len; i++) {
_Attr attr = attributes[i] as _Attr;
if (_matches(attr)) {
values.add(attr.value);
values.add(attr.value!);
}
}
return values;
@ -40575,12 +40574,12 @@ class KeyEvent extends _WrappedEvent implements KeyboardEvent {
static EventStreamProvider<KeyEvent> keyPressEvent =
new _KeyboardEventHandler('keypress');
String get code => _parent.code;
String get code => _parent.code!;
/** True if the ctrl key is pressed during this event. */
bool get ctrlKey => _parent.ctrlKey;
int get detail => _parent.detail;
bool get isComposing => _parent.isComposing;
String get key => _parent.key;
int get detail => _parent.detail!;
bool get isComposing => _parent.isComposing!;
String get key => _parent.key!;
/**
* Accessor to the part of the keyboard that the key was pressed from (one of
* KeyLocation.STANDARD, KeyLocation.RIGHT, KeyLocation.LEFT,
@ -40662,11 +40661,11 @@ class _WrappedEvent implements Event {
_WrappedEvent(this.wrapped);
bool get bubbles => wrapped.bubbles;
bool get bubbles => wrapped.bubbles!;
bool get cancelable => wrapped.cancelable;
bool get cancelable => wrapped.cancelable!;
bool get composed => wrapped.composed;
bool get composed => wrapped.composed!;
EventTarget? get currentTarget => wrapped.currentTarget;
@ -40674,7 +40673,7 @@ class _WrappedEvent implements Event {
int get eventPhase => wrapped.eventPhase;
bool get isTrusted => wrapped.isTrusted;
bool get isTrusted => wrapped.isTrusted!;
EventTarget? get target => wrapped.target;
@ -41099,7 +41098,7 @@ class _ValidatingTreeSanitizer implements NodeTreeSanitizer {
if (element is TemplateElement) {
TemplateElement template = element;
sanitizeTree(template.content);
sanitizeTree(template.content!);
}
}

View file

@ -3023,14 +3023,14 @@ class SvgElement extends Element implements GlobalEventHandlers, NoncedElement {
children.addAll(value);
}
String get outerHtml {
String? get outerHtml {
final container = new DivElement();
final SvgElement cloned = this.clone(true) as SvgElement;
container.children.add(cloned);
return container.innerHtml;
}
String get innerHtml {
String? get innerHtml {
final container = new DivElement();
final SvgElement cloned = this.clone(true) as SvgElement;
container.children.addAll(cloned.children);

View file

@ -47,12 +47,12 @@ abstract class _AttributeMap extends MapBase<String, String> {
Iterable<String> get keys {
// TODO: generate a lazy collection instead.
var attributes = _element._attributes;
var attributes = _element._attributes!;
var keys = <String>[];
for (int i = 0, len = attributes.length; i < len; i++) {
_Attr attr = attributes[i] as _Attr;
if (_matches(attr)) {
keys.add(attr.name);
keys.add(attr.name!);
}
}
return keys;
@ -60,12 +60,12 @@ abstract class _AttributeMap extends MapBase<String, String> {
Iterable<String> get values {
// TODO: generate a lazy collection instead.
var attributes = _element._attributes;
var attributes = _element._attributes!;
var values = <String>[];
for (int i = 0, len = attributes.length; i < len; i++) {
_Attr attr = attributes[i] as _Attr;
if (_matches(attr)) {
values.add(attr.value);
values.add(attr.value!);
}
}
return values;

View file

@ -299,7 +299,7 @@ class _ValidatingTreeSanitizer implements NodeTreeSanitizer {
if (element is TemplateElement) {
TemplateElement template = element;
sanitizeTree(template.content);
sanitizeTree(template.content!);
}
}

View file

@ -188,12 +188,12 @@ class KeyEvent extends _WrappedEvent implements KeyboardEvent {
static EventStreamProvider<KeyEvent> keyPressEvent =
new _KeyboardEventHandler('keypress');
String get code => _parent.code;
String get code => _parent.code!;
/** True if the ctrl key is pressed during this event. */
bool get ctrlKey => _parent.ctrlKey;
int get detail => _parent.detail;
bool get isComposing => _parent.isComposing;
String get key => _parent.key;
int get detail => _parent.detail!;
bool get isComposing => _parent.isComposing!;
String get key => _parent.key!;
/**
* Accessor to the part of the keyboard that the key was pressed from (one of
* KeyLocation.STANDARD, KeyLocation.RIGHT, KeyLocation.LEFT,

View file

@ -15,11 +15,11 @@ class _WrappedEvent implements Event {
_WrappedEvent(this.wrapped);
bool get bubbles => wrapped.bubbles;
bool get bubbles => wrapped.bubbles!;
bool get cancelable => wrapped.cancelable;
bool get cancelable => wrapped.cancelable!;
bool get composed => wrapped.composed;
bool get composed => wrapped.composed!;
EventTarget? get currentTarget => wrapped.currentTarget;
@ -27,7 +27,7 @@ class _WrappedEvent implements Event {
int get eventPhase => wrapped.eventPhase;
bool get isTrusted => wrapped.isTrusted;
bool get isTrusted => wrapped.isTrusted!;
EventTarget? get target => wrapped.target;

View file

@ -67,6 +67,6 @@ $(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS
int get charCode native;
int get which => _which;
int$NULLABLE get which => _which;
$!MEMBERS
}

View file

@ -27,7 +27,7 @@ $!MEMBERS
@SupportedBrowser(SupportedBrowser.CHROME)
@SupportedBrowser(SupportedBrowser.FIREFOX)
Point get movement => new Point(_movementX, _movementY);
Point get movement => new Point(_movementX$NULLASSERT, _movementY$NULLASSERT);
/**
* The coordinates of the mouse pointer in target node coordinates.
@ -55,9 +55,9 @@ $!MEMBERS
Point get screen => new Point(_screenX, _screenY);
Point get layer => new Point(_layerX, _layerY);
Point get layer => new Point(_layerX$NULLASSERT, _layerY$NULLASSERT);
Point get page => new Point(_pageX, _pageY);
Point get page => new Point(_pageX$NULLASSERT, _pageY$NULLASSERT);
DataTransfer get dataTransfer => JS('DataTransfer', "#['dataTransfer']", this);

View file

@ -9,9 +9,9 @@ $(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS
Entry getAsEntry() {
Entry entry = _webkitGetAsEntry() $#NULLSAFECAST(as Entry);
if (entry.isFile)
if (entry.isFile$NULLASSERT)
applyExtension('FileEntry', entry);
else if (entry.isDirectory)
else if (entry.isDirectory$NULLASSERT)
applyExtension('DirectoryEntry', entry);
else
applyExtension('Entry', entry);

View file

@ -13,9 +13,9 @@ $!MEMBERS
values.forEach((value) {
applyExtension('Entry', value);
Entry entry = value as Entry;
if (entry.isFile)
if (entry.isFile$NULLASSERT)
applyExtension('FileEntry', entry);
else if (entry.isDirectory)
else if (entry.isDirectory$NULLASSERT)
applyExtension('DirectoryEntry', entry);
});
completer.complete(new List<Entry>.from(values));

View file

@ -805,8 +805,8 @@ $endif
/**
* Gets the position of this element relative to the client area of the page.
*/
Rectangle get client => new Rectangle(clientLeft, clientTop, clientWidth,
clientHeight);
Rectangle get client => new Rectangle(clientLeft$NULLASSERT,
clientTop$NULLASSERT, clientWidth, clientHeight);
/**
* Gets the offset of this element relative to its offsetParent.
@ -1346,14 +1346,14 @@ $endif
}
if (_parseDocument == null) {
_parseDocument = document.implementation.createHtmlDocument('');
_parseDocument = document.implementation$NULLASSERT.createHtmlDocument('');
_parseRange = _parseDocument$NULLASSERT.createRange();
// Workaround for Safari bug. Was also previously Chrome bug 229142
// - URIs are not resolved in new doc.
BaseElement base =
_parseDocument$NULLASSERT.createElement('base') $#NULLSAFECAST(as BaseElement);
base.href = document.baseUri;
base.href = document.baseUri$NULLASSERT;
_parseDocument$NULLASSERT.head$NULLASSERT.append(base);
}
@ -1456,7 +1456,7 @@ $endif
treeSanitizer: treeSanitizer));
}
}
String get innerHtml => _innerHtml;
String$NULLABLE get innerHtml => _innerHtml;
@JSName('innerText')
String get innerText native;

View file

@ -24,7 +24,7 @@ $!MEMBERS
HeadElement$NULLABLE get head => _head;
String get lastModified => _lastModified;
String$NULLABLE get lastModified => _lastModified;
String$NULLABLE get preferredStylesheetSet => _preferredStylesheetSet;
@ -35,7 +35,7 @@ $!MEMBERS
_selectedStylesheetSet = value;
}
List<StyleSheet> get styleSheets => _styleSheets;
List<StyleSheet>$NULLABLE get styleSheets => _styleSheets;
String get title => _title;

View file

@ -16,11 +16,11 @@ $!MEMBERS
List<OptionElement> get selectedOptions {
// IE does not change the selected flag for single-selection items.
if (this.multiple) {
if (this.multiple$NULLASSERT) {
var options = this.options.where((o) => o.selected).toList();
return new UnmodifiableListView(options);
} else {
return [this.options[this.selectedIndex]];
return [this.options[this.selectedIndex$NULLASSERT]];
}
}
}

View file

@ -20,10 +20,10 @@ $!MEMBERS
{NodeValidator$NULLABLE validator,
NodeTreeSanitizer$NULLABLE treeSanitizer}) {
text = null;
content.nodes.clear();
content$NULLASSERT.nodes.clear();
var fragment = createFragment(html, validator: validator,
treeSanitizer: treeSanitizer);
content.append(fragment);
content$NULLASSERT.append(fragment);
}
}

View file

@ -68,14 +68,14 @@ $(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS
children.addAll(value);
}
String get outerHtml {
String$NULLABLE get outerHtml {
final container = new DivElement();
final SvgElement cloned = this.clone(true) $#NULLSAFECAST(as SvgElement);
container.children.add(cloned);
return container.innerHtml;
}
String get innerHtml {
String$NULLABLE get innerHtml {
final container = new DivElement();
final SvgElement cloned = this.clone(true) $#NULLSAFECAST(as SvgElement);
container.children.addAll(cloned.children);

View file

@ -6,6 +6,6 @@ part of $LIBRARYNAME;
$(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS {
Rectangle get available => new Rectangle(_availLeft, _availTop, _availWidth,
_availHeight);
Rectangle get available => new Rectangle(_availLeft$NULLASSERT,
_availTop$NULLASSERT, _availWidth$NULLASSERT, _availHeight$NULLASSERT);
$!MEMBERS}

View file

@ -56,12 +56,10 @@ $!MEMBERS
* * [WheelEvent.deltaY](http://dev.w3.org/2006/webapi/DOM-Level-3-Events/html/DOM3-Events.html#events-WheelEvent-deltaY) from the W3C.
*/
num get deltaY {
if (JS('bool', '#.deltaY !== undefined', this)) {
// W3C WheelEvent
return this._deltaY;
}
throw new UnsupportedError(
'deltaY is not supported');
// deltaY may be missing or undefined.
num? value = JS('', '#.deltaY', this);
if (value != null) return value;
throw new UnsupportedError('deltaY is not supported');
}
/**
@ -73,12 +71,10 @@ $!MEMBERS
* * [WheelEvent.deltaX](http://dev.w3.org/2006/webapi/DOM-Level-3-Events/html/DOM3-Events.html#events-WheelEvent-deltaX) from the W3C.
*/
num get deltaX {
if (JS('bool', '#.deltaX !== undefined', this)) {
// W3C WheelEvent
return this._deltaX;
}
throw new UnsupportedError(
'deltaX is not supported');
// deltaX may be missing or undefined.
num? value = JS('', '#.deltaX', this);
if (value != null) return value;
throw new UnsupportedError('deltaX is not supported');
}
int get deltaMode {

View file

@ -75,7 +75,8 @@ $(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS
static Future<String> getString(String url,
{bool$NULLABLE withCredentials, void onProgress(ProgressEvent e)$NULLABLE}) {
return request(url, withCredentials: withCredentials,
onProgress: onProgress).then((HttpRequest xhr) => xhr.responseText);
onProgress: onProgress).then(
(HttpRequest xhr) => xhr.responseText$NULLASSERT);
}
/**
@ -217,15 +218,16 @@ $(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS
}
xhr.onLoad.listen((e) {
var accepted = xhr.status >= 200 && xhr.status < 300;
var fileUri = xhr.status == 0; // file:// URIs have status of 0.
var notModified = xhr.status == 304;
var status = xhr.status$NULLASSERT;
var accepted = status >= 200 && status < 300;
var fileUri = status == 0; // file:// URIs have status of 0.
var notModified = status == 304;
// Redirect status is specified up to 307, but others have been used in
// practice. Notably Google Drive uses 308 Resume Incomplete for
// resumable uploads, and it's also been used as a redirect. The
// redirect case will be handled by the browser before it gets to us,
// so if we see it we should pass it through to the user.
var unknownRedirect = xhr.status > 307 && xhr.status < 400;
var unknownRedirect = status > 307 && status < 400;
if (accepted || fileUri || notModified || unknownRedirect) {
completer.complete(xhr);
@ -292,7 +294,7 @@ $(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS
{String$NULLABLE method, String$NULLABLE sendData}) {
if (supportsCrossOrigin) {
return request(url, method: method, sendData: sendData).then((xhr) {
return xhr.responseText;
return xhr.responseText$NULLASSERT;
});
}
var completer = new Completer<String>();