Issue - 7123

vm/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_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 3810 matching lines @@
   // UTF-8 encoded characters and '\0' is considered a termination character.
   // TODO(7123) - Rename this to FromCString(....).
   static RawString* New(const char* cstr, Heap::Space space = Heap::kNew);
 
   // Creates a new String object from an array of UTF-8 encoded characters.
   static RawString* FromUTF8(const uint8_t* utf8_array,
                              intptr_t array_len,
                              Heap::Space space = Heap::kNew);
 
   // Creates a new String object from an array of Latin-1 encoded characters.
-  // TODO(7123) - Rename this to FromLatin1(....).
-  static RawString* New(const uint8_t* latin1_array,
-                        intptr_t array_len,
-                        Heap::Space space = Heap::kNew);
+  static RawString* FromLatin1(const uint8_t* latin1_array,
+                               intptr_t array_len,
+                               Heap::Space space = Heap::kNew);
 
   // Creates a new String object from an array of UTF-16 encoded characters.
-  // TODO(7123) - Rename this to FromUTF16(....).
-  static RawString* New(const uint16_t* utf16_array,
-                        intptr_t array_len,
-                        Heap::Space space = Heap::kNew);
+  static RawString* FromUTF16(const uint16_t* utf16_array,
+                              intptr_t array_len,
+                              Heap::Space space = Heap::kNew);
 
   // Creates a new String object from an array of UTF-32 encoded characters.
-  // TODO(7123) - Rename this to FromUTF32(....).
-  static RawString* New(const int32_t* utf32_array,
-                        intptr_t array_len,
-                        Heap::Space space = Heap::kNew);
+  static RawString* FromUTF32(const int32_t* utf32_array,
+                              intptr_t array_len,
+                              Heap::Space space = Heap::kNew);
 
   // Create a new String object from another Dart String instance.
   static RawString* New(const String& str, Heap::Space space = Heap::kNew);
 
   // Creates a new External String object using the specified array of
   // UTF-8 encoded characters as the external reference.
   static RawString* NewExternal(const uint8_t* utf8_array,
                                 intptr_t array_len,
                                 void* peer,
                                 Dart_PeerFinalizer callback,
@@ skipping 61 matching lines @@
     // heap allocation.
     raw_ptr()->length_ = Smi::New(value);
   }
 
   void SetHash(intptr_t value) const {
     // This is only safe because we create a new Smi, which does not cause
     // heap allocation.
     raw_ptr()->hash_ = Smi::New(value);
   }
 
-  template<typename HandleType, typename ElementType>
+  template<typename HandleType, typename ElementType, typename CallbackType>
   static void ReadFromImpl(SnapshotReader* reader,
                            String* str_obj,
                            intptr_t len,
                            intptr_t tags,
+                           CallbackType new_symbol,
                            Snapshot::Kind kind);
 
   HEAP_OBJECT_IMPLEMENTATION(String, Instance);
 
   friend class Class;
   friend class Symbols;
   friend class OneByteString;
   friend class TwoByteString;
   friend class ExternalOneByteString;
   friend class ExternalTwoByteString;
@@ skipping 2050 matching lines @@
     if (this->CharAt(i) != str.CharAt(begin_index + i)) {
       return false;
     }
   }
   return true;
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_