[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 62b1d3681941d83c6ddbc8ac75ab2038ce68757b
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 28 22:16:09 2009 +0000

    Roll out r48825.  It causes build failures by calling an undefined function from within RefPtr.h.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48839 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 5647706..c537d8d 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -198,28 +198,6 @@
 
         * wtf/Platform.h: Add a WTF_USE_QXMLQUERY #define.
 
-2009-09-28  Yongjun Zhang  <yongjun.zhang at 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 at inf.u-szeged.hu>
 
         Reviewed by Simon Hausmann.
diff --git a/JavaScriptCore/wtf/RefPtr.h b/JavaScriptCore/wtf/RefPtr.h
index 0877812..e6d1047 100644
--- a/JavaScriptCore/wtf/RefPtr.h
+++ b/JavaScriptCore/wtf/RefPtr.h
@@ -50,13 +50,13 @@ namespace WTF {
         RefPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) { }
         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(); }
         
         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; }
 
         T& operator*() const { return *m_ptr; }
@@ -65,8 +65,12 @@ namespace WTF {
         bool operator!() const { return !m_ptr; }
     
         // 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&);
         RefPtr& operator=(T*);
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6a74528..ecea376 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -149,17 +149,6 @@
         (WebCore::XSLTMessageHandler::handleMessage): Forwards all processor messages to the Console.
         (WebCore::XSLTProcessor::transformToString): Uses QXmlQuery.
 
-2009-09-28  Yongjun Zhang  <yongjun.zhang at 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 at chromium.org>
 
         Reviewed by Eric Carlson.
diff --git a/WebCore/bridge/jni/jni_instance.h b/WebCore/bridge/jni/jni_instance.h
index e227248..0dcab3e 100644
--- a/WebCore/bridge/jni/jni_instance.h
+++ b/WebCore/bridge/jni/jni_instance.h
@@ -47,7 +47,10 @@ friend class JavaField;
 friend class JavaInstance;
 friend class JavaMethod;
 
-public:
+protected:
+    JObjectWrapper(jobject instance);    
+    ~JObjectWrapper();
+    
     void ref() { _refCount++; }
     void deref() 
     { 
@@ -55,10 +58,6 @@ public:
             delete this; 
     }
 
-protected:
-    JObjectWrapper(jobject instance);    
-    ~JObjectWrapper();
-    
     jobject _instance;
 
 private:

-- 
WebKit Debian packaging