Changeset 84176 in webkit

Timestamp:

Apr 18, 2011 1:34:50 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-04-18 Oliver Hunt <​oliver@apple.com>

Reviewed by Gavin Barraclough.

Remove DeprecatedPtr
​https://bugs.webkit.org/show_bug.cgi?id=58718

As simple as it sounds.

• runtime/JSValue.h:
• runtime/WriteBarrier.h:

2011-04-18 Oliver Hunt <​oliver@apple.com>

Reviewed by Gavin Barraclough.

Remove DeprecatedPtr
​https://bugs.webkit.org/show_bug.cgi?id=58718

Replace use of DeprecatedPtr<> with Global<> as ownership rules
aren't obvious, have filed bug #58820 on seeing if this is safe.

• bridge/qt/qt_class.cpp: (JSC::Bindings::QtClass::fallbackObject):
• bridge/qt/qt_instance.cpp: (JSC::Bindings::QtInstance::removeCachedMethod): (JSC::Bindings::QtInstance::markAggregate):
• bridge/qt/qt_instance.h:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/JSValue.h (modified) (2 diffs)
• JavaScriptCore/runtime/WriteBarrier.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/qt/qt_class.cpp (modified) (2 diffs)
• WebCore/bridge/qt/qt_instance.cpp (modified) (2 diffs)
• WebCore/bridge/qt/qt_instance.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-04-18  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Gavin Barraclough.
+
+        Remove DeprecatedPtr
+        https://bugs.webkit.org/show_bug.cgi?id=58718
+
+        As simple as it sounds.
+
+        * runtime/JSValue.h:
+        * runtime/WriteBarrier.h:
+
 2011-04-17  Cameron Zwarich  <zwarich@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSValue.h

@@ -52 +52 @@
     struct Instruction;
 
-    template <class T> class DeprecatedPtr;
     template <class T> class WriteBarrierBase;
 
@@ -237 +236 @@
 
     private:
-        template <class T> JSValue(DeprecatedPtr<T>);
         template <class T> JSValue(WriteBarrierBase<T>);
 

trunk/Source/JavaScriptCore/runtime/WriteBarrier.h

@@ -43 +43 @@
 typedef enum { } Unknown;
 typedef JSValue* HandleSlot;
-
-// FIXME: Remove all uses of this class.
-template <class T> class DeprecatedPtr {
-public:
-    DeprecatedPtr() : m_cell(0) { }
-    DeprecatedPtr(T* cell) : m_cell(reinterpret_cast<JSCell*>(cell)) { }
-    T* get() const { return reinterpret_cast<T*>(m_cell); }
-    T* operator*() const { return static_cast<T*>(m_cell); }
-    T* operator->() const { return static_cast<T*>(m_cell); }
-    
-    JSCell** slot() { return &m_cell; }
-    
-    typedef T* (DeprecatedPtr::*UnspecifiedBoolType);
-    operator UnspecifiedBoolType*() const { return m_cell ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0; }
-
-    bool operator!() const { return !m_cell; }
-
-protected:
-    JSCell* m_cell;
-};
-
-// FIXME: Remove all uses of this class.
-template <> class DeprecatedPtr<Unknown> {
-public:
-    DeprecatedPtr() { }
-    DeprecatedPtr(JSValue value) : m_value(value) { }
-    DeprecatedPtr(JSCell* value) : m_value(value) { }
-    const JSValue& get() const { return m_value; }
-    const JSValue* operator*() const { return &m_value; }
-    const JSValue* operator->() const { return &m_value; }
-    
-    JSValue* slot() { return &m_value; }
-    
-    typedef JSValue (DeprecatedPtr::*UnspecifiedBoolType);
-    operator UnspecifiedBoolType*() const { return m_value ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0; }
-    bool operator!() const { return !m_value; }
-    
-private:
-    JSValue m_value;
-};
-
-template <typename U, typename V> inline bool operator==(const DeprecatedPtr<U>& lhs, const DeprecatedPtr<V>& rhs)
-{
-    return lhs.get() == rhs.get();
-}
 
 template <typename T> struct JSValueChecker {

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-18  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Gavin Barraclough.
+
+        Remove DeprecatedPtr
+        https://bugs.webkit.org/show_bug.cgi?id=58718
+
+        Replace use of DeprecatedPtr<> with Global<> as ownership rules
+        aren't obvious, have filed bug #58820 on seeing if this is safe.
+
+        * bridge/qt/qt_class.cpp:
+        (JSC::Bindings::QtClass::fallbackObject):
+        * bridge/qt/qt_instance.cpp:
+        (JSC::Bindings::QtInstance::removeCachedMethod):
+        (JSC::Bindings::QtInstance::markAggregate):
+        * bridge/qt/qt_instance.h:
+
 2011-04-14  Matthew Delaney  <mdelaney@apple.com>
 

trunk/Source/WebCore/bridge/qt/qt_class.cpp

@@ -88 +88 @@
         if (m.access() != QMetaMethod::Private) {
             QtRuntimeMetaMethod* val = new (exec) QtRuntimeMetaMethod(exec, identifier, static_cast<QtInstance*>(inst), index, normal, false);
-            qtinst->m_methods.insert(name, val);
+            qtinst->m_methods.insert(name, Global<JSObject>(exec->globalData(), val));
             return val;
         }
@@ -107 +107 @@
         if (normal == QByteArray::fromRawData(signature, iter)) {
             QtRuntimeMetaMethod* val = new (exec) QtRuntimeMetaMethod(exec, identifier, static_cast<QtInstance*>(inst), index, normal, false);
-            qtinst->m_methods.insert(name, val);
+            qtinst->m_methods.insert(name, Global<JSObject>(exec->globalData(), val));
             return val;
         }

trunk/Source/WebCore/bridge/qt/qt_instance.cpp

@@ -152 +152 @@
         m_defaultMethod.clear();
 
-    for (QHash<QByteArray, DeprecatedPtr<JSObject> >::Iterator it = m_methods.begin(),
+    for (QHash<QByteArray, Global<JSObject> >::Iterator it = m_methods.begin(),
         end = m_methods.end(); it != end; ++it)
         if (it.value().get() == method) {
@@ -190 +190 @@
     if (m_defaultMethod)
         markStack.append(&m_defaultMethod);
-    foreach (DeprecatedPtr<JSObject> val, m_methods.values()) {
-        if (val)
-            markStack.append(&val);
-    }
 }
 

trunk/Source/WebCore/bridge/qt/qt_instance.h

@@ -84 +84 @@
     QPointer<QObject> m_object;
     QObject* m_hashkey;
-    mutable QHash<QByteArray, DeprecatedPtr<JSObject> > m_methods;
+    mutable QHash<QByteArray, Global<JSObject> > m_methods;
     mutable QHash<QString, QtField*> m_fields;
     mutable WriteBarrier<QtRuntimeMetaMethod> m_defaultMethod;