Changeset 48839 in webkit

Timestamp:

Sep 28, 2009 3:16:09 PM (15 years ago)

Author:

mrowe@apple.com

Message:

Roll out r48825. It causes build failures by calling an undefined function from within RefPtr.h.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/RefPtr.h (modified) (3 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/jni/jni_instance.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ -198 +198 @@
 
         * wtf/Platform.h: Add a WTF_USE_QXMLQUERY #define.
-
-2009-09-28  Yongjun Zhang  <yongjun.zhang@nokia.com>
-
-        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  Gabor Loki  <loki@inf.u-szeged.hu>

trunk/JavaScriptCore/wtf/RefPtr.h

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

trunk/WebCore/ChangeLog

@@ -149 +149 @@
         (WebCore::XSLTMessageHandler::handleMessage): Forwards all processor messages to the Console.
         (WebCore::XSLTProcessor::transformToString): Uses QXmlQuery.
-
-2009-09-28  Yongjun Zhang  <yongjun.zhang@nokia.com>
-
-        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:
 
 2009-09-28  Andrew Scherkus  <scherkus@chromium.org>

trunk/WebCore/bridge/jni/jni_instance.h

@@ -48 +48 @@
 friend class JavaMethod;
 
-public:
+protected:
+    JObjectWrapper(jobject instance);    
+    ~JObjectWrapper();
+    
     void ref() { _refCount++; }
     void deref() 
@@ -56 +59 @@
     }
 
-protected:
-    JObjectWrapper(jobject instance);    
-    ~JObjectWrapper();
-    
     jobject _instance;