Index: public/common/WebPrivatePtr.h |
diff --git a/public/platform/WebPrivatePtr.h b/public/common/WebPrivatePtr.h |
similarity index 91% |
copy from public/platform/WebPrivatePtr.h |
copy to public/common/WebPrivatePtr.h |
index 7afa43688bf571014c32919f7325d71a9f6f9eb0..2052a155ae3397d5f82e1dcf99869bb3cd95c83a 100644 |
--- a/public/platform/WebPrivatePtr.h |
+++ b/public/common/WebPrivatePtr.h |
@@ -31,15 +31,15 @@ |
#ifndef WebPrivatePtr_h |
#define WebPrivatePtr_h |
-#include "WebCommon.h" |
+#include "WebAssertion.h" |
-#if WEBKIT_IMPLEMENTATION |
-#include <wtf/PassRefPtr.h> |
+#if INSIDE_WEBKIT |
+#include "wtf/PassRefPtr.h" |
#endif |
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 reference counted WebCore class. |
// |
@@ -63,8 +63,8 @@ namespace WebKit { |
// WEBKIT_EXPORT doWebFooThing(); |
// |
// // Methods that are used only by other WebKit/chromium API classes |
-// // should only be declared when WEBKIT_IMPLEMENTATION is set. |
-// #if WEBKIT_IMPLEMENTATION |
+// // should only be declared when INSIDE_WEBKIT is set. |
+// #if INSIDE_WEBKIT |
// WebFoo(const WTF::PassRefPtr<WebCore::Foo>&); |
// #endif |
// |
@@ -80,7 +80,7 @@ public: |
bool isNull() const { return !m_ptr; } |
-#if WEBKIT_IMPLEMENTATION |
+#if INSIDE_WEBKIT |
WebPrivatePtr(const PassRefPtr<T>& prp) |
: m_ptr(prp.leakRef()) |
{ |
@@ -119,7 +119,7 @@ public: |
#endif |
private: |
-#if WEBKIT_IMPLEMENTATION |
+#if INSIDE_WEBKIT |
void assign(T* p) |
{ |
// p is already ref'd for us by the caller |
@@ -129,7 +129,7 @@ private: |
} |
#else |
// Disable the assignment operator; we define it above for when |
- // WEBKIT_IMPLEMENTATION is set, but we need to make sure that it is not |
+ // INSIDE_WEBKIT is set, but we need to make sure that it is not |
// used outside there; the compiler-provided version won't handle reference |
// counting properly. |
WebPrivatePtr<T>& operator=(const WebPrivatePtr<T>& other); |