languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-05 16:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix HTMLCanvasElement.getContext it can return RenderingContext2 now which will be tree shaken without this annotation.

Browse source 
R=alanknight@google.com,sigmund@google.com

Review-Url: https://codereview.chromium.org/2932793002 .
This commit is contained in:
Terry Lucas 2017-06-08 20:44:23 -07:00
parent cf59b1a0f9
commit 3cbacefbe3
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sdk/lib/html/dart2js/html_dart2js.dart
View file

@ -39,7 +39,7 @@ import 'dart:svg' show Matrix;
import 'dart:svg' show SvgSvgElement;
import 'dart:web_audio' as web_audio;
import 'dart:web_gl' as gl;
import 'dart:web_gl' show RenderingContext;
import 'dart:web_gl' show RenderingContext, RenderingContext2;
import 'dart:web_sql';
import 'dart:_isolate_helper' show IsolateNatives;
import 'dart:_foreign_helper' show JS, JS_INTERCEPTOR_CONSTANT;
@ -2023,8 +2023,8 @@ class CanvasElement extends HtmlElement implements CanvasImageSource {
@DomName('HTMLCanvasElement.getContext')
@DocsEditable()
@Creates('CanvasRenderingContext2D|RenderingContext')
@Returns('CanvasRenderingContext2D|RenderingContext|Null')
@Creates('CanvasRenderingContext2D|RenderingContext|RenderingContext2')
@Returns('CanvasRenderingContext2D|RenderingContext|RenderingContext2|Null')
Object getContext(String contextId, [Map attributes]) {
if (attributes != null) {
var attributes_1 = convertDartToNative_Dictionary(attributes);
@ -2036,14 +2036,14 @@ class CanvasElement extends HtmlElement implements CanvasImageSource {
@JSName('getContext')
@DomName('HTMLCanvasElement.getContext')
@DocsEditable()
@Creates('CanvasRenderingContext2D|RenderingContext')
@Returns('CanvasRenderingContext2D|RenderingContext|Null')
@Creates('CanvasRenderingContext2D|RenderingContext|RenderingContext2')
@Returns('CanvasRenderingContext2D|RenderingContext|RenderingContext2|Null')
Object _getContext_1(contextId, attributes) native;
@JSName('getContext')
@DomName('HTMLCanvasElement.getContext')
@DocsEditable()
@Creates('CanvasRenderingContext2D|RenderingContext')
@Returns('CanvasRenderingContext2D|RenderingContext|Null')
@Creates('CanvasRenderingContext2D|RenderingContext|RenderingContext2')
@Returns('CanvasRenderingContext2D|RenderingContext|RenderingContext2|Null')
Object _getContext_2(contextId) native;
@DomName('HTMLCanvasElement.toBlob')

4
tools/dom/scripts/dartmetadata.py
View file

@ -192,8 +192,8 @@ _dart2js_annotations = monitored.Dict('dartmetadata._dart2js_annotations', {
],
'HTMLCanvasElement.getContext': [
"@Creates('CanvasRenderingContext2D|RenderingContext')",
"@Returns('CanvasRenderingContext2D|RenderingContext|Null')",
"@Creates('CanvasRenderingContext2D|RenderingContext|RenderingContext2')",
"@Returns('CanvasRenderingContext2D|RenderingContext|RenderingContext2|Null')",
],
'HTMLInputElement.valueAsDate': [

2
tools/dom/templates/html/dart2js/html_dart2js.darttemplate
View file

@ -48,7 +48,7 @@ import 'dart:svg' show Matrix;
import 'dart:svg' show SvgSvgElement;
import 'dart:web_audio' as web_audio;
import 'dart:web_gl' as gl;
import 'dart:web_gl' show RenderingContext;
import 'dart:web_gl' show RenderingContext,RenderingContext2;
import 'dart:web_sql';
import 'dart:_js_helper' show
convertDartClosureToJS, Creates, JavaScriptIndexingBehavior,