Changeset 51052 in webkit

Timestamp:

Nov 16, 2009 2:21:44 PM (14 years ago)

Author:

yael.aharon@nokia.com

Message:

[Qt] ASSERT failure while running DRT
​https://bugs.webkit.org/show_bug.cgi?id=30978

Reviewed by Kenneth Rohde Christiansen.

Add needed Structure typeInfo flags to QtRuntimeObjectImpl and QtRuntimeMethod.
These flags are needed after r49649, where HasDefaultmark was changed to OverrideMarkChildren.

• bridge/qt/qt_instance.cpp:

(JSC::Bindings::QtRuntimeObjectImp::createStructure):

• bridge/qt/qt_runtime.h:

(JSC::Bindings::QtRuntimeMethod::createStructure):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/qt/qt_instance.cpp (modified) (1 diff)
• bridge/qt/qt_runtime.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-14  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] ASSERT failure while running DRT
+        https://bugs.webkit.org/show_bug.cgi?id=30978
+
+        Add needed Structure typeInfo flags to QtRuntimeObjectImpl and QtRuntimeMethod.
+        These flags are needed after r49649, where HasDefaultmark was changed to OverrideMarkChildren.
+
+        * bridge/qt/qt_instance.cpp:
+        (JSC::Bindings::QtRuntimeObjectImp::createStructure):
+        * bridge/qt/qt_runtime.h:
+        (JSC::Bindings::QtRuntimeMethod::createStructure):
+
 2009-11-16  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/bridge/qt/qt_instance.cpp

@@ -58 +58 @@
             instance->markAggregate(markStack);
     }
+
+    static PassRefPtr<Structure> createStructure(JSValue prototype)
+    {
+        return Structure::create(prototype, TypeInfo(ObjectType,  StructureFlags));
+    }
+
+protected:
+    static const unsigned StructureFlags = RuntimeObjectImp::StructureFlags | OverridesMarkChildren;
 
 private:

trunk/WebCore/bridge/qt/qt_runtime.h

@@ -152 +152 @@
     static PassRefPtr<Structure> createStructure(JSValue prototype)
     {
-        return Structure::create(prototype, TypeInfo(ObjectType,  OverridesGetOwnPropertySlot | OverridesMarkChildren));
+        return Structure::create(prototype, TypeInfo(ObjectType,  StructureFlags));
     }
 
 protected:
+    static const unsigned StructureFlags = OverridesGetOwnPropertySlot | InternalFunction::StructureFlags | OverridesMarkChildren;
+
     QtRuntimeMethodData *d_func() const {return d_ptr;}
     QtRuntimeMethod(QtRuntimeMethodData *dd, ExecState *exec, const Identifier &n, PassRefPtr<QtInstance> inst);