Changeset 107394 in webkit

Timestamp:

Feb 10, 2012 3:46:28 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

CodeGeneratorJS doesn't always generate visitChildren() implementation when required
​https://bugs.webkit.org/show_bug.cgi?id=78336

Patch by Pablo Flouret <​pablof@motorola.com> on 2012-02-10
Reviewed by Kentaro Hara.

In an IDL for an interface that declares no functions, but has
attributes with [CachedAttribute], the implementation of visitChildren()
is not generated by the JSC code generator.

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateImplementation):

• bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:

(WebCore::JSTestSerializedScriptValueInterface::visitChildren):
(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (2 diffs)
• bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-10  Pablo Flouret  <pablof@motorola.com>
+
+        CodeGeneratorJS doesn't always generate visitChildren() implementation when required
+        https://bugs.webkit.org/show_bug.cgi?id=78336
+
+        Reviewed by Kentaro Hara.
+        
+        In an IDL for an interface that declares no functions, but has
+        attributes with [CachedAttribute], the implementation of visitChildren()
+        is not generated by the JSC code generator.
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateImplementation):
+        * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+        (WebCore::JSTestSerializedScriptValueInterface::visitChildren):
+        (WebCore):
+
 2012-02-10  Noel Gordon  <noel.gordon@gmail.com>
 

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

@@ -2136 +2136 @@
             push(@implContent, "#endif\n\n") if $conditional;
         }
-        
+    }
+
+    if ($numFunctions > 0 || $numCachedAttributes > 0) {
         if ($needsMarkChildren && !$dataNode->extendedAttributes->{"JSCustomMarkFunction"}) {
             push(@implContent, "void ${className}::visitChildren(JSCell* cell, SlotVisitor& visitor)\n");
@@ -2159 +2161 @@
             push(@implContent, "}\n\n");
         }
-        # Cached attributes are indeed allowed when there is a custom mark/visitChildren function.
-        # The custom function must make sure to account for the cached attribute.
-        # Uncomment the below line to temporarily enforce generated mark functions when cached attributes are present.
-        # die "Can't generate binding for class with cached attribute and custom mark." if (($numCachedAttributes > 0) and ($dataNode->extendedAttributes->{"JSCustomMarkFunction"}));
-    }
+    }
+
+    # Cached attributes are indeed allowed when there is a custom mark/visitChildren function.
+    # The custom function must make sure to account for the cached attribute.
+    # Uncomment the below line to temporarily enforce generated mark functions when cached attributes are present.
+    # die "Can't generate binding for class with cached attribute and custom mark." if (($numCachedAttributes > 0) and ($dataNode->extendedAttributes->{"JSCustomMarkFunction"}));
 
     if ($numConstants > 0) {

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp

@@ -241 +241 @@
 }
 
+void JSTestSerializedScriptValueInterface::visitChildren(JSCell* cell, SlotVisitor& visitor)
+{
+    JSTestSerializedScriptValueInterface* thisObject = jsCast<JSTestSerializedScriptValueInterface*>(cell);
+    ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
+    COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
+    ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
+    Base::visitChildren(thisObject, visitor);
+    if (thisObject->m_cachedValue)
+        visitor.append(&thisObject->m_cachedValue);
+    if (thisObject->m_cachedReadonlyValue)
+        visitor.append(&thisObject->m_cachedReadonlyValue);
+}
+
 static inline bool isObservable(JSTestSerializedScriptValueInterface* jsTestSerializedScriptValueInterface)
 {