Changeset 109611 in webkit

Timestamp:

Mar 2, 2012 1:45:10 PM (12 years ago)

Author:

arv@chromium.org

Message:

[V8] Bindings for node always check if they are a Document.
​https://bugs.webkit.org/show_bug.cgi?id=79947

Reviewed by Adam Barth.

This changes the generated bindings code to only generate the Document code for the Document wrappers.

No new tests. Covered by existing tests.

• bindings/scripts/CodeGeneratorV8.pm:

(GenerateToV8Converters):

• bindings/scripts/test/V8/V8Float64Array.cpp:

(WebCore::V8Float64Array::wrapSlow):

• bindings/scripts/test/V8/V8TestActiveDOMObject.cpp:

(WebCore::V8TestActiveDOMObject::wrapSlow):

• bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp:

(WebCore::V8TestCustomNamedGetter::wrapSlow):

• bindings/scripts/test/V8/V8TestEventConstructor.cpp:

(WebCore::V8TestEventConstructor::wrapSlow):

• bindings/scripts/test/V8/V8TestEventTarget.cpp:

(WebCore::V8TestEventTarget::wrapSlow):

• bindings/scripts/test/V8/V8TestInterface.cpp:

(WebCore::V8TestInterface::wrapSlow):

• bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp:

(WebCore::V8TestMediaQueryListListener::wrapSlow):

• bindings/scripts/test/V8/V8TestNamedConstructor.cpp:

(WebCore::V8TestNamedConstructor::wrapSlow):

• bindings/scripts/test/V8/V8TestObj.cpp:

(WebCore::V8TestObj::wrapSlow):

• bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp:

(WebCore::V8TestSerializedScriptValueInterface::wrapSlow):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorV8.pm (modified) (2 diffs)
• bindings/scripts/test/V8/V8Float64Array.cpp (modified) (1 diff)
• bindings/scripts/test/V8/V8TestActiveDOMObject.cpp (modified) (1 diff)
• bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp (modified) (1 diff)
• bindings/scripts/test/V8/V8TestEventConstructor.cpp (modified) (1 diff)
• bindings/scripts/test/V8/V8TestEventTarget.cpp (modified) (1 diff)
• bindings/scripts/test/V8/V8TestInterface.cpp (modified) (1 diff)
• bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp (modified) (1 diff)
• bindings/scripts/test/V8/V8TestNamedConstructor.cpp (modified) (1 diff)
• bindings/scripts/test/V8/V8TestObj.cpp (modified) (1 diff)
• bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-02  Erik Arvidsson  <arv@chromium.org>
+
+        [V8] Bindings for node always check if they are a Document.
+        https://bugs.webkit.org/show_bug.cgi?id=79947
+
+        Reviewed by Adam Barth.
+
+        This changes the generated bindings code to only generate the Document code for the Document wrappers.
+
+        No new tests. Covered by existing tests.
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+        (GenerateToV8Converters):
+        * bindings/scripts/test/V8/V8Float64Array.cpp:
+        (WebCore::V8Float64Array::wrapSlow):
+        * bindings/scripts/test/V8/V8TestActiveDOMObject.cpp:
+        (WebCore::V8TestActiveDOMObject::wrapSlow):
+        * bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp:
+        (WebCore::V8TestCustomNamedGetter::wrapSlow):
+        * bindings/scripts/test/V8/V8TestEventConstructor.cpp:
+        (WebCore::V8TestEventConstructor::wrapSlow):
+        * bindings/scripts/test/V8/V8TestEventTarget.cpp:
+        (WebCore::V8TestEventTarget::wrapSlow):
+        * bindings/scripts/test/V8/V8TestInterface.cpp:
+        (WebCore::V8TestInterface::wrapSlow):
+        * bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp:
+        (WebCore::V8TestMediaQueryListListener::wrapSlow):
+        * bindings/scripts/test/V8/V8TestNamedConstructor.cpp:
+        (WebCore::V8TestNamedConstructor::wrapSlow):
+        * bindings/scripts/test/V8/V8TestObj.cpp:
+        (WebCore::V8TestObj::wrapSlow):
+        * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp:
+        (WebCore::V8TestSerializedScriptValueInterface::wrapSlow):
+
 2012-03-02  Igor Oliveira  <igor.o@sisa.samsung.com>
 

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

@@ -3038 +3038 @@
 {
     v8::Handle<v8::Object> wrapper;
-    V8Proxy* proxy = 0;
-END
-
+END
+
+    my $proxyInit;
     if (IsNodeSubType($dataNode)) {
+        $proxyInit = "V8Proxy::retrieve(impl->document()->frame())";
+        # DocumentType nodes are the only nodes that may have a NULL document.
+        if ($interfaceName eq "DocumentType") {
+            $proxyInit = "impl->document() ? $proxyInit : 0";
+        }
+    } else {
+        $proxyInit = "0";
+    }
+    push(@implContent, <<END);
+    V8Proxy* proxy = $proxyInit;
+END
+
+    if (IsSubType($dataNode, "Document")) {
         push(@implContent, <<END);
-    if (impl->document()) {
-        proxy = V8Proxy::retrieve(impl->document()->frame());
-        if (proxy && static_cast<Node*>(impl->document()) == static_cast<Node*>(impl)) {
-            if (proxy->windowShell()->context().IsEmpty() && proxy->windowShell()->initContextIfNeeded()) {
-                // initContextIfNeeded may have created a wrapper for the object, retry from the start.
-                return ${className}::wrap(impl);
-            }
-        }
-    }
-
+    if (proxy && proxy->windowShell()->context().IsEmpty() && proxy->windowShell()->initContextIfNeeded()) {
+        // initContextIfNeeded may have created a wrapper for the object, retry from the start.
+        return ${className}::wrap(impl);
+    }
 END
     }
@@ -3094 +3101 @@
 
     push(@implContent, <<END);
-    if (wrapper.IsEmpty())
+    if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 END

trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp

@@ -126 +126 @@
     V8Proxy* proxy = 0;
     wrapper = V8DOMWrapper::instantiateV8Object(proxy, &info, impl);
-    if (wrapper.IsEmpty())
+    if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp

@@ -180 +180 @@
     if (!context.IsEmpty())
         context->Exit();
-    if (wrapper.IsEmpty())
+    if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp

@@ -116 +116 @@
     V8Proxy* proxy = 0;
     wrapper = V8DOMWrapper::instantiateV8Object(proxy, &info, impl);
-    if (wrapper.IsEmpty())
+    if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp

@@ -151 +151 @@
     V8Proxy* proxy = 0;
     wrapper = V8DOMWrapper::instantiateV8Object(proxy, &info, impl);
-    if (wrapper.IsEmpty())
+    if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp

@@ -179 +179 @@
     V8Proxy* proxy = 0;
     wrapper = V8DOMWrapper::instantiateV8Object(proxy, &info, impl);
-    if (wrapper.IsEmpty())
+    if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp

@@ -312 +312 @@
     V8Proxy* proxy = 0;
     wrapper = V8DOMWrapper::instantiateV8Object(proxy, &info, impl);
-    if (wrapper.IsEmpty())
+    if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp

@@ -116 +116 @@
     V8Proxy* proxy = 0;
     wrapper = V8DOMWrapper::instantiateV8Object(proxy, &info, impl);
-    if (wrapper.IsEmpty())
+    if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.cpp

@@ -161 +161 @@
     V8Proxy* proxy = 0;
     wrapper = V8DOMWrapper::instantiateV8Object(proxy, &info, impl);
-    if (wrapper.IsEmpty())
+    if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp

@@ -2094 +2094 @@
     V8Proxy* proxy = 0;
     wrapper = V8DOMWrapper::instantiateV8Object(proxy, &info, impl);
-    if (wrapper.IsEmpty())
+    if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
 

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp

@@ -198 +198 @@
     V8Proxy* proxy = 0;
     wrapper = V8DOMWrapper::instantiateV8Object(proxy, &info, impl);
-    if (wrapper.IsEmpty())
+    if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;