Changeset 77159 in webkit


Ignore:
Timestamp:
Jan 31, 2011 2:24:27 PM (13 years ago)
Author:
msaboff@apple.com
Message:

Rolling back in the changes for https://bugs.webkit.org/show_bug.cgi?id=53271.

Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r77151 r77159  
     12011-01-31  Michael Saboff  <msaboff@apple.com>
     2
     3        Reviewed by Geoffrey Garen.
     4
     5        Potentially Unsafe HashSet of RuntimeObject* in RootObject definition
     6        https://bugs.webkit.org/show_bug.cgi?id=53271
     7
     8        Reapplying this change again.
     9        Changed isValid() to use .get() as a result of change r77151.
     10
     11        Added new isValid() methods to check if a contained object in
     12        a WeakGCMap is valid when using an unchecked iterator.
     13
     14        * runtime/WeakGCMap.h:
     15        (JSC::WeakGCMap::isValid):
     16
    1172011-01-31  Oliver Hunt  <oliver@apple.com>
    218
  • trunk/Source/JavaScriptCore/runtime/WeakGCMap.h

    r77151 r77159  
    7777    const_iterator uncheckedEnd() const { return m_map.end(); }
    7878
     79    bool isValid(iterator it) const { return Heap::isCellMarked(it->second.get()); }
     80    bool isValid(const_iterator it) const { return Heap::isCellMarked(it->second.get()); }
     81
    7982private:
    8083    HashMap<KeyType, DeprecatedPtr<MappedType> > m_map;
  • trunk/Source/WebCore/ChangeLog

    r77156 r77159  
     12011-01-31  Michael Saboff  <msaboff@apple.com>
     2
     3        Reviewed by Geoffrey Garen.
     4
     5        Potentially Unsafe HashSet of RuntimeObject* in RootObject definition
     6        https://bugs.webkit.org/show_bug.cgi?id=53271
     7
     8        Reapplying this patch again.
     9        The removal of this patch in <http://trac.webkit.org/changeset/77125>
     10        as part of https://bugs.webkit.org/show_bug.cgi?id=53418,
     11        removed the both the first (failing) patch (r76893) and this fixed
     12        patch (r76969).  This patch includes slight changes necessitated by
     13        r77151.
     14
     15        Reapplying this patch with the change that the second ASSERT in
     16        RootObject::removeRuntimeObject was changed to use
     17        .uncheckedGet() instead of the failing .get().  The object in question
     18        could be in the process of being GC'ed.  The get() call will not return
     19        such an object while the uncheckedGet() call will return the (unsafe)
     20        object.  This is the behavior we want.
     21
     22        Precautionary change.
     23        Changed RootObject to use WeakGCMap instead of HashSet.
     24        Found will looking for another issue, but can't produce a test case
     25        that is problematic.  THerefore there aren't any new tests.
     26
     27        * bridge/runtime_root.cpp:
     28        (JSC::Bindings::RootObject::invalidate):
     29        (JSC::Bindings::RootObject::addRuntimeObject):
     30        (JSC::Bindings::RootObject::removeRuntimeObject):
     31        * bridge/runtime_root.h:
     32
    1332011-01-31  Andreas Kling  <kling@webkit.org>
    234
  • trunk/Source/WebCore/bridge/runtime_root.cpp

    r77125 r77159  
    102102
    103103    {
    104         HashSet<RuntimeObject*>::iterator end = m_runtimeObjects.end();
    105         for (HashSet<RuntimeObject*>::iterator it = m_runtimeObjects.begin(); it != end; ++it)
    106             (*it)->invalidate();
    107        
     104        WeakGCMap<RuntimeObject*, RuntimeObject>::iterator end = m_runtimeObjects.uncheckedEnd();
     105        for (WeakGCMap<RuntimeObject*, RuntimeObject>::iterator it = m_runtimeObjects.uncheckedBegin(); it != end; ++it) {
     106            if (m_runtimeObjects.isValid(it))
     107                it->second->invalidate();
     108        }
     109
    108110        m_runtimeObjects.clear();
    109111    }
    110    
     112
    111113    m_isValid = false;
    112114
     
    177179{
    178180    ASSERT(m_isValid);
    179     ASSERT(!m_runtimeObjects.contains(object));
    180    
    181     m_runtimeObjects.add(object);
    182 }       
    183    
     181    ASSERT(!m_runtimeObjects.get(object));
     182
     183    m_runtimeObjects.set(object, object);
     184}
     185
    184186void RootObject::removeRuntimeObject(RuntimeObject* object)
    185187{
    186188    ASSERT(m_isValid);
    187     ASSERT(m_runtimeObjects.contains(object));
    188    
    189     m_runtimeObjects.remove(object);
     189    ASSERT(m_runtimeObjects.uncheckedGet(object));
     190
     191    m_runtimeObjects.take(object);
    190192}
    191193
  • trunk/Source/WebCore/bridge/runtime_root.h

    r77125 r77159  
    3232#include <runtime/Protect.h>
    3333
     34#include <runtime/WeakGCMap.h>
    3435#include <wtf/Forward.h>
    35 #include <wtf/HashSet.h>
    3636#include <wtf/Noncopyable.h>
    3737#include <wtf/PassRefPtr.h>
     
    9090
    9191    ProtectCountSet m_protectCountSet;
    92     HashSet<RuntimeObject*> m_runtimeObjects;   
     92    WeakGCMap<RuntimeObject*, RuntimeObject> m_runtimeObjects; // Really need a WeakGCSet, but this will do.
    9393
    9494    HashSet<InvalidationCallback*> m_invalidationCallbacks;
Note: See TracChangeset for help on using the changeset viewer.