[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
eric at webkit.org
eric at webkit.org
Tue Jan 5 23:54:07 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 27c9a57c8a8187b17dcf3a2006b7e04ed630ee63
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 18 19:55:27 2009 +0000
2009-12-18 Martin Robinson <martin.james.robinson at 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=):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52328 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 38d5c3d..5dded1e 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-18 Martin Robinson <martin.james.robinson at 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 at nokia.com>
Reviewed by Tor Arne Vestbø.
diff --git a/JavaScriptCore/wtf/gtk/GRefPtr.h b/JavaScriptCore/wtf/gtk/GRefPtr.h
index 5b6081d..66739ef 100644
--- a/JavaScriptCore/wtf/gtk/GRefPtr.h
+++ b/JavaScriptCore/wtf/gtk/GRefPtr.h
@@ -91,21 +91,11 @@ template <typename T> inline GRefPtr<T>& GRefPtr<T>::operator=(const GRefPtr<T>&
return *this;
}
-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)
derefGPtr(ptr);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list