| OLD | NEW |
| 1 part of dart.convert; | 1 part of dart.convert; |
| 2 | 2 abstract class ByteConversionSink extends ChunkedConversionSink<List<int>> {Byt
eConversionSink(); |
| 3 abstract class ByteConversionSink extends ChunkedConversionSink<List<int>> { | 3 factory ByteConversionSink.withCallback(void callback(List<int> accumulated)) =
_ByteCallbackSink; |
| 4 ByteConversionSink(); | 4 factory ByteConversionSink.from(Sink<List<int>> sink) = _ByteAdapterSink; |
| 5 factory ByteConversionSink.withCallback( | 5 void addSlice(List<int> chunk, int start, int end, bool isLast); |
| 6 void callback(List<int> accumulated)) = _ByteCallbackSink; | |
| 7 factory ByteConversionSink.from(Sink<List<int>> sink) = _ByteAdapterSink; | |
| 8 void addSlice(List<int> chunk, int start, int end, bool isLast); | |
| 9 } | 6 } |
| 10 abstract class ByteConversionSinkBase extends ByteConversionSink { | 7 abstract class ByteConversionSinkBase extends ByteConversionSink {void add(List
<int> chunk); |
| 11 void add(List<int> chunk); | 8 void close(); |
| 12 void close(); | 9 void addSlice(List<int> chunk, int start, int end, bool isLast) { |
| 13 void addSlice(List<int> chunk, int start, int end, bool isLast) { | 10 add(chunk.sublist(start, end)); |
| 14 add(chunk.sublist(start, end)); | 11 if (isLast) close(); |
| 15 if (isLast) close(); | |
| 16 } | |
| 17 } | 12 } |
| 18 class _ByteAdapterSink extends ByteConversionSinkBase { | |
| 19 final Sink<List<int>> _sink; | |
| 20 _ByteAdapterSink(this._sink); | |
| 21 void add(List<int> chunk) => _sink.add(chunk); | |
| 22 void close() => _sink.close(); | |
| 23 } | 13 } |
| 24 class _ByteCallbackSink extends ByteConversionSinkBase { | 14 class _ByteAdapterSink extends ByteConversionSinkBase {final Sink<List<int>> _s
ink; |
| 25 static const _INITIAL_BUFFER_SIZE = 1024; | 15 _ByteAdapterSink(this._sink); |
| 26 final _ChunkedConversionCallback<List<int>> _callback; | 16 void add(List<int> chunk) => _sink.add(chunk); |
| 27 List<int> _buffer = new Uint8List(_INITIAL_BUFFER_SIZE); | 17 void close() => _sink.close(); |
| 28 int _bufferIndex = 0; | |
| 29 _ByteCallbackSink(void callback(List<int> accumulated)) | |
| 30 : this._callback = callback; | |
| 31 void add(Iterable<int> chunk) { | |
| 32 int freeCount = _buffer.length - _bufferIndex; | |
| 33 if (chunk.length > freeCount) { | |
| 34 int oldLength = _buffer.length; | |
| 35 int newLength = _roundToPowerOf2(chunk.length + oldLength) * 2; | |
| 36 List<int> grown = new Uint8List(newLength); | |
| 37 grown.setRange(0, _buffer.length, _buffer); | |
| 38 _buffer = grown; | |
| 39 } | |
| 40 _buffer.setRange(_bufferIndex, _bufferIndex + chunk.length, chunk); | |
| 41 _bufferIndex += chunk.length; | |
| 42 } | |
| 43 static int _roundToPowerOf2(int v) { | |
| 44 assert(v > 0); | |
| 45 v--; | |
| 46 v |= v >> 1; | |
| 47 v |= v >> 2; | |
| 48 v |= v >> 4; | |
| 49 v |= v >> 8; | |
| 50 v |= v >> 16; | |
| 51 v++; | |
| 52 return v; | |
| 53 } | |
| 54 void close() { | |
| 55 _callback(_buffer.sublist(0, _bufferIndex)); | |
| 56 } | |
| 57 } | 18 } |
| 19 class _ByteCallbackSink extends ByteConversionSinkBase {static const _INITIAL_B
UFFER_SIZE = 1024; |
| 20 final _ChunkedConversionCallback<List<int>> _callback; |
| 21 List<int> _buffer = new Uint8List(_INITIAL_BUFFER_SIZE); |
| 22 int _bufferIndex = 0; |
| 23 _ByteCallbackSink(void callback(List<int> accumulated)) : this._callback = call
back; |
| 24 void add(Iterable<int> chunk) { |
| 25 int freeCount = _buffer.length - _bufferIndex; |
| 26 if (chunk.length > freeCount) { |
| 27 int oldLength = _buffer.length; |
| 28 int newLength = _roundToPowerOf2(chunk.length + oldLength) * 2; |
| 29 List<int> grown = new Uint8List(newLength); |
| 30 grown.setRange(0, _buffer.length, _buffer); |
| 31 _buffer = grown; |
| 32 } |
| 33 _buffer.setRange(_bufferIndex, _bufferIndex + chunk.length, chunk); |
| 34 _bufferIndex += chunk.length; |
| 35 } |
| 36 static int _roundToPowerOf2(int v) { |
| 37 assert (v > 0); v--; |
| 38 v |= v >> 1; |
| 39 v |= v >> 2; |
| 40 v |= v >> 4; |
| 41 v |= v >> 8; |
| 42 v |= v >> 16; |
| 43 v++; |
| 44 return v; |
| 45 } |
| 46 void close() { |
| 47 _callback(_buffer.sublist(0, _bufferIndex)); |
| 48 } |
| 49 } |
| OLD | NEW |