Changeset 141730 in webkit

Timestamp:

Feb 3, 2013 7:22:44 PM (11 years ago)

Author:

haraken@chromium.org

Message:

[V8] Simplify CodeGeneratorV8.pm by using InheritsExtendedAttribute("EventTarget")
​https://bugs.webkit.org/show_bug.cgi?id=108441

Reviewed by Adam Barth.

A complicated condition in GetInternalFields() can be simplified
by using InheritsExtendedAttribute("EventTarget").

No tests. No change in behavior.

• bindings/scripts/CodeGeneratorV8.pm:

(GetInternalFields):

• dom/EventTarget.idl: Added [EventTarget] which should have been added.
• svg/SVGElementInstance.idl: Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorV8.pm (modified) (1 diff)
• dom/EventTarget.idl (modified) (1 diff)
• svg/SVGElementInstance.cpp (modified) (2 diffs)
• svg/SVGElementInstance.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-03  Kentaro Hara  <haraken@chromium.org>
+
+        [V8] Simplify CodeGeneratorV8.pm by using InheritsExtendedAttribute("EventTarget")
+        https://bugs.webkit.org/show_bug.cgi?id=108441
+
+        Reviewed by Adam Barth.
+
+        A complicated condition in GetInternalFields() can be simplified
+        by using InheritsExtendedAttribute("EventTarget").
+
+        No tests. No change in behavior.
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+        (GetInternalFields):
+        * dom/EventTarget.idl: Added [EventTarget] which should have been added.
+        * svg/SVGElementInstance.idl: Ditto.
+
 2013-02-03  Gustavo Noronha Silva  <gns@gnome.org>
 

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

@@ -617 +617 @@
 
     my @customInternalFields = ();
-    # We can't ask whether a parent type has a given extendedAttribute,
-    # so special-case AbstractWorker and WorkerContext to include all sub-types.
     # Event listeners on DOM nodes are explicitly supported in the GC controller.
-    # FIXME: Simplify this when all EventTargets are subtypes of EventTarget.
-    if (!$codeGenerator->InheritsInterface($interface, "Node")
-        && ($interface->extendedAttributes->{"EventTarget"}
-            || $interface->extendedAttributes->{"IsWorkerContext"}
-            || $codeGenerator->InheritsInterface($interface, "AbstractWorker")
-            || $codeGenerator->InheritsInterface($interface, "EventTarget"))) {
+    if (!$codeGenerator->InheritsInterface($interface, "Node") &&
+        $codeGenerator->InheritsExtendedAttribute($interface, "EventTarget")) {
         push(@customInternalFields, "eventListenerCacheIndex");
     }
-
     return @customInternalFields;
 }

trunk/Source/WebCore/dom/EventTarget.idl

@@ -26 +26 @@
     CustomToJSObject,
     JSCustomToNativeObject,
-    V8NoWrapperCache
+    V8NoWrapperCache,
+    EventTarget
 ] interface EventTarget {
     [ObjCLegacyUnnamedParameters] void addEventListener(in DOMString type, 

trunk/Source/WebCore/svg/SVGElementInstance.cpp

@@ -187 +187 @@
 EventTargetData* SVGElementInstance::eventTargetData()
 {
+    // Since no event listeners are added to an SVGElementInstance, we don't have eventTargetData.
+    return 0;
+}
+
+EventTargetData* SVGElementInstance::ensureEventTargetData()
+{
     // EventTarget would use these methods if we were actually using its add/removeEventListener logic.
     // As we're forwarding those calls to the correspondingElement(), no one should ever call this function.
@@ -193 +199 @@
 }
 
-EventTargetData* SVGElementInstance::ensureEventTargetData()
-{
-    // EventTarget would use these methods if we were actually using its add/removeEventListener logic.
-    // As we're forwarding those calls to the correspondingElement(), no one should ever call this function.
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
 SVGElementInstance::InstanceUpdateBlocker::InstanceUpdateBlocker(SVGElement* targetElement)
     : m_targetElement(targetElement->isStyled() ? static_cast<SVGStyledElement*>(targetElement) : 0)

trunk/Source/WebCore/svg/SVGElementInstance.idl

@@ -29 +29 @@
     JSCustomMarkFunction,
     JSGenerateToNativeObject,
-    JSGenerateToJSObject
+    JSGenerateToJSObject,
+    EventTarget
 ] interface SVGElementInstance
 #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C