commit 90037e1f9417cc77ffc5b5343f3688d58d7fa8ab
author dgrove@google.com <dgrove@google.com> Tue Mar 19 21:06:32 2013 +0000
committer dgrove@google.com <dgrove@google.com> Wed May 27 13:20:58 2015 -0700
tree 372dd63e2995bbf1f0ce681934cb27602d26ede4
parent 747c13465ed09e635c98d99e567b9c445e1a0ba9

Version 0.4.2.7 .

svn merge -c 20232 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 20239 https://dart.googlecode.com/svn/branches/bleeding_edge trunk

git-svn-id: http://dart.googlecode.com/svn/trunk@20244 260f80e4-7a28-3924-810f-c04153c831b5

sdk/lib/html/dart2js/html_dart2js.dart

diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart
index 95f3947..c18ae9a 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -11476,7 +11476,7 @@
 
 @DocsEditable
 @DomName('Float32Array')
-class Float32Array extends ArrayBufferView implements JavaScriptIndexingBehavior, List<num> native "*Float32Array" {
+class Float32Array extends ArrayBufferView implements JavaScriptIndexingBehavior, List<double> native "*Float32Array" {
 
   @DomName('Float32Array.Float32Array')
   @DocsEditable
@@ -11708,7 +11708,7 @@
 
 @DocsEditable
 @DomName('Float64Array')
-class Float64Array extends ArrayBufferView implements JavaScriptIndexingBehavior, List<num> native "*Float64Array" {
+class Float64Array extends ArrayBufferView implements JavaScriptIndexingBehavior, List<double> native "*Float64Array" {
 
   @DomName('Float64Array.Float64Array')
   @DocsEditable

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 a35d5d8..5904236 100644
--- a/sdk/lib/html/dartium/html_dartium.dart
+++ b/sdk/lib/html/dartium/html_dartium.dart
@@ -12199,7 +12199,7 @@
 
 @DocsEditable
 @DomName('Float32Array')
-class Float32Array extends ArrayBufferView implements List<num> {
+class Float32Array extends ArrayBufferView implements List<double> {
   Float32Array.internal() : super.internal();
 
   @DomName('Float32Array.Float32Array')
@@ -12448,7 +12448,7 @@
 
 @DocsEditable
 @DomName('Float64Array')
-class Float64Array extends ArrayBufferView implements List<num> {
+class Float64Array extends ArrayBufferView implements List<double> {
   Float64Array.internal() : super.internal();
 
   @DomName('Float64Array.Float64Array')

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index f21ea86..bed1eb1 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -1,4 +1,4 @@
 MAJOR 0
 MINOR 4
 BUILD 2
-PATCH 6
+PATCH 7

tools/dom/scripts/htmldartgenerator.py

diff --git a/tools/dom/scripts/htmldartgenerator.py b/tools/dom/scripts/htmldartgenerator.py
index cebafab..fef2cac 100644
--- a/tools/dom/scripts/htmldartgenerator.py
+++ b/tools/dom/scripts/htmldartgenerator.py
@@ -338,8 +338,8 @@
     implements = []
     if self._interface_type_info.is_typed_array():
       element_type = self._interface_type_info.list_item_type()
-      implements.append('List<%s>' % self._DartType(element_type))
-    if self._interface_type_info.list_item_type():
+      implements.append('List<%s>' % element_type)
+    elif self._interface_type_info.list_item_type():
       item_type_info = self._type_registry.TypeInfo(
           self._interface_type_info.list_item_type())
       implements.append('List<%s>' % item_type_info.dart_type())