Rename references to "external pages" as "snapshot pages" to avoid confusion with the kind of exter…

runtime/vm/clustered_snapshot.h

 // Copyright (c) 2016, 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 RUNTIME_VM_CLUSTERED_SNAPSHOT_H_
 #define RUNTIME_VM_CLUSTERED_SNAPSHOT_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/bitfield.h"
@@ skipping 101 matching lines @@
 typedef DirectChainedHashMap<SmiObjectIdPairTrait> SmiObjectIdMap;
 
 
 class Serializer : public StackResource {
  public:
   Serializer(Thread* thread,
              Snapshot::Kind kind,
              uint8_t** buffer,
              ReAlloc alloc,
              intptr_t initial_size,
-             InstructionsWriter* instructions_writer_);
+             ImageWriter* image_writer_);
   ~Serializer();
 
   intptr_t WriteVMSnapshot(const Array& symbols, const Array& scripts);
   void WriteIsolateSnapshot(intptr_t num_base_objects,
                             ObjectStore* object_store);
 
   void AddVMIsolateBaseObjects();
 
   void AddBaseObject(RawObject* base_object) {
     AssignRef(base_object);
@@ skipping 119 matching lines @@
   void WriteTokenPosition(TokenPosition pos) {
     Write<int32_t>(pos.SnapshotEncode());
   }
 
   void WriteCid(intptr_t cid) {
     COMPILE_ASSERT(RawObject::kClassIdTagSize <= 32);
     Write<int32_t>(cid);
   }
 
   int32_t GetTextOffset(RawInstructions* instr, RawCode* code) {
-    return instructions_writer_->GetOffsetFor(instr, code);
+    return image_writer_->GetOffsetFor(instr, code);
   }
 
   int32_t GetRODataOffset(RawObject* object) {
-    return instructions_writer_->GetObjectOffsetFor(object);
+    return image_writer_->GetObjectOffsetFor(object);
   }
 
   Snapshot::Kind kind() const { return kind_; }
 
  private:
   Heap* heap_;
   Zone* zone_;
   Snapshot::Kind kind_;
   WriteStream stream_;
-  InstructionsWriter* instructions_writer_;
+  ImageWriter* image_writer_;
   SerializationCluster** clusters_by_cid_;
   GrowableArray<RawObject*> stack_;
   intptr_t num_cids_;
   intptr_t num_base_objects_;
   intptr_t num_written_objects_;
   intptr_t next_ref_index_;
   SmiObjectIdMap smi_ids_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(Serializer);
 };
@@ skipping 98 matching lines @@
 };
 
 
 class FullSnapshotWriter {
  public:
   static const intptr_t kInitialSize = 64 * KB;
   FullSnapshotWriter(Snapshot::Kind kind,
                      uint8_t** vm_snapshot_data_buffer,
                      uint8_t** isolate_snapshot_data_buffer,
                      ReAlloc alloc,
-                     InstructionsWriter* vm_instructions_writer,
-                     InstructionsWriter* iso_instructions_writer);
+                     ImageWriter* vm_image_writer,
+                     ImageWriter* iso_image_writer);
   ~FullSnapshotWriter();
 
   uint8_t** vm_snapshot_data_buffer() const { return vm_snapshot_data_buffer_; }
 
   uint8_t** isolate_snapshot_data_buffer() const {
     return isolate_snapshot_data_buffer_;
   }
 
   Thread* thread() const { return thread_; }
   Zone* zone() const { return thread_->zone(); }
@@ skipping 14 matching lines @@
   void WriteIsolateSnapshot(intptr_t num_base_objects);
 
   Thread* thread_;
   Snapshot::Kind kind_;
   uint8_t** vm_snapshot_data_buffer_;
   uint8_t** isolate_snapshot_data_buffer_;
   ReAlloc alloc_;
   intptr_t vm_isolate_snapshot_size_;
   intptr_t isolate_snapshot_size_;
   ForwardList* forward_list_;
-  InstructionsWriter* vm_instructions_writer_;
-  InstructionsWriter* isolate_instructions_writer_;
+  ImageWriter* vm_image_writer_;
+  ImageWriter* isolate_image_writer_;
   Array& token_streams_;
   Array& saved_symbol_table_;
   Array& new_vm_symbol_table_;
 
   // Stats for benchmarking.
   intptr_t clustered_vm_size_;
   intptr_t clustered_isolate_size_;
   intptr_t mapped_data_size_;
   intptr_t mapped_instructions_size_;
 
@@ skipping 18 matching lines @@
   intptr_t size_;
   const uint8_t* instructions_buffer_;
   const uint8_t* data_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(FullSnapshotReader);
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_CLUSTERED_SNAPSHOT_H_