Changeset 77979 in webkit
- Timestamp:
- Feb 8, 2011 3:09:49 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r77973 r77979 1 2011-02-08 Michael Saboff <msaboff@apple.com> 2 3 Reviewed by Darin Adler. 4 5 JSC::Bindings m_rootObject->isValid() assert fails when running layout tests 6 https://bugs.webkit.org/show_bug.cgi?id=53716 7 8 Re-enabled tests that are fixed with the corresponding change in 9 WebCore. 10 11 * platform/gtk/Skipped: 12 1 13 2011-02-08 Xiaomei Ji <xji@chromium.org> 2 14 -
trunk/LayoutTests/platform/gtk/Skipped
r77971 r77979 4643 4643 http/tests/websocket/tests/cross-origin.html 4644 4644 4645 # These tests fail ASSERT(m_rootObject->isValid()); on the GTK+ debug bots. 4646 # It should be unskipped when https://bugs.webkit.org/show_bug.cgi?id=53716 is fixed. 4647 fast/frames/set-parent-src-synchronously.html 4648 fast/frames/sandboxed-iframe-storage.html 4645 # GTK+ DRT should support enabling and disabling the icon database 4646 http/tests/inspector/resource-har-conversion.html -
trunk/Source/WebCore/ChangeLog
r77970 r77979 1 2011-02-08 Michael Saboff <msaboff@apple.com> 2 3 JSC::Bindings m_rootObject->isValid() assert fails when running layout tests 4 https://bugs.webkit.org/show_bug.cgi?id=53716 5 6 Changed ASSERT to be an if for the case where the RuntimeObject was 7 GC'ed before RootObject::invalidate is called. In that case there is 8 no need to remove the RuntimeObject from the RootObject. The isValid() 9 call will be false in this case, but the RuntimeObject has already 10 been removed from the RootObject. Added similar defensive code 11 in RootObject::removeRuntimeObject(). 12 13 * bridge/jsc/BridgeJSC.cpp: 14 (JSC::Bindings::Instance::willDestroyRuntimeObject): 15 * bridge/runtime_root.cpp: 16 (JSC::Bindings::RootObject::removeRuntimeObject): 17 1 18 2011-02-08 Beth Dakin <bdakin@apple.com> 2 19 -
trunk/Source/WebCore/bridge/jsc/BridgeJSC.cpp
r71426 r77979 107 107 { 108 108 ASSERT(m_rootObject); 109 ASSERT(m_rootObject->isValid());110 109 m_rootObject->removeRuntimeObject(object); 111 110 m_runtimeObject.clear(object); -
trunk/Source/WebCore/bridge/runtime_root.cpp
r77159 r77979 186 186 void RootObject::removeRuntimeObject(RuntimeObject* object) 187 187 { 188 ASSERT(m_isValid); 188 if (!m_isValid) 189 return; 190 189 191 ASSERT(m_runtimeObjects.uncheckedGet(object)); 190 192
Note: See TracChangeset
for help on using the changeset viewer.