More cleanup in preparation for removing support for dart:scalarlist in the VM.

runtime/vm/raw_object.h

 // 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.
 
 #ifndef VM_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 696 matching lines @@
 
 
 class RawTokenStream : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(TokenStream);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->private_key_);
   }
   RawString* private_key_;  // Key used for private identifiers.
   RawArray* token_objects_;
-  RawExternalUint8Array* stream_;
+  RawExternalTypedData* stream_;
   RawObject** to() {
     return reinterpret_cast<RawObject**>(&ptr()->stream_);
   }
 
   friend class SnapshotReader;
 };
 
 
 class RawScript : public RawObject {
  public:
@@ skipping 720 matching lines @@
 class RawExternalTypedData : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalTypedData);
 
  protected:
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
   RawSmi* length_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
 
   uint8_t* data_;
   void* peer_;
+
+  friend class TokenStream;
+  friend class RawTokenStream;
 };
 
 
 class RawByteArray : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ByteArray);
 
  protected:
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
   RawSmi* length_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->length_); }
@@ skipping 106 matching lines @@
   void* peer_;
 };
 
 
 class RawExternalUint8Array : public RawByteArray {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalUint8Array);
 
   uint8_t* data_;
   void* peer_;
 
-  friend class TokenStream;
-  friend class RawTokenStream;
   friend class RawExternalUint8ClampedArray;
 };
 
 
 class RawExternalUint8ClampedArray : public RawExternalUint8Array {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalUint8ClampedArray);
 };
 
 
 class RawExternalInt16Array : public RawByteArray {
@@ skipping 342 matching lines @@
   // Make sure this is updated when new TypedData types are added.
   ASSERT(kTypedDataInt8ArrayViewCid == kTypedDataInt8ArrayCid + 11);
   ASSERT(kExternalTypedDataInt8ArrayCid == kTypedDataInt8ArrayViewCid + 12);
   ASSERT(kNullCid == kExternalTypedDataInt8ArrayCid + 11);
   return (kNullCid - kTypedDataInt8ArrayCid);
 }
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_