Minor changes to the dart:io library files.

runtime/bin/list_stream_impl.dart

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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.
 
-class ListInputStream extends _BaseDataInputStream implements InputStream {
-  ListInputStream(List<int> this._buffer) {
-    _streamMarkedClosed = true;
-  }
-
-  int available() => _buffer.length - _offset;
-
-  List<int> _read(int bytesToRead) {
-    if (_offset == 0 && bytesToRead == _buffer.length) {
-      _offset = _buffer.length;
-      return _buffer;
-    } else {
-      List<int> result = _buffer.getRange(_offset, bytesToRead);
-      _offset += bytesToRead;
-      return result;
-    }
-  }
-
-  int _readInto(List<int> buffer, int offset, int bytesToRead) {
-    buffer.setRange(offset, bytesToRead, _buffer, _offset);
-    _offset += bytesToRead;
-    return bytesToRead;
-  }
-
-  void _close() {
-    _offset = _buffer.length;
-  }
-
-  List<int> _buffer;
-  int _offset = 0;
-}
-
-
-class DynamicListInputStream
-    extends _BaseDataInputStream implements InputStream {
-  DynamicListInputStream() : _bufferList = new _BufferList();
-
-  int available() => _bufferList.length;
+/**
+ * Default implementation of [ListInputStream].
+ */
+class _ListInputStream extends _BaseDataInputStream implements ListInputStream {
+  _ListInputStream() : _bufferList = new _BufferList();
 
   void write(List<int> data) {
     if (_streamMarkedClosed) {
       throw new StreamException.streamClosed();
     }
     _bufferList.add(data);
     _checkScheduleCallbacks();
   }
 
   void markEndOfStream() {
     _streamMarkedClosed = true;
     _checkScheduleCallbacks();
   }
 
+  int available() => _bufferList.length;
+
   List<int> _read(int bytesToRead) {
     return _bufferList.readBytes(bytesToRead);
   }
 
   int _readInto(List<int> buffer, int offset, int bytesToRead) {
-    List<int> tmp = _bufferList.readBytes(byteToRead);
-    buffer.setRange(offset, bytesToRead, tmp, _offset);
+    List<int> tmp = _bufferList.readBytes(bytesToRead);
+    buffer.setRange(offset, bytesToRead, tmp, 0);
     return bytesToRead;
   }
 
   void _close() {
     _streamMarkedClosed = true;
     _bufferList.clear();
   }
 
   _BufferList _bufferList;
 }
 
 
-class ListOutputStream implements OutputStream {
-  ListOutputStream() : _bufferList = new _BufferList();
+class _ListOutputStream implements ListOutputStream {
+  _ListOutputStream() : _bufferList = new _BufferList();
+
+  List<int> contents() => _bufferList.readBytes(_bufferList.length);
 
   bool write(List<int> buffer, [bool copyBuffer = false]) {
     if (_streamMarkedClosed) throw new StreamException.streamClosed();
     if (copyBuffer) {
       _bufferList.add(buffer.getRange(0, buffer.length));
     } else {
       _bufferList.add(buffer);
     }
     return true;
   }
@@ skipping 20 matching lines @@
   }
 
   void set closeHandler(void callback()) {
     _clientCloseHandler = callback;
   }
 
   void set errorHandler(void callback()) {
     // No errors emitted.
   }
 
-  List<int> contents() => _bufferList.readBytes(_bufferList.length);
-
   void _checkScheduleCallbacks() {
     void issueNoPendingWriteCallback(Timer timer) {
       _scheduledNoPendingWriteCallback = null;
       if (_clientNoPendingWriteHandler !== null) {
         _clientNoPendingWriteHandler();
         _checkScheduleCallbacks();
       }
     }
 
     void issueCloseCallback(Timer timer) {
@@ skipping 22 matching lines @@
   }
 
   _BufferList _bufferList;
   bool _streamMarkedClosed = false;
   bool _closeCallbackCalled = false;
   Timer _scheduledNoPendingWriteCallback;
   Timer _scheduledCloseCallback;
   Function _clientNoPendingWriteHandler;
   Function _clientCloseHandler;
 }