- Revision
- 88988
- Author
- [email protected]
- Date
- 2011-06-15 18:17:46 -0700 (Wed, 15 Jun 2011)
Log Message
2011-06-15 Darin Adler <[email protected]>
Reviewed by Adam Barth.
Remove obsolete LOOSE_OWN_PTR code
https://bugs.webkit.org/show_bug.cgi?id=59909
The internal Apple dependency on this is gone now.
* wtf/OwnArrayPtr.h: Removed constructor that takes a raw pointer,
set function that takes a raw pointer.
* wtf/OwnPtr.h: Removed constructor that takes a raw pointer,
set functino that takes a raw pointer.
* wtf/PassOwnArrayPtr.h: Made constructor that takes a nullptr
and assignment operator that takes a nullptr unconditional.
Made constructor that takes a raw pointer private and explicit,
and removed assignment operator that takes a raw pointer.
* wtf/PassOwnPtr.h: Made assignment operator that takes a nullptr
unconditional. Made constructor that takes a raw pointer private
and explicit, and removed assignment operator that takes a raw pointer.
2011-06-15 Darin Adler <[email protected]>
Reviewed by Adam Barth.
Remove obsolete LOOSE_OWN_PTR code
https://bugs.webkit.org/show_bug.cgi?id=59909
* src/StorageAreaProxy.cpp:
(WebCore::StorageAreaProxy::StorageAreaProxy): Use adoptPtr
instead of LOOSE_OWN_PTR.
* src/StorageNamespaceProxy.cpp:
(WebCore::StorageNamespaceProxy::StorageNamespaceProxy): Ditto.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (88987 => 88988)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-16 01:09:05 UTC (rev 88987)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-16 01:17:46 UTC (rev 88988)
@@ -1,3 +1,27 @@
+2011-06-15 Darin Adler <[email protected]>
+
+ Reviewed by Adam Barth.
+
+ Remove obsolete LOOSE_OWN_PTR code
+ https://bugs.webkit.org/show_bug.cgi?id=59909
+
+ The internal Apple dependency on this is gone now.
+
+ * wtf/OwnArrayPtr.h: Removed constructor that takes a raw pointer,
+ set function that takes a raw pointer.
+
+ * wtf/OwnPtr.h: Removed constructor that takes a raw pointer,
+ set functino that takes a raw pointer.
+
+ * wtf/PassOwnArrayPtr.h: Made constructor that takes a nullptr
+ and assignment operator that takes a nullptr unconditional.
+ Made constructor that takes a raw pointer private and explicit,
+ and removed assignment operator that takes a raw pointer.
+
+ * wtf/PassOwnPtr.h: Made assignment operator that takes a nullptr
+ unconditional. Made constructor that takes a raw pointer private
+ and explicit, and removed assignment operator that takes a raw pointer.
+
2011-06-15 Sam Weinig <[email protected]>
Reviewed by Geoffrey Garen and Gavin Barraclough.
Modified: trunk/Source/_javascript_Core/wtf/OwnArrayPtr.h (88987 => 88988)
--- trunk/Source/_javascript_Core/wtf/OwnArrayPtr.h 2011-06-16 01:09:05 UTC (rev 88987)
+++ trunk/Source/_javascript_Core/wtf/OwnArrayPtr.h 2011-06-16 01:17:46 UTC (rev 88988)
@@ -76,11 +76,6 @@
void swap(OwnArrayPtr& o) { std::swap(m_ptr, o.m_ptr); }
-#ifdef LOOSE_OWN_ARRAY_PTR
- explicit OwnArrayPtr(PtrType ptr) : m_ptr(ptr) { }
- void set(PtrType);
-#endif
-
private:
PtrType m_ptr;
};
@@ -111,16 +106,6 @@
return ptr;
}
-#ifdef LOOSE_OWN_ARRAY_PTR
-template<typename T> inline void OwnArrayPtr<T>::set(PtrType ptr)
-{
- ASSERT(!ptr || m_ptr != ptr);
- PtrType oldPtr = m_ptr;
- m_ptr = ptr;
- deleteOwnedArrayPtr(oldPtr);
-}
-#endif
-
template<typename T> inline OwnArrayPtr<T>& OwnArrayPtr<T>::operator=(const PassOwnArrayPtr<T>& o)
{
PtrType ptr = m_ptr;
Modified: trunk/Source/_javascript_Core/wtf/OwnPtr.h (88987 => 88988)
--- trunk/Source/_javascript_Core/wtf/OwnPtr.h 2011-06-16 01:09:05 UTC (rev 88987)
+++ trunk/Source/_javascript_Core/wtf/OwnPtr.h 2011-06-16 01:17:46 UTC (rev 88988)
@@ -74,11 +74,6 @@
void swap(OwnPtr& o) { std::swap(m_ptr, o.m_ptr); }
-#ifdef LOOSE_OWN_PTR
- explicit OwnPtr(PtrType ptr) : m_ptr(ptr) { }
- void set(PtrType);
-#endif
-
private:
OwnPtr& operator=(const OwnPtr<T>&);
@@ -118,16 +113,6 @@
return ptr;
}
-#ifdef LOOSE_OWN_PTR
- template<typename T> inline void OwnPtr<T>::set(PtrType ptr)
- {
- ASSERT(!ptr || m_ptr != ptr);
- PtrType oldPtr = m_ptr;
- m_ptr = ptr;
- deleteOwnedPtr(oldPtr);
- }
-#endif
-
template<typename T> inline OwnPtr<T>& OwnPtr<T>::operator=(const PassOwnPtr<T>& o)
{
PtrType ptr = m_ptr;
Modified: trunk/Source/_javascript_Core/wtf/PassOwnArrayPtr.h (88987 => 88988)
--- trunk/Source/_javascript_Core/wtf/PassOwnArrayPtr.h 2011-06-16 01:09:05 UTC (rev 88987)
+++ trunk/Source/_javascript_Core/wtf/PassOwnArrayPtr.h 2011-06-16 01:17:46 UTC (rev 88988)
@@ -42,10 +42,7 @@
typedef T* PtrType;
PassOwnArrayPtr() : m_ptr(0) { }
-
-#if !defined(LOOSE_PASS_OWN_PTR) || !HAVE(NULLPTR)
PassOwnArrayPtr(std::nullptr_t) : m_ptr(0) { }
-#endif
// It somewhat breaks the type system to allow transfer of ownership out of
// a const PassOwnArrayPtr. However, it makes it much easier to work with PassOwnArrayPtr
@@ -74,22 +71,13 @@
#endif
PassOwnArrayPtr& operator=(const PassOwnArrayPtr<T>&);
-#if !defined(LOOSE_PASS_OWN_ARRAY_PTR) || !HAVE(NULLPTR)
PassOwnArrayPtr& operator=(std::nullptr_t) { clear(); return *this; }
-#endif
template<typename U> PassOwnArrayPtr& operator=(const PassOwnArrayPtr<U>&);
template<typename U> friend PassOwnArrayPtr<U> adoptArrayPtr(U*);
-#ifdef LOOSE_PASS_OWN_ARRAY_PTR
- PassOwnArrayPtr(PtrType ptr) : m_ptr(ptr) { }
- PassOwnArrayPtr& operator=(PtrType);
-#endif
-
private:
-#ifndef LOOSE_PASS_OWN_ARRAY_PTR
explicit PassOwnArrayPtr(PtrType ptr) : m_ptr(ptr) { }
-#endif
mutable PtrType m_ptr;
};
@@ -108,18 +96,6 @@
return ptr;
}
-#ifdef LOOSE_PASS_OWN_ARRAY_PTR
-template<typename T> inline PassOwnArrayPtr<T>& PassOwnArrayPtr<T>::operator=(PtrType optr)
-{
- PtrType ptr = m_ptr;
- m_ptr = optr;
- ASSERT(!ptr || m_ptr != ptr);
- if (ptr)
- deleteOwnedArrayPtr(ptr);
- return *this;
-}
-#endif
-
template<typename T> inline PassOwnArrayPtr<T>& PassOwnArrayPtr<T>::operator=(const PassOwnArrayPtr<T>& optr)
{
PtrType ptr = m_ptr;
Modified: trunk/Source/_javascript_Core/wtf/PassOwnPtr.h (88987 => 88988)
--- trunk/Source/_javascript_Core/wtf/PassOwnPtr.h 2011-06-16 01:09:05 UTC (rev 88987)
+++ trunk/Source/_javascript_Core/wtf/PassOwnPtr.h 2011-06-16 01:17:46 UTC (rev 88988)
@@ -70,22 +70,13 @@
operator UnspecifiedBoolType() const { return m_ptr ? &PassOwnPtr::m_ptr : 0; }
PassOwnPtr& operator=(const PassOwnPtr<T>&);
-#if !defined(LOOSE_PASS_OWN_PTR) || !HAVE(NULLPTR)
PassOwnPtr& operator=(std::nullptr_t) { clear(); return *this; }
-#endif
template<typename U> PassOwnPtr& operator=(const PassOwnPtr<U>&);
template<typename U> friend PassOwnPtr<U> adoptPtr(U*);
-#ifdef LOOSE_PASS_OWN_PTR
- PassOwnPtr(PtrType ptr) : m_ptr(ptr) { }
- PassOwnPtr& operator=(PtrType);
-#endif
-
private:
-#ifndef LOOSE_PASS_OWN_PTR
explicit PassOwnPtr(PtrType ptr) : m_ptr(ptr) { }
-#endif
// We should never have two OwnPtrs for the same underlying object (otherwise we'll get
// double-destruction), so these equality operators should never be needed.
@@ -111,18 +102,6 @@
return ptr;
}
-#ifdef LOOSE_PASS_OWN_PTR
- template<typename T> inline PassOwnPtr<T>& PassOwnPtr<T>::operator=(PtrType optr)
- {
- PtrType ptr = m_ptr;
- m_ptr = optr;
- ASSERT(!ptr || m_ptr != ptr);
- if (ptr)
- deleteOwnedPtr(ptr);
- return *this;
- }
-#endif
-
template<typename T> inline PassOwnPtr<T>& PassOwnPtr<T>::operator=(const PassOwnPtr<T>& optr)
{
PtrType ptr = m_ptr;
Modified: trunk/Source/WebKit/chromium/ChangeLog (88987 => 88988)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-16 01:09:05 UTC (rev 88987)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-16 01:17:46 UTC (rev 88988)
@@ -1,3 +1,16 @@
+2011-06-15 Darin Adler <[email protected]>
+
+ Reviewed by Adam Barth.
+
+ Remove obsolete LOOSE_OWN_PTR code
+ https://bugs.webkit.org/show_bug.cgi?id=59909
+
+ * src/StorageAreaProxy.cpp:
+ (WebCore::StorageAreaProxy::StorageAreaProxy): Use adoptPtr
+ instead of LOOSE_OWN_PTR.
+ * src/StorageNamespaceProxy.cpp:
+ (WebCore::StorageNamespaceProxy::StorageNamespaceProxy): Ditto.
+
2011-06-15 Andrey Kosyakov <[email protected]>
Unreviewed, rolled out r88937 (broke build on mac)
Modified: trunk/Source/WebKit/chromium/src/StorageAreaProxy.cpp (88987 => 88988)
--- trunk/Source/WebKit/chromium/src/StorageAreaProxy.cpp 2011-06-16 01:09:05 UTC (rev 88987)
+++ trunk/Source/WebKit/chromium/src/StorageAreaProxy.cpp 2011-06-16 01:17:46 UTC (rev 88988)
@@ -25,10 +25,6 @@
*/
#include "config.h"
-
-// FIXME: Remove this define!
-#define LOOSE_OWN_PTR
-
#include "StorageAreaProxy.h"
#if ENABLE(DOM_STORAGE)
@@ -53,8 +49,9 @@
namespace WebCore {
+// FIXME: storageArea argument should be a PassOwnPtr.
StorageAreaProxy::StorageAreaProxy(WebKit::WebStorageArea* storageArea, StorageType storageType)
- : m_storageArea(storageArea)
+ : m_storageArea(adoptPtr(storageArea))
, m_storageType(storageType)
{
}
Modified: trunk/Source/WebKit/chromium/src/StorageNamespaceProxy.cpp (88987 => 88988)
--- trunk/Source/WebKit/chromium/src/StorageNamespaceProxy.cpp 2011-06-16 01:09:05 UTC (rev 88987)
+++ trunk/Source/WebKit/chromium/src/StorageNamespaceProxy.cpp 2011-06-16 01:17:46 UTC (rev 88988)
@@ -24,10 +24,6 @@
*/
#include "config.h"
-
-// FIXME: Remove this define!
-#define LOOSE_OWN_PTR
-
#include "StorageNamespaceProxy.h"
#if ENABLE(DOM_STORAGE)
@@ -57,8 +53,9 @@
return adoptRef(new StorageNamespaceProxy(webViewClient->createSessionStorageNamespace(quota), SessionStorage));
}
+// FIXME: storageNamespace argument should be a PassOwnPtr.
StorageNamespaceProxy::StorageNamespaceProxy(WebKit::WebStorageNamespace* storageNamespace, StorageType storageType)
- : m_storageNamespace(storageNamespace)
+ : m_storageNamespace(adoptPtr(storageNamespace))
, m_storageType(storageType)
{
}
