Merge the two buffer list implementations

runtime/bin/socket_stream.dart

 // Copyright (c) 2011, 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 SocketInputStream implements InputStream {
   SocketInputStream(Socket socket) {
     _socket = socket;
   }
 
   List<int> read([int len]) {
@@ skipping 36 matching lines @@
   }
 
   void set errorHandler(void callback()) {
     _socket.errorHandler = callback;
   }
 
   Socket _socket;
 }
 
 
-class _BufferList2 {
-  _BufferList2() {
-    clear();
-  }
-
-  // Adds a new buffer to the list possibly with an offset of the
-  // first byte of interest. The offset can only be specified if the
-  // buffer list is empty.
-  void add(List<int> buffer, [int offset = 0]) {
-    assert(offset == 0 || _buffers.isEmpty());
-    _buffers.addLast(buffer);
-    _length += buffer.length - offset;
-    if (offset != 0) _index = offset;
-  }
-
-  List<int> get first() => _buffers.first();
-  int get index() => _index;
-
-  void removeBytes(int count) {
-    int firstRemaining = first.length - _index;
-    assert(count <= firstRemaining);
-    if (count == firstRemaining) {
-      _buffers.removeFirst();
-      _index = 0;
-    } else {
-      _index += count;
-    }
-    _length -= count;
-  }
-
-  int get length() => _length;
-
-  bool isEmpty() => _buffers.isEmpty();
-
-  void clear() {
-    _index = 0;
-    _length = 0;
-    _buffers = new Queue();
-  }
-
-  int _length;  // Total length of pending data.
-  Queue<List<int>> _buffers;
-  int _index;  // Offset into the first buffer of next write position.
-}
-
-
 class SocketOutputStream implements OutputStream {
   SocketOutputStream(Socket socket)
-      : _socket = socket, _pendingWrites = new _BufferList2() {
+      : _socket = socket, _pendingWrites = new _BufferList() {
     _socket.writeHandler = _writeHandler;
     _socket.errorHandler = _errorHandler;
   }
 
     bool write(List<int> buffer, [bool copyBuffer = true]) {
     return _write(buffer, 0, buffer.length, copyBuffer);
   }
 
   bool writeFrom(List<int> buffer, [int offset = 0, int len]) {
     return _write(
@@ skipping 76 matching lines @@
       if (_noPendingWriteHandler != null) _noPendingWriteHandler();
     }
   }
 
   void _errorHandler() {
     close();
     if (_streamErrorHandler != null) _streamErrorHandler();
   }
 
   Socket _socket;
-  _BufferList2 _pendingWrites;
+  _BufferList _pendingWrites;
   var _noPendingWriteHandler;
   var _streamErrorHandler;
   bool _closing = false;
   bool _closed = false;
 }