Fixing a number of Dart2JS compiler warnings.

sdk/lib/html/dart2js/html_dart2js.dart

 /// The Dart HTML library.
 library dart.dom.html;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:_collection-dev' hide Symbol;
 import 'dart:html_common';
 import 'dart:indexed_db';
 import 'dart:isolate';
 import 'dart:json' as json;
@@ skipping 1112 matching lines @@
   void clip([String winding]) native;
 
   @DomName('CanvasRenderingContext2D.closePath')
   @DocsEditable
   void closePath() native;
 
   @DomName('CanvasRenderingContext2D.createImageData')
   @DocsEditable
   @Creates('ImageData|=Object')
   ImageData createImageData(num sw, num sh) {
-    return _convertNativeToDart_ImageData(_createImageData_1(sw, sh));
+    return convertNativeToDart_ImageData(_createImageData_1(sw, sh));
   }
   @JSName('createImageData')
   @DomName('CanvasRenderingContext2D.createImageData')
   @DocsEditable
   @Creates('ImageData|=Object')
   _createImageData_1(sw, sh) native;
 
   @DomName('CanvasRenderingContext2D.createImageData')
   @DocsEditable
   @Creates('ImageData|=Object')
   ImageData createImageDataFromImageData(ImageData imagedata) {
-    var imagedata_1 = _convertDartToNative_ImageData(imagedata);
-    return _convertNativeToDart_ImageData(_createImageDataFromImageData_1(imagedata_1));
+    var imagedata_1 = convertDartToNative_ImageData(imagedata);
+    return convertNativeToDart_ImageData(_createImageDataFromImageData_1(imagedata_1));
   }
   @JSName('createImageData')
   @DomName('CanvasRenderingContext2D.createImageData')
   @DocsEditable
   @Creates('ImageData|=Object')
   _createImageDataFromImageData_1(imagedata) native;
 
   @DomName('CanvasRenderingContext2D.createLinearGradient')
   @DocsEditable
   CanvasGradient createLinearGradient(num x0, num y0, num x1, num y1) native;
@@ skipping 21 matching lines @@
   @DomName('CanvasRenderingContext2D.getContextAttributes')
   @DocsEditable
   // http://wiki.whatwg.org/wiki/CanvasOpaque#Suggested_IDL
   @Experimental
   Canvas2DContextAttributes getContextAttributes() native;
 
   @DomName('CanvasRenderingContext2D.getImageData')
   @DocsEditable
   @Creates('ImageData|=Object')
   ImageData getImageData(num sx, num sy, num sw, num sh) {
-    return _convertNativeToDart_ImageData(_getImageData_1(sx, sy, sw, sh));
+    return convertNativeToDart_ImageData(_getImageData_1(sx, sy, sw, sh));
   }
   @JSName('getImageData')
   @DomName('CanvasRenderingContext2D.getImageData')
   @DocsEditable
   @Creates('ImageData|=Object')
   _getImageData_1(sx, sy, sw, sh) native;
 
   @DomName('CanvasRenderingContext2D.getLineDash')
   @DocsEditable
   List<num> getLineDash() native;
@@ skipping 15 matching lines @@
   TextMetrics measureText(String text) native;
 
   @DomName('CanvasRenderingContext2D.moveTo')
   @DocsEditable
   void moveTo(num x, num y) native;
 
   @DomName('CanvasRenderingContext2D.putImageData')
   @DocsEditable
   void putImageData(ImageData imagedata, num dx, num dy, [num dirtyX, num dirtyY, num dirtyWidth, num dirtyHeight]) {
     if (dirtyX == null && dirtyY == null && dirtyWidth == null && dirtyHeight == null) {
-      var imagedata_1 = _convertDartToNative_ImageData(imagedata);
+      var imagedata_1 = convertDartToNative_ImageData(imagedata);
       _putImageData_1(imagedata_1, dx, dy);
       return;
     }
     if (dirtyHeight != null && dirtyWidth != null && dirtyY != null && dirtyX != null) {
-      var imagedata_2 = _convertDartToNative_ImageData(imagedata);
+      var imagedata_2 = convertDartToNative_ImageData(imagedata);
       _putImageData_2(imagedata_2, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeight);
       return;
     }
     throw new ArgumentError("Incorrect number or type of arguments");
   }
   @JSName('putImageData')
   @DomName('CanvasRenderingContext2D.putImageData')
   @DocsEditable
   void _putImageData_1(imagedata, dx, dy) native;
   @JSName('putImageData')
@@ skipping 53 matching lines @@
   @DocsEditable
   void translate(num tx, num ty) native;
 
   @DomName('CanvasRenderingContext2D.webkitGetImageDataHD')
   @DocsEditable
   @SupportedBrowser(SupportedBrowser.CHROME)
   @SupportedBrowser(SupportedBrowser.SAFARI)
   @Experimental
   @Creates('ImageData|=Object')
   ImageData getImageDataHD(num sx, num sy, num sw, num sh) {
-    return _convertNativeToDart_ImageData(_getImageDataHD_1(sx, sy, sw, sh));
+    return convertNativeToDart_ImageData(_getImageDataHD_1(sx, sy, sw, sh));
   }
   @JSName('webkitGetImageDataHD')
   @DomName('CanvasRenderingContext2D.webkitGetImageDataHD')
   @DocsEditable
   @SupportedBrowser(SupportedBrowser.CHROME)
   @SupportedBrowser(SupportedBrowser.SAFARI)
   @Experimental
   @Creates('ImageData|=Object')
   _getImageDataHD_1(sx, sy, sw, sh) native;
 
   @DomName('CanvasRenderingContext2D.webkitPutImageDataHD')
   @DocsEditable
   @SupportedBrowser(SupportedBrowser.CHROME)
   @SupportedBrowser(SupportedBrowser.SAFARI)
   @Experimental
   void putImageDataHD(ImageData imagedata, num dx, num dy, [num dirtyX, num dirtyY, num dirtyWidth, num dirtyHeight]) {
     if (dirtyX == null && dirtyY == null && dirtyWidth == null && dirtyHeight == null) {
-      var imagedata_1 = _convertDartToNative_ImageData(imagedata);
+      var imagedata_1 = convertDartToNative_ImageData(imagedata);
       _putImageDataHD_1(imagedata_1, dx, dy);
       return;
     }
     if (dirtyHeight != null && dirtyWidth != null && dirtyY != null && dirtyX != null) {
-      var imagedata_2 = _convertDartToNative_ImageData(imagedata);
+      var imagedata_2 = convertDartToNative_ImageData(imagedata);
       _putImageDataHD_2(imagedata_2, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeight);
       return;
     }
     throw new ArgumentError("Incorrect number or type of arguments");
   }
   @JSName('webkitPutImageDataHD')
   @DomName('CanvasRenderingContext2D.webkitPutImageDataHD')
   @DocsEditable
   @SupportedBrowser(SupportedBrowser.CHROME)
   @SupportedBrowser(SupportedBrowser.SAFARI)
@@ skipping 6483 matching lines @@
    *     document.body.insertAdjacentHtml('afterBegin', html);
    *     var createdElement = document.body.children[0];
    *     print(createdElement.classes[0]); // Prints 'something'
    *
    * See also:
    *
    * * [insertAdjacentText]
    * * [insertAdjacentElement]
    */
   void insertAdjacentHtml(String where, String html) {
-    if (JS('bool', '!!#.insertAdjacentHtml', this)) {
+    if (JS('bool', '!!#.insertAdjacentHTML', this)) {
       _insertAdjacentHtml(where, html);
     } else {
       _insertAdjacentNode(where, new DocumentFragment.html(html));
     }
   }
 
   @JSName('insertAdjacentHTML')
-  void _insertAdjacentHTML(String where, String text) native;
+  void _insertAdjacentHtml(String where, String text) native;
 
   /**
    * Inserts [element] into the DOM at the specified location.
    *
    * To see the possible values for [where], read the doc for
    * [insertAdjacentHtml].
    *
    * See also:
    *
    * * [insertAdjacentHtml]
@@ skipping 3090 matching lines @@
    * * [pushState]
    * * [replaceState]
    * * [state]
    */
   static bool get supportsState => JS('bool', '!!window.history.pushState');
 
   @DomName('History.length')
   @DocsEditable
   final int length;
 
-  dynamic get state => _convertNativeToDart_SerializedScriptValue(this._get_state);
+  dynamic get state => convertNativeToDart_SerializedScriptValue(this._get_state);
   @JSName('state')
   @DomName('History.state')
   @DocsEditable
   @annotation_Creates_SerializedScriptValue
   @annotation_Returns_SerializedScriptValue
   final dynamic _get_state;
 
   @DomName('History.back')
   @DocsEditable
   void back() native;
@@ skipping 12453 matching lines @@
   String _returnValue;
 
   _BeforeUnloadEvent(Event base): super(base);
 
   String get returnValue => _returnValue;
 
   void set returnValue(String value) {
     _returnValue = value;
     // FF and IE use the value as the return value, Chrome will return this from
     // the event callback function.
-    if (JS('bool', '("returnValue" in #)', _base)) {
-      JS('void', '#.returnValue = #', _base, value);
+    if (JS('bool', '("returnValue" in #)', wrapped)) {
+      JS('void', '#.returnValue = #', wrapped, value);
     }
   }
 }
 
 class _BeforeUnloadEventStreamProvider implements
     EventStreamProvider<BeforeUnloadEvent> {
   final String _eventType;
 
   const _BeforeUnloadEventStreamProvider(this._eventType);
 
@@ skipping 5553 matching lines @@
     return e;
 }
 
 EventTarget _convertDartToNative_EventTarget(e) {
   if (e is _DOMWindowCrossFrame) {
     return e._window;
   } else {
     return e;
   }
 }
-
-// Conversions for ImageData
-//
-// On Firefox, the returned ImageData is a plain object.
-
-class _TypedImageData implements ImageData {
-  final Uint8ClampedList data;
-  final int height;
-  final int width;
-
-  _TypedImageData(this.data, this.height, this.width);
-}
-
-ImageData _convertNativeToDart_ImageData(nativeImageData) {
-
-  // None of the native getters that return ImageData have the type ImageData
-  // since that is incorrect for FireFox (which returns a plain Object).  So we
-  // need something that tells the compiler that the ImageData class has been
-  // instantiated.
-  // TODO(sra): Remove this when all the ImageData returning APIs have been
-  // annotated as returning the union ImageData + Object.
-  JS('ImageData', '0');
-
-  if (nativeImageData is ImageData) return nativeImageData;
-
-  // On Firefox the above test fails because imagedata is a plain object.
-  // So we create a _TypedImageData.
-
-  return new _TypedImageData(
-      JS('var', '#.data', nativeImageData),
-      JS('var', '#.height', nativeImageData),
-      JS('var', '#.width', nativeImageData));
-}
-
-// We can get rid of this conversion if _TypedImageData implements the fields
-// with native names.
-_convertDartToNative_ImageData(ImageData imageData) {
-  if (imageData is _TypedImageData) {
-    return JS('', '{data: #, height: #, width: #}',
-        imageData.data, imageData.height, imageData.width);
-  }
-  return imageData;
-}
 // 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
 // BSD-style license that can be found in the LICENSE file.
 
 
 // TODO(vsm): Unify with Dartium version.
 class _DOMWindowCrossFrame implements WindowBase {
   // Private window.  Note, this is a window in another frame, so it
   // cannot be typed as "Window" as its prototype is not patched
   // properly.  Its fields and methods can only be accessed via JavaScript.
@@ skipping 349 matching lines @@
       _position = nextPosition;
       return true;
     }
     _current = null;
     _position = _array.length;
     return false;
   }
 
   T get current => _current;
 }