Changeset 52328 in webkit

Timestamp:

Dec 18, 2009 11:55:27 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-18 Martin Robinson <​martin.james.robinson@gmail.com>

Reviewed by Gustavo Noronha Silva.

[GTK] GRefPtr does not take a reference when assigned a raw pointer
​https://bugs.webkit.org/show_bug.cgi?id=32709

Ensure that when assigning a raw pointer to a GRefPtr, the reference
count is incremented. Also remove the GRefPtr conversion overload as
GRefPtr types have necessarily incompatible reference counting.

• wtf/gtk/GRefPtr.h: (WTF::GRefPtr::operator=):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/gtk/GRefPtr.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-12-18  Martin Robinson  <martin.james.robinson@gmail.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] GRefPtr does not take a reference when assigned a raw pointer
+        https://bugs.webkit.org/show_bug.cgi?id=32709
+
+        Ensure that when assigning a raw pointer to a GRefPtr, the reference
+        count is incremented. Also remove the GRefPtr conversion overload as
+        GRefPtr types have necessarily incompatible reference counting.
+
+        * wtf/gtk/GRefPtr.h:
+        (WTF::GRefPtr::operator=):
+
 2009-12-18  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/JavaScriptCore/wtf/gtk/GRefPtr.h

@@ -92 +92 @@
 }
 
-template <typename T> template <typename U> inline GRefPtr<T>& GRefPtr<T>::operator=(const GRefPtr<U>& o)
-{
-    T* optr = o.get();
-    if (optr)
-        refGPtr(optr);
-    T* ptr = m_ptr;
-    m_ptr = optr;
-    if (ptr)
-        derefGPtr(ptr);
-    return *this;
-}
-
 template <typename T> inline GRefPtr<T>& GRefPtr<T>::operator=(T* optr)
 {
     T* ptr = m_ptr;
+    if (optr)
+        refGPtr(optr);
     m_ptr = optr;
     if (ptr)