Index: runtime/lib/convert_patch.dart |
diff --git a/runtime/lib/convert_patch.dart b/runtime/lib/convert_patch.dart |
index 3c50f2ac27b3e5333a8e0ae553606db16e2abaed..d4acc18a55dae6fd2575946215a18f1f4ad6ca23 100644 |
--- a/runtime/lib/convert_patch.dart |
+++ b/runtime/lib/convert_patch.dart |
@@ -23,12 +23,14 @@ patch _parseJson(String json, reviver(var key, var value)) { |
patch class Utf8Decoder { |
/* patch */ |
- Converter<List<int>, dynamic> fuse(Converter<String, dynamic> next) { |
+ Converter<List<int>, dynamic/*=T*/> fuse/*<T>*/( |
+ Converter<String, dynamic/*=T*/> next) { |
if (next is JsonDecoder) { |
- return new _JsonUtf8Decoder(next._reviver, this._allowMalformed); |
+ return new _JsonUtf8Decoder(next._reviver, this._allowMalformed) |
+ as dynamic/*=Converter<List<int>, T>*/; |
} |
// TODO(lrn): Recognize a fused decoder where the next step is JsonDecoder. |
- return super.fuse(next); |
+ return super.fuse/*<T>*/(next); |
} |
// Allow intercepting of UTF-8 decoding when built-in lists are passed. |
@@ -39,8 +41,7 @@ patch class Utf8Decoder { |
} |
} |
-class _JsonUtf8Decoder extends |
- ChunkedConverter<List<int>, Object, List<int>, Object> { |
+class _JsonUtf8Decoder extends Converter<List<int>, Object> { |
final _Reviver _reviver; |
final bool _allowMalformed; |