dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "Workaround for canPlayType in Dartium"

Browse Source 
This keeps the test.

R=leafp@google.com

Review URL: https://codereview.chromium.org//748883004

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@42089 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
vsm@google.com
2014-12-03 19:25:35 +00:00
parent 01b3346d7c
commit b4cfeafc5e
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdk/lib/html/dart2js/html_dart2js.dart
+5 -5
View File
@@ -19449,6 +19449,11 @@ class MediaElement extends HtmlElement {
@Experimental()
TextTrack addTextTrack(String kind, [String label, String language]) native;
@DomName('HTMLMediaElement.canPlayType')
@DocsEditable()
@Unstable()
String canPlayType(String type, [String keySystem]) native;
@DomName('HTMLMediaElement.load')
@DocsEditable()
void load() native;
@@ -19520,11 +19525,6 @@ class MediaElement extends HtmlElement {
// https://dvcs.w3.org/hg/html-media/raw-file/eme-v0.1/encrypted-media/encrypted-media.html#dom-keyadded
@Experimental()
ElementStream<MediaKeyEvent> get onNeedKey => needKeyEvent.forElement(this);
@DomName('HTMLMediaElement.canPlayType')
@DocsEditable()
@Unstable()
String canPlayType(String type, [String keySystem]) native;
}
// 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
sdk/lib/html/dartium/html_dartium.dart
+11 -11
View File
@@ -21059,6 +21059,8 @@ typedef void MediaDeviceInfoCallback(List<MediaDeviceInfo> devices);
// 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('HTMLMediaElement')
@@ -21381,6 +21383,13 @@ class MediaElement extends HtmlElement {
return _blink.BlinkHTMLMediaElement.instance.addTextTrack_Callback_1_(this, kind);
}
String canPlayType(String type, [String keySystem]) {
if (keySystem != null) {
return _blink.BlinkHTMLMediaElement.instance.canPlayType_Callback_2_(this, type, keySystem);
}
return _blink.BlinkHTMLMediaElement.instance.canPlayType_Callback_1_(this, type);
}
@DomName('HTMLMediaElement.load')
@DocsEditable()
void load() => _blink.BlinkHTMLMediaElement.instance.load_Callback_0_(this);
@@ -21452,15 +21461,6 @@ class MediaElement extends HtmlElement {
@Experimental()
ElementStream<MediaKeyEvent> get onNeedKey => needKeyEvent.forElement(this);
@DomName('HTMLMediaElement.canPlayType')
@DocsEditable()
@Unstable()
String canPlayType(String type, [String keySystem]) {
if (keySystem != null) {
return _blink.BlinkHTMLMediaElement.instance.canPlayType_Callback_2_(this, type, keySystem);
}
return _blink.BlinkHTMLMediaElement.instance.canPlayType_Callback_2_(this, type, null);
}
}
// 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
@@ -31426,10 +31426,10 @@ class Url extends NativeFieldWrapperClass2 implements UrlUtils {
if ((blob_OR_source_OR_stream is Blob || blob_OR_source_OR_stream == null)) {
return _blink.BlinkURL.instance.createObjectURL_Callback_1_(blob_OR_source_OR_stream);
}
if ((blob_OR_source_OR_stream is MediaSource)) {
if ((blob_OR_source_OR_stream is MediaStream)) {
return _blink.BlinkURL.instance.createObjectURL_Callback_1_(blob_OR_source_OR_stream);
}
if ((blob_OR_source_OR_stream is MediaStream)) {
if ((blob_OR_source_OR_stream is MediaSource)) {
return _blink.BlinkURL.instance.createObjectURL_Callback_1_(blob_OR_source_OR_stream);
}
throw new ArgumentError("Incorrect number or type of arguments");
tools/dom/scripts/htmlrenamer.py
-1
View File
@@ -708,7 +708,6 @@ removed_html_members = monitored.Set('htmlrenamer.removed_html_members', [
'HTMLLinkElement.rev',
'HTMLLinkElement.target',
'HTMLMarqueeElement.*',
'HTMLMediaElement.canPlayType',
'HTMLMenuElement.compact',
'HTMLMetaElement.scheme',
'HTMLOListElement.compact',