Put object templates of the i18n extension on the heap object.

src/extensions/i18n/i18n-utils.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 124 matching lines @@
 
   for (int32_t i = 0; i < length - 1; ++i) {
     target[i] = static_cast<UChar>(source[i]);
   }
 
   target[length - 1] = 0x0u;
 }
 
 
 // static
-// Chrome Linux doesn't like static initializers in class, so we create
-// template on demand.
 v8::Local<v8::ObjectTemplate> Utils::GetTemplate(v8::Isolate* isolate) {
-  static v8::Persistent<v8::ObjectTemplate> icu_template;
-
-  if (icu_template.IsEmpty()) {
+  i::Isolate* internal = reinterpret_cast<i::Isolate*>(isolate);
+  if (internal->heap()->i18n_template_one() ==
+      internal->heap()->the_hole_value()) {
     v8::Local<v8::ObjectTemplate> raw_template(v8::ObjectTemplate::New());
-
-    // Set aside internal field for ICU class.
     raw_template->SetInternalFieldCount(1);
-
-    icu_template.Reset(isolate, raw_template);
+    internal->heap()
+        ->SetI18nTemplateOne(*v8::Utils::OpenHandle(*raw_template));
   }
 
-  return v8::Local<v8::ObjectTemplate>::New(isolate, icu_template);
+  i::Handle<i::ObjectTemplateInfo> tmpl(
+      i::ObjectTemplateInfo::cast(internal->heap()->i18n_template_one()),

[Michael Starzinger, 2013/07/25 13:56:06]

Just use internal->i18n_template_one() here, gives you an implicit handle.

[Michael Starzinger, 2013/07/25 13:57:22]

That should have been internal->factory()->i18n_template_one() here of course.

+      internal);
+  return v8::Utils::ToLocal(tmpl);
 }
 
 
 // static
-// Chrome Linux doesn't like static initializers in class, so we create
-// template on demand. This one has 2 internal fields.
 v8::Local<v8::ObjectTemplate> Utils::GetTemplate2(v8::Isolate* isolate) {
-  static v8::Persistent<v8::ObjectTemplate> icu_template_2;
-
-  if (icu_template_2.IsEmpty()) {
+  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());
-
-    // Set aside internal field for ICU class and additional data.
     raw_template->SetInternalFieldCount(2);
-
-    icu_template_2.Reset(isolate, raw_template);
+    internal->heap()
+        ->SetI18nTemplateTwo(*v8::Utils::OpenHandle(*raw_template));
   }
 
-  return v8::Local<v8::ObjectTemplate>::New(isolate, icu_template_2);
+  i::Handle<i::ObjectTemplateInfo> tmpl(
+      i::ObjectTemplateInfo::cast(internal->heap()->i18n_template_two()),

[Michael Starzinger, 2013/07/25 13:56:06]

Likewise.

+      internal);
+  return v8::Utils::ToLocal(tmpl);
 }
 
 }  // namespace v8_i18n