Changeset 146851 in webkit

Timestamp:

Mar 25, 2013 11:35:06 PM (11 years ago)

Author:

morrita@google.com

Message:

Custom Elements Refactoring: The name V8CustomElement is confusing.
​https://bugs.webkit.org/show_bug.cgi?id=113165

Reviewed by Kent Tamura.

This change moves functions from V8CustomElement to CustomElementHelpers and
removes V8CustomElement. V8CustomElement is just a heritage of old design
and no longer makes sense.

No new tests. No behavior change.

• WebCore.gypi:
• bindings/v8/CustomElementHelpers.cpp:

(WebCore::CustomElementHelpers::createWrapper):
(WebCore):

• bindings/v8/CustomElementHelpers.h:

(CustomElementHelpers):
(WebCore::CustomElementHelpers::wrap):
(WebCore):
(WebCore::CustomElementHelpers::constructorOf):

• bindings/v8/V8CustomElement.cpp: Removed.
• bindings/v8/V8CustomElement.h: Removed.
• bindings/v8/custom/V8CustomElementConstructorCustom.cpp:

(WebCore::V8CustomElementConstructor::callAsFunctionCallback):

• dom/make_names.pl:

(printWrapperFactoryCppFile):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• bindings/v8/CustomElementHelpers.cpp (modified) (1 diff)
• bindings/v8/CustomElementHelpers.h (modified) (2 diffs)
• bindings/v8/V8CustomElement.cpp (deleted)
• bindings/v8/V8CustomElement.h (deleted)
• bindings/v8/custom/V8CustomElementConstructorCustom.cpp (modified) (2 diffs)
• dom/make_names.pl (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-25  Hajime Morrita  <morrita@google.com>
+
+        Custom Elements Refactoring: The name V8CustomElement is confusing.
+        https://bugs.webkit.org/show_bug.cgi?id=113165
+
+        Reviewed by Kent Tamura.
+
+        This change moves functions from V8CustomElement to CustomElementHelpers and
+        removes V8CustomElement. V8CustomElement is just a heritage of old design
+        and no longer makes sense.
+
+        No new tests. No behavior change.
+
+        * WebCore.gypi:
+        * bindings/v8/CustomElementHelpers.cpp:
+        (WebCore::CustomElementHelpers::createWrapper):
+        (WebCore):
+        * bindings/v8/CustomElementHelpers.h:
+        (CustomElementHelpers):
+        (WebCore::CustomElementHelpers::wrap):
+        (WebCore):
+        (WebCore::CustomElementHelpers::constructorOf):
+        * bindings/v8/V8CustomElement.cpp: Removed.
+        * bindings/v8/V8CustomElement.h: Removed.
+        * bindings/v8/custom/V8CustomElementConstructorCustom.cpp:
+        (WebCore::V8CustomElementConstructor::callAsFunctionCallback):
+        * dom/make_names.pl:
+        (printWrapperFactoryCppFile):
+
 2013-03-25  Eugene Klyuchnikov  <eustas@chromium.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -1373 +1373 @@
             'bindings/v8/V8Collection.cpp',
             'bindings/v8/V8Collection.h',
-            'bindings/v8/V8CustomElement.cpp',
-            'bindings/v8/V8CustomElement.h',
             'bindings/v8/V8DOMConfiguration.cpp',
             'bindings/v8/V8DOMConfiguration.h',

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

@@ -44 +44 @@
 #if ENABLE(CUSTOM_ELEMENTS)
 
+v8::Handle<v8::Object> CustomElementHelpers::createWrapper(PassRefPtr<Element> impl, v8::Handle<v8::Object> creationContext, PassRefPtr<CustomElementConstructor> constructor, v8::Isolate* isolate)
+{
+    ASSERT(impl);
+
+    // The constructor and registered lifecycle callbacks should be visible only from main world.
+    // FIXME: This shouldn't be needed once each custom element has its own FunctionTemplate
+    // https://bugs.webkit.org/show_bug.cgi?id=108138
+    if (!CustomElementHelpers::isFeatureAllowed(creationContext->CreationContext())) {
+        v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &V8HTMLElement::info, impl.get(), isolate);
+        if (!wrapper.IsEmpty())
+            V8DOMWrapper::associateObjectWithWrapper(impl, &V8HTMLElement::info, wrapper, isolate, WrapperConfiguration::Dependent);
+        return wrapper;
+    }
+
+    v8::Handle<v8::Value> constructorValue = WebCore::toV8(constructor.get(), creationContext, isolate);
+    if (constructorValue.IsEmpty() || !constructorValue->IsObject())
+        return v8::Handle<v8::Object>();
+    v8::Handle<v8::Object> constructorWapper = v8::Handle<v8::Object>::Cast(constructorValue);
+    v8::Handle<v8::Object> prototype = v8::Handle<v8::Object>::Cast(constructorWapper->Get(v8::String::NewSymbol("prototype")));
+    WrapperTypeInfo* typeInfo = CustomElementHelpers::findWrapperType(prototype);
+    if (!typeInfo)
+        return v8::Handle<v8::Object>();
+
+    v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, typeInfo, impl.get(), isolate);
+    if (wrapper.IsEmpty())
+        return v8::Handle<v8::Object>();
+
+    wrapper->SetPrototype(prototype);
+    V8DOMWrapper::associateObjectWithWrapper(impl, typeInfo, wrapper, isolate, WrapperConfiguration::Dependent);
+    return wrapper;
+}
+
 bool CustomElementHelpers::initializeConstructorWrapper(CustomElementConstructor* constructor, const ScriptValue& prototype, ScriptState* state)
 {

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

@@ -32 +32 @@
 #define CustomElementHelpers_h
 
+#include "CustomElementConstructor.h"
+#include "CustomElementRegistry.h"
+#include "Document.h"
 #include "ExceptionCode.h"
 #include "ScriptValue.h"
+#include "V8Binding.h"
+#include "V8DOMWrapper.h"
+#include "V8HTMLElement.h"
+#include "V8HTMLUnknownElement.h"
 #include <wtf/Forward.h>
+#include <wtf/PassRefPtr.h>
 
 namespace WebCore {
@@ -59 +67 @@
     static void invokeReadyCallbacksIfNeeded(ScriptExecutionContext*, const Vector<CustomElementInvocation>&);
 
+    //
+    // You can just use toV8(Node*) to get correct wrapper objects, even for custom elements.
+    // Then generated ElementWrapperFactories call V8CustomElement::wrap() with proper CustomElementConstructor instances
+    // accordingly.
+    //
+    static v8::Handle<v8::Object> wrap(Element*, v8::Handle<v8::Object> creationContext, PassRefPtr<CustomElementConstructor>, v8::Isolate*);
+    static PassRefPtr<CustomElementConstructor> constructorOf(Element*);
+
 private:
     static void invokeReadyCallbackIfNeeded(Element*, v8::Handle<v8::Context>);
+    static v8::Handle<v8::Object> createWrapper(PassRefPtr<Element>, v8::Handle<v8::Object>, PassRefPtr<CustomElementConstructor>, v8::Isolate*);
 };
+
+inline v8::Handle<v8::Object> CustomElementHelpers::wrap(Element* impl, v8::Handle<v8::Object> creationContext, PassRefPtr<CustomElementConstructor> constructor, v8::Isolate* isolate)
+{
+    ASSERT(impl);
+    ASSERT(DOMDataStore::getWrapper(impl, isolate).IsEmpty());
+    return CustomElementHelpers::createWrapper(impl, creationContext, constructor, isolate);
+}
+
+inline PassRefPtr<CustomElementConstructor> CustomElementHelpers::constructorOf(Element* element)
+{
+    if (CustomElementRegistry* registry = element->document()->registry())
+        return registry->findFor(element);
+    return 0;
+}
 
 #endif // ENABLE(CUSTOM_ELEMENTS)

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

@@ -33 +33 @@
 
 #include "CustomElementConstructor.h"
+#include "CustomElementHelpers.h"
 #include "V8Binding.h"
-#include "V8CustomElement.h"
 
 namespace WebCore {
@@ -49 +49 @@
     if (!element)
         return v8Undefined();
-    return V8CustomElement::wrap(element.get(), args.Holder(), impl, args.GetIsolate());
+    return CustomElementHelpers::wrap(element.get(), args.Holder(), impl, args.GetIsolate());
 }
 

trunk/Source/WebCore/dom/make_names.pl

@@ -1220 +1220 @@
 
 #if ENABLE(CUSTOM_ELEMENTS)
-#include "V8CustomElement.h"
+#include "CustomElementHelpers.h"
 #endif
 
@@ -1297 +1297 @@
         print F <<END
 #if ENABLE(CUSTOM_ELEMENTS)
-    if (PassRefPtr<CustomElementConstructor> constructor = V8CustomElement::constructorOf(element))
-        return V8CustomElement::wrap(element, creationContext, constructor, isolate);
+    if (PassRefPtr<CustomElementConstructor> constructor = CustomElementHelpers::constructorOf(element))
+        return CustomElementHelpers::wrap(element, creationContext, constructor, isolate);
 #endif
 END