introduce eternal handles

src/extensions/i18n/i18n-utils.cc

Index: src/extensions/i18n/i18n-utils.cc
diff --git a/src/extensions/i18n/i18n-utils.cc b/src/extensions/i18n/i18n-utils.cc
index eac11669047ec407e57c78d4038716a0a7bc18ee..7ac1b77f8adb3faf0e976654fd59eff12752ec63 100644
--- a/src/extensions/i18n/i18n-utils.cc
+++ b/src/extensions/i18n/i18n-utils.cc
@@ -141,35 +141,34 @@ void Utils::AsciiToUChar(const char* source,
 }
 
 
-// static
-v8::Local<v8::ObjectTemplate> Utils::GetTemplate(v8::Isolate* isolate) {
-  i::Isolate* internal = reinterpret_cast<i::Isolate*>(isolate);
-  if (internal->heap()->i18n_template_one() ==
-      internal->heap()->the_hole_value()) {
+template<int internal_fields, i::EternalHandles::IndexedHandle field>
+static v8::Local<v8::ObjectTemplate> GetEternal(v8::Isolate* external) {
+  i::Isolate* isolate = reinterpret_cast<i::Isolate*>(external);
+  int index = isolate->eternal_handles()->GetIndex(field);
+  if (index == i::EternalHandles::kInvalidIndex) {
     v8::Local<v8::ObjectTemplate> raw_template(v8::ObjectTemplate::New());
-    raw_template->SetInternalFieldCount(1);
-    internal->heap()
-        ->SetI18nTemplateOne(*v8::Utils::OpenHandle(*raw_template));
+    raw_template->SetInternalFieldCount(internal_fields);
+    index = isolate->eternal_handles()->CreateIndexed(
+        isolate,
+        *v8::Utils::OpenHandle(*raw_template),
+        field);
   }
+  i::Object** location = isolate->eternal_handles()->Get(index);
+  i::Handle<i::Object> handle = i::Handle<i::Object>(location);
+  return v8::Utils::ToLocal(i::Handle<i::ObjectTemplateInfo>::cast(handle));
+}
 
-  return v8::Utils::ToLocal(i::Handle<i::ObjectTemplateInfo>::cast(
-      internal->factory()->i18n_template_one()));
+
+// static
+v8::Local<v8::ObjectTemplate> Utils::GetTemplate(v8::Isolate* isolate) {
+  return GetEternal<1, i::EternalHandles::I18N_TEMPLATE_ONE>(isolate);
 }
 
 
 // static
 v8::Local<v8::ObjectTemplate> Utils::GetTemplate2(v8::Isolate* isolate) {
-  i::Isolate* internal = reinterpret_cast<i::Isolate*>(isolate);
-  if (internal->heap()->i18n_template_two() ==
-      internal->heap()->the_hole_value()) {
-    v8::Local<v8::ObjectTemplate> raw_template(v8::ObjectTemplate::New());
-    raw_template->SetInternalFieldCount(2);
-    internal->heap()
-        ->SetI18nTemplateTwo(*v8::Utils::OpenHandle(*raw_template));
-  }
-
-  return v8::Utils::ToLocal(i::Handle<i::ObjectTemplateInfo>::cast(
-      internal->factory()->i18n_template_two()));
+  return GetEternal<2, i::EternalHandles::I18N_TEMPLATE_TWO>(isolate);
 }
 
+
 }  // namespace v8_i18n