Changeset 145765 in webkit

Timestamp:

Mar 13, 2013 3:50:09 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[V8] Get rid of more function-level static FunctionTemplates and ObjectTemplates in bindings
​https://bugs.webkit.org/show_bug.cgi?id=112262

Patch by Marja Hölttä <​marja@chromium.org> on 2013-03-13
Reviewed by Jochen Eisinger.

In the future we'll create and store function templates for main world
and non-main worlds separately (see bug 111724), having function
templates and object templates as static variables inside functions will
break the functionality.

No new tests (no changes in functionality yet; existing bindings
tests still pass).

• bindings/scripts/CodeGeneratorV8.pm:

(GenerateHeader):
(GenerateImplementation):

• bindings/v8/V8DOMWindowShell.cpp:

(WebCore::V8DOMWindowShell::createContext):

• bindings/v8/V8PerIsolateData.cpp:

(WebCore::V8PerIsolateData::hasPrivateTemplate):
(WebCore):

• bindings/v8/V8PerIsolateData.h:

(V8PerIsolateData):

• bindings/v8/custom/V8HTMLDocumentCustom.cpp:

(WebCore::V8HTMLDocument::wrapInShadowObject):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorV8.pm (modified) (2 diffs)
• bindings/v8/V8DOMWindowShell.cpp (modified) (1 diff)
• bindings/v8/V8PerIsolateData.cpp (modified) (1 diff)
• bindings/v8/V8PerIsolateData.h (modified) (1 diff)
• bindings/v8/custom/V8HTMLDocumentCustom.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-13  Marja Hölttä  <marja@chromium.org>
+
+        [V8] Get rid of more function-level static FunctionTemplates and ObjectTemplates in bindings
+        https://bugs.webkit.org/show_bug.cgi?id=112262
+
+        Reviewed by Jochen Eisinger.
+
+        In the future we'll create and store function templates for main world
+        and non-main worlds separately (see bug 111724), having function
+        templates and object templates as static variables inside functions will
+        break the functionality.
+
+        No new tests (no changes in functionality yet; existing bindings
+        tests still pass).
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+        (GenerateHeader):
+        (GenerateImplementation):
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::V8DOMWindowShell::createContext):
+        * bindings/v8/V8PerIsolateData.cpp:
+        (WebCore::V8PerIsolateData::hasPrivateTemplate):
+        (WebCore):
+        * bindings/v8/V8PerIsolateData.h:
+        (V8PerIsolateData):
+        * bindings/v8/custom/V8HTMLDocumentCustom.cpp:
+        (WebCore::V8HTMLDocument::wrapInShadowObject):
+
 2013-03-13  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -385 +385 @@
     if ($interfaceName eq "DOMWindow") {
         push(@headerContent, <<END);
-    static v8::Persistent<v8::ObjectTemplate> GetShadowObjectTemplate(v8::Isolate*);
+    static v8::Persistent<v8::ObjectTemplate> GetShadowObjectTemplate(v8::Isolate*, WrapperWorldType);
 END
     }
@@ -3261 +3261 @@
     if ($interfaceName eq "DOMWindow") {
         push(@implContent, <<END);
-v8::Persistent<v8::ObjectTemplate> V8DOMWindow::GetShadowObjectTemplate(v8::Isolate* isolate)
-{
-    static v8::Persistent<v8::ObjectTemplate> V8DOMWindowShadowObjectCache;
-    if (V8DOMWindowShadowObjectCache.IsEmpty()) {
-        V8DOMWindowShadowObjectCache = v8::Persistent<v8::ObjectTemplate>::New(isolate, v8::ObjectTemplate::New());
-        ConfigureShadowObjectTemplate(V8DOMWindowShadowObjectCache, isolate);
-    }
-    return V8DOMWindowShadowObjectCache;
+v8::Persistent<v8::ObjectTemplate> V8DOMWindow::GetShadowObjectTemplate(v8::Isolate* isolate, WrapperWorldType currentWorldType)
+{
+    if (currentWorldType == MainWorld) {
+        static v8::Persistent<v8::ObjectTemplate> V8DOMWindowShadowObjectCacheForMainWorld;
+        if (V8DOMWindowShadowObjectCacheForMainWorld.IsEmpty()) {
+            V8DOMWindowShadowObjectCacheForMainWorld = v8::Persistent<v8::ObjectTemplate>::New(isolate, v8::ObjectTemplate::New());
+            ConfigureShadowObjectTemplate(V8DOMWindowShadowObjectCacheForMainWorld, isolate);
+        }
+        return V8DOMWindowShadowObjectCacheForMainWorld;
+    } else {
+        static v8::Persistent<v8::ObjectTemplate> V8DOMWindowShadowObjectCacheForNonMainWorld;
+        if (V8DOMWindowShadowObjectCacheForNonMainWorld.IsEmpty()) {
+            V8DOMWindowShadowObjectCacheForNonMainWorld = v8::Persistent<v8::ObjectTemplate>::New(isolate, v8::ObjectTemplate::New());
+            ConfigureShadowObjectTemplate(V8DOMWindowShadowObjectCacheForNonMainWorld, isolate);
+        }
+        return V8DOMWindowShadowObjectCacheForNonMainWorld;
+    }
 }
 

trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp

@@ -282 +282 @@
     // Create a new environment using an empty template for the shadow
     // object. Reuse the global object if one has been created earlier.
-    v8::Persistent<v8::ObjectTemplate> globalTemplate = V8DOMWindow::GetShadowObjectTemplate(m_isolate);
+    v8::Persistent<v8::ObjectTemplate> globalTemplate = V8DOMWindow::GetShadowObjectTemplate(m_isolate, m_world->isMainWorld() ? MainWorld : IsolatedWorld);
     if (globalTemplate.IsEmpty())
         return;

trunk/Source/WebCore/bindings/v8/V8PerIsolateData.cpp

@@ -123 +123 @@
 }
 
+bool V8PerIsolateData::hasPrivateTemplate(WrapperWorldType, void* privatePointer)
+{
+    return m_templates.find(privatePointer) != m_templates.end();
+}
+
 v8::Persistent<v8::FunctionTemplate> V8PerIsolateData::privateTemplate(WrapperWorldType, void* privatePointer, v8::InvocationCallback callback, v8::Handle<v8::Value> data, v8::Handle<v8::Signature> signature, int length)
 {

trunk/Source/WebCore/bindings/v8/V8PerIsolateData.h

@@ -129 +129 @@
     bool shouldCollectGarbageSoon() const { return m_shouldCollectGarbageSoon; }
 
+    bool hasPrivateTemplate(WrapperWorldType, void* privatePointer);
     v8::Persistent<v8::FunctionTemplate> privateTemplate(WrapperWorldType, void* privatePointer, v8::InvocationCallback, v8::Handle<v8::Value> data, v8::Handle<v8::Signature>, int length = 0);
 

trunk/Source/WebCore/bindings/v8/custom/V8HTMLDocumentCustom.cpp

@@ -55 +55 @@
 v8::Local<v8::Object> V8HTMLDocument::wrapInShadowObject(v8::Local<v8::Object> wrapper, Node* impl, v8::Isolate* isolate)
 {
-    DEFINE_STATIC_LOCAL(v8::Persistent<v8::FunctionTemplate>, shadowTemplate, ());
-    if (shadowTemplate.IsEmpty()) {
+    // This is only for getting a unique pointer which we can pass to privateTemplate.
+    static const char* shadowTemplateUniqueKey = "wrapInShadowObjectShadowTemplate";
+    WrapperWorldType currentWorldType = worldType(isolate);
+    v8::Persistent<v8::FunctionTemplate> shadowTemplate;
+    if (!V8PerIsolateData::from(isolate)->hasPrivateTemplate(currentWorldType, &shadowTemplateUniqueKey)) {
         shadowTemplate = v8::Persistent<v8::FunctionTemplate>::New(isolate, v8::FunctionTemplate::New());
         if (shadowTemplate.IsEmpty())
             return v8::Local<v8::Object>();
         shadowTemplate->SetClassName(v8::String::NewSymbol("HTMLDocument"));
-        shadowTemplate->Inherit(V8HTMLDocument::GetTemplate(isolate, worldTypeInMainThread(isolate)));
+        shadowTemplate->Inherit(V8HTMLDocument::GetTemplate(isolate, currentWorldType));
         shadowTemplate->InstanceTemplate()->SetInternalFieldCount(V8HTMLDocument::internalFieldCount);
+    } else {
+        shadowTemplate = V8PerIsolateData::from(isolate)->privateTemplate(currentWorldType, &shadowTemplateUniqueKey, 0, v8::Handle<v8::Value>(), v8::Handle<v8::Signature>());
     }
-
     v8::Local<v8::Function> shadowConstructor = shadowTemplate->GetFunction();
     if (shadowConstructor.IsEmpty())