| Index: public/platform/WebPrivatePtr.h
|
| diff --git a/public/platform/WebPrivatePtr.h b/public/platform/WebPrivatePtr.h
|
| index 36107fd5222f44412fc322a024e1accf4f154bf9..0d60916ed111a599b618676437fe7ad55dcb897a 100644
|
| --- a/public/platform/WebPrivatePtr.h
|
| +++ b/public/platform/WebPrivatePtr.h
|
| @@ -35,7 +35,7 @@
|
|
|
| #if INSIDE_BLINK
|
|
|
| -namespace WebCore { template<typename T> class TreeShared; }
|
| +namespace blink { template<typename T> class TreeShared; }
|
|
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/PassRefPtr.h"
|
| @@ -53,8 +53,8 @@ enum LifetimeManagementType {
|
|
|
| template<typename T>
|
| class LifetimeOf {
|
| - static const bool isGarbageCollected = WTF::IsSubclassOfTemplate<T, WebCore::GarbageCollected>::value;
|
| - static const bool isRefCountedGarbageCollected = WTF::IsSubclassOfTemplate<T, WebCore::RefCountedGarbageCollected>::value;
|
| + static const bool isGarbageCollected = WTF::IsSubclassOfTemplate<T, blink::GarbageCollected>::value;
|
| + static const bool isRefCountedGarbageCollected = WTF::IsSubclassOfTemplate<T, blink::RefCountedGarbageCollected>::value;
|
| public:
|
| static const LifetimeManagementType value =
|
| !isGarbageCollected ? RefCountedLifetime :
|
| @@ -106,7 +106,7 @@ public:
|
| }
|
|
|
| if (!m_handle)
|
| - m_handle = new WebCore::Persistent<T>();
|
| + m_handle = new blink::Persistent<T>();
|
|
|
| (*m_handle) = val;
|
| }
|
| @@ -125,7 +125,7 @@ public:
|
| }
|
|
|
| private:
|
| - WebCore::Persistent<T>* m_handle;
|
| + blink::Persistent<T>* m_handle;
|
| };
|
|
|
| template<typename T>
|
| @@ -184,11 +184,11 @@ private:
|
| // // Methods that are used only by other Blink classes should only be
|
| // // declared when INSIDE_BLINK is set.
|
| // #if INSIDE_BLINK
|
| -// WebFoo(const WTF::PassRefPtr<WebCore::Foo>&);
|
| +// WebFoo(const WTF::PassRefPtr<blink::Foo>&);
|
| // #endif
|
| //
|
| // private:
|
| -// WebPrivatePtr<WebCore::Foo> m_private;
|
| +// WebPrivatePtr<blink::Foo> m_private;
|
| // };
|
| //
|
| // // WebFoo.cpp
|
|
|