Changeset 28482 in webkit

Timestamp:

Dec 5, 2007 10:25:24 PM (16 years ago)

Author:

Darin Adler

Message:

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=16266 <rdar://problem/5625279> REGRESSION: crash loading CNN.com at Interpreter::createObjectsForGlobalObjectProperties()

I don't know how to reproduce this in a test.

• bindings/js/JSDocumentCustom.cpp: (WebCore::JSDocument::mark): Call JSEventTargetNode::mark instead of DOMObject::mark. There's no difference right now, but it's best to call your base class, not your base's base.

• bindings/js/kjs_events.h: Removed unneeded virtual from the JSUnprotectedEventListener::mark() function; it neither derives from or is derived from anyone else with a mark() function so there's no need for virtual.

• bindings/js/kjs_window.cpp: (KJS::Window::mark): Call JSGlobalObject::mark, not JSObject::mark. This is the actual bug fix.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDocumentCustom.cpp (modified) (1 diff)
• bindings/js/kjs_events.h (modified) (1 diff)
• bindings/js/kjs_window.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-05  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=16266
+          <rdar://problem/5625279> REGRESSION: crash loading CNN.com at
+          Interpreter::createObjectsForGlobalObjectProperties()
+
+        I don't know how to reproduce this in a test.
+
+        * bindings/js/JSDocumentCustom.cpp: (WebCore::JSDocument::mark):
+        Call JSEventTargetNode::mark instead of DOMObject::mark. There's no difference
+        right now, but it's best to call your base class, not your base's base.
+
+        * bindings/js/kjs_events.h: Removed unneeded virtual from the
+        JSUnprotectedEventListener::mark() function; it neither derives from or is
+        derived from anyone else with a mark() function so there's no need for virtual.
+
+        * bindings/js/kjs_window.cpp: (KJS::Window::mark): Call JSGlobalObject::mark,
+        not JSObject::mark. This is the actual bug fix.
+
 2007-12-05  Pierre-Luc Beaudoin  <pierre-luc.beaudoin@collabora.co.uk>
 

trunk/WebCore/bindings/js/JSDocumentCustom.cpp

@@ -42 +42 @@
 void JSDocument::mark()
 {
-    DOMObject::mark();
+    JSEventTargetNode::mark();
     ScriptInterpreter::markDOMNodesForDocument(static_cast<Document*>(impl()));
 }

trunk/WebCore/bindings/js/kjs_events.h

@@ -58 +58 @@
         virtual KJS::Window* windowObj() const;
         void clearWindowObj();
-        virtual void mark();
+        void mark();
     private:
         KJS::JSObject* m_listener;

trunk/WebCore/bindings/js/kjs_window.cpp

@@ -287 +287 @@
 void Window::mark()
 {
-  JSObject::mark();
+  JSGlobalObject::mark();
   if (d->loc && !d->loc->marked())
     d->loc->mark();