Changeset 77979 in webkit

Timestamp:

Feb 8, 2011 3:09:49 PM (13 years ago)

Author:

msaboff@apple.com

Message:

2011-02-08 Michael Saboff <​msaboff@apple.com>

JSC::Bindings m_rootObject->isValid() assert fails when running layout tests
​https://bugs.webkit.org/show_bug.cgi?id=53716

Changed ASSERT to be an if for the case where the RuntimeObject was
GC'ed before RootObject::invalidate is called. In that case there is
no need to remove the RuntimeObject from the RootObject. The isValid()
call will be false in this case, but the RuntimeObject has already
been removed from the RootObject. Added similar defensive code
in RootObject::removeRuntimeObject().

• bridge/jsc/BridgeJSC.cpp: (JSC::Bindings::Instance::willDestroyRuntimeObject):
• bridge/runtime_root.cpp: (JSC::Bindings::RootObject::removeRuntimeObject):

2011-02-08 Michael Saboff <​msaboff@apple.com>

Reviewed by Darin Adler.

JSC::Bindings m_rootObject->isValid() assert fails when running layout tests
​https://bugs.webkit.org/show_bug.cgi?id=53716

Re-enabled tests that are fixed with the corresponding change in
WebCore.

• platform/gtk/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bridge/jsc/BridgeJSC.cpp (modified) (1 diff)
• Source/WebCore/bridge/runtime_root.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-08  Michael Saboff  <msaboff@apple.com>
+
+        Reviewed by Darin Adler.
+
+        JSC::Bindings m_rootObject->isValid() assert fails when running layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=53716
+
+        Re-enabled tests that are fixed with the corresponding change in 
+        WebCore.
+
+        * platform/gtk/Skipped:
+
 2011-02-08  Xiaomei Ji  <xji@chromium.org>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -4643 +4643 @@
 http/tests/websocket/tests/cross-origin.html
 
-# These tests fail ASSERT(m_rootObject->isValid()); on the GTK+ debug bots.
-# It should be unskipped when https://bugs.webkit.org/show_bug.cgi?id=53716 is fixed.
-fast/frames/set-parent-src-synchronously.html
-fast/frames/sandboxed-iframe-storage.html
+# GTK+ DRT should support enabling and disabling the icon database
+http/tests/inspector/resource-har-conversion.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-08  Michael Saboff  <msaboff@apple.com>
+
+        JSC::Bindings m_rootObject->isValid() assert fails when running layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=53716
+
+        Changed ASSERT to be an if for the case where the RuntimeObject was
+        GC'ed before RootObject::invalidate is called.  In that case there is 
+        no need to remove the RuntimeObject from the RootObject.  The isValid()
+        call will be false in this case, but the RuntimeObject has already
+        been removed from the RootObject.  Added similar defensive code
+        in RootObject::removeRuntimeObject().
+
+        * bridge/jsc/BridgeJSC.cpp:
+        (JSC::Bindings::Instance::willDestroyRuntimeObject):
+        * bridge/runtime_root.cpp:
+        (JSC::Bindings::RootObject::removeRuntimeObject):
+
 2011-02-08  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/bridge/jsc/BridgeJSC.cpp

@@ -107 +107 @@
 {
     ASSERT(m_rootObject);
-    ASSERT(m_rootObject->isValid());
     m_rootObject->removeRuntimeObject(object);
     m_runtimeObject.clear(object);

trunk/Source/WebCore/bridge/runtime_root.cpp

@@ -186 +186 @@
 void RootObject::removeRuntimeObject(RuntimeObject* object)
 {
-    ASSERT(m_isValid);
+    if (!m_isValid)
+        return;
+
     ASSERT(m_runtimeObjects.uncheckedGet(object));