Index: public/common/WebPrivateOwnPtr.h |
diff --git a/public/platform/WebPrivateOwnPtr.h b/public/common/WebPrivateOwnPtr.h |
similarity index 92% |
copy from public/platform/WebPrivateOwnPtr.h |
copy to public/common/WebPrivateOwnPtr.h |
index 4bcabcfe685316b452e589fd980ef1e207aa9dae..ef581955b368319fce069ecc43085e5867d162f3 100644 |
--- a/public/platform/WebPrivateOwnPtr.h |
+++ b/public/common/WebPrivateOwnPtr.h |
@@ -26,11 +26,11 @@ |
#ifndef WebPrivateOwnPtr_h |
#define WebPrivateOwnPtr_h |
-#include "WebCommon.h" |
+#include "WebAssertion.h" |
namespace WebKit { |
-// This class is an implementation detail of the WebKit API. It exists |
+// This class is an implementation detail of the WebKit API. It exists |
// to help simplify the implementation of WebKit interfaces that merely |
// wrap a pointer to a WebCore class. It's similar to WebPrivatePtr, but it |
// wraps a naked pointer rather than a reference counted. |
@@ -39,10 +39,10 @@ namespace WebKit { |
template <typename T> |
class WebPrivateOwnPtr { |
public: |
- WebPrivateOwnPtr() : m_ptr(0) {} |
+ WebPrivateOwnPtr() : m_ptr(0) { } |
~WebPrivateOwnPtr() { WEBKIT_ASSERT(!m_ptr); } |
-#if WEBKIT_IMPLEMENTATION |
+#if INSIDE_WEBKIT |
explicit WebPrivateOwnPtr(T* ptr) |
: m_ptr(ptr) |
{ |
@@ -61,7 +61,7 @@ public: |
WEBKIT_ASSERT(m_ptr); |
return m_ptr; |
} |
-#endif // WEBKIT_IMPLEMENTATION |
+#endif // INSIDE_WEBKIT |
private: |
T* m_ptr; |