Changeset 48825 in webkit for trunk/JavaScriptCore/wtf/RefPtr.h

Timestamp:

Sep 28, 2009, 1:09:40 PM (16 years ago)

Author:

[email protected]

Message:

2009-09-28 Yongjun Zhang <​[email protected]>

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=28054

Use derefInNotNull() to work around winscw compiler forward declaration bug
regarding templated classes.

The compiler bug is reported at
​https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9812.

The change should be reverted when the above bug is fixed in winscw compiler.

Add parenthesis around (RefPtr::*UnspecifiedBoolType) to make winscw compiler
work with the default UnSpecifiedBoolType() operator, which removes the winscw hack.

• wtf/RefPtr.h: (WTF::RefPtr::~RefPtr): (WTF::RefPtr::clear): (WTF::RefPtr::operator UnspecifiedBoolType):

2009-09-28 Yongjun Zhang <​[email protected]>

Reviewed by Eric Seidel.

Make JObjectWrapper::ref() and deref() public accessible to derefIfNull().

Will be reverted when the following winscw compiler bug is fixed.
​https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9812

• bridge/jni/jni_instance.h:

File:

• trunk/JavaScriptCore/wtf/RefPtr.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/RefPtr.h

@@ -49 +49 @@
         bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); }
 
-        ~RefPtr() { if (T* ptr = m_ptr) ptr->deref(); }
+        ~RefPtr() { derefIfNotNull(m_ptr); }
         
         template <typename U> RefPtr(const RefPtr<U>& o) : m_ptr(o.get()) { if (T* ptr = m_ptr) ptr->ref(); }
@@ -55 +55 @@
         T* get() const { return m_ptr; }
         
-        void clear() { if (T* ptr = m_ptr) ptr->deref(); m_ptr = 0; }
+        void clear() { derefIfNotNull(m_ptr); m_ptr = 0; }
         PassRefPtr<T> release() { PassRefPtr<T> tmp = adoptRef(m_ptr); m_ptr = 0; return tmp; }
 
@@ -64 +64 @@
     
         // This conversion operator allows implicit conversion to bool but not to other integer types.
-#if COMPILER(WINSCW)
-        operator bool() const { return m_ptr; }
-#else
-        typedef T* RefPtr::*UnspecifiedBoolType;
+        typedef T* (RefPtr::*UnspecifiedBoolType);
         operator UnspecifiedBoolType() const { return m_ptr ? &RefPtr::m_ptr : 0; }
-#endif
         
         RefPtr& operator=(const RefPtr&);