Changeset 77125 in webkit

Timestamp:

Jan 31, 2011 6:26:50 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-31 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r76969.
​http://trac.webkit.org/changeset/76969
​https://bugs.webkit.org/show_bug.cgi?id=53418

"It is causing crashes in GTK+ and Leopard bots" (Requested by
alexg on #webkit).

• runtime/WeakGCMap.h:

2011-01-31 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r76969.
​http://trac.webkit.org/changeset/76969
​https://bugs.webkit.org/show_bug.cgi?id=53418

"It is causing crashes in GTK+ and Leopard bots" (Requested by
alexg on #webkit).

• bridge/runtime_root.cpp: (JSC::Bindings::RootObject::invalidate): (JSC::Bindings::RootObject::addRuntimeObject): (JSC::Bindings::RootObject::removeRuntimeObject):
• bridge/runtime_root.h:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/WeakGCMap.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/runtime_root.cpp (modified) (2 diffs)
• WebCore/bridge/runtime_root.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-01-31  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r76969.
+        http://trac.webkit.org/changeset/76969
+        https://bugs.webkit.org/show_bug.cgi?id=53418
+
+        "It is causing crashes in GTK+ and Leopard bots" (Requested by
+        alexg__ on #webkit).
+
+        * runtime/WeakGCMap.h:
+
 2011-01-30  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/JavaScriptCore/runtime/WeakGCMap.h

@@ -70 +70 @@
     const_iterator uncheckedEnd() const { return m_map.end(); }
 
-    bool isValid(iterator it) const { return Heap::isCellMarked(it->second); }
-    bool isValid(const_iterator it) const { return Heap::isCellMarked(it->second); }
-
 private:
     HashMap<KeyType, MappedType> m_map;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-31  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r76969.
+        http://trac.webkit.org/changeset/76969
+        https://bugs.webkit.org/show_bug.cgi?id=53418
+
+        "It is causing crashes in GTK+ and Leopard bots" (Requested by
+        alexg__ on #webkit).
+
+        * bridge/runtime_root.cpp:
+        (JSC::Bindings::RootObject::invalidate):
+        (JSC::Bindings::RootObject::addRuntimeObject):
+        (JSC::Bindings::RootObject::removeRuntimeObject):
+        * bridge/runtime_root.h:
+
 2011-01-31  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/bridge/runtime_root.cpp

@@ -102 +102 @@
 
     {
-        WeakGCMap<RuntimeObject*, RuntimeObject*>::iterator end = m_runtimeObjects.uncheckedEnd();
-        for (WeakGCMap<RuntimeObject*, RuntimeObject*>::iterator it = m_runtimeObjects.uncheckedBegin(); it != end; ++it) {
-            if (m_runtimeObjects.isValid(it))
-                it->second->invalidate();
-        }
-
+        HashSet<RuntimeObject*>::iterator end = m_runtimeObjects.end();
+        for (HashSet<RuntimeObject*>::iterator it = m_runtimeObjects.begin(); it != end; ++it)
+            (*it)->invalidate();
+        
         m_runtimeObjects.clear();
     }
-
+    
     m_isValid = false;
 
@@ -179 +177 @@
 {
     ASSERT(m_isValid);
-    ASSERT(!m_runtimeObjects.get(object));
-
-    m_runtimeObjects.set(object, object);
-}
-
+    ASSERT(!m_runtimeObjects.contains(object));
+    
+    m_runtimeObjects.add(object);
+}        
+    
 void RootObject::removeRuntimeObject(RuntimeObject* object)
 {
     ASSERT(m_isValid);
-    ASSERT(m_runtimeObjects.uncheckedGet(object));
-
-    m_runtimeObjects.take(object);
+    ASSERT(m_runtimeObjects.contains(object));
+    
+    m_runtimeObjects.remove(object);
 }
 

trunk/Source/WebCore/bridge/runtime_root.h

@@ -32 +32 @@
 #include <runtime/Protect.h>
 
-#include <runtime/WeakGCMap.h>
 #include <wtf/Forward.h>
+#include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/PassRefPtr.h>
@@ -90 +90 @@
 
     ProtectCountSet m_protectCountSet;
-    WeakGCMap<RuntimeObject*, RuntimeObject*> m_runtimeObjects; // Really need a WeakGCSet, but this will do.
+    HashSet<RuntimeObject*> m_runtimeObjects;    
 
     HashSet<InvalidationCallback*> m_invalidationCallbacks;