Index: Source/bindings/core/v8/WrapperTypeInfo.h |
diff --git a/Source/bindings/core/v8/WrapperTypeInfo.h b/Source/bindings/core/v8/WrapperTypeInfo.h |
index 9326c61cc34a2cb848fa60e93a574b29c83da4f9..10f053c2742e3c60089d3f828136e25d8f4caddd 100644 |
--- a/Source/bindings/core/v8/WrapperTypeInfo.h |
+++ b/Source/bindings/core/v8/WrapperTypeInfo.h |
@@ -55,7 +55,7 @@ static const uint16_t v8DOMObjectClassId = 2; |
typedef v8::Handle<v8::FunctionTemplate> (*DomTemplateFunction)(v8::Isolate*); |
typedef void (*RefObjectFunction)(ScriptWrappableBase* internalPointer); |
typedef void (*DerefObjectFunction)(ScriptWrappableBase* internalPointer); |
-typedef PersistentNode* (*CreatePersistentHandleFunction)(ScriptWrappableBase* internalPointer); |
+typedef WrapperPersistentNode* (*CreatePersistentHandleFunction)(ScriptWrappableBase* internalPointer); |
typedef ActiveDOMObject* (*ToActiveDOMObjectFunction)(v8::Handle<v8::Object>); |
typedef EventTarget* (*ToEventTargetFunction)(v8::Handle<v8::Object>); |
typedef void (*ResolveWrapperReachabilityFunction)(ScriptWrappableBase* internalPointer, const v8::Persistent<v8::Object>&, v8::Isolate*); |
@@ -115,7 +115,7 @@ struct WrapperTypeInfo { |
refObjectFunction(internalPointer); |
} |
- PersistentNode* createPersistentHandle(ScriptWrappableBase* internalPointer) const |
+ WrapperPersistentNode* createPersistentHandle(ScriptWrappableBase* internalPointer) const |
{ |
ASSERT(createPersistentHandleFunction); |
return createPersistentHandleFunction(internalPointer); |
@@ -206,23 +206,23 @@ inline const WrapperTypeInfo* toWrapperTypeInfo(v8::Handle<v8::Object> wrapper) |
return getInternalField<WrapperTypeInfo, v8DOMWrapperTypeIndex>(wrapper); |
} |
-inline const PersistentNode* toPersistentHandle(const v8::Handle<v8::Object>& wrapper) |
+inline const WrapperPersistentNode* toPersistentHandle(const v8::Handle<v8::Object>& wrapper) |
{ |
// Persistent handle is stored in the last internal field. |
- return static_cast<PersistentNode*>(wrapper->GetAlignedPointerFromInternalField(wrapper->InternalFieldCount() - 1)); |
+ return static_cast<WrapperPersistentNode*>(wrapper->GetAlignedPointerFromInternalField(wrapper->InternalFieldCount() - 1)); |
} |
inline void releaseObject(v8::Handle<v8::Object> wrapper) |
{ |
const WrapperTypeInfo* typeInfo = toWrapperTypeInfo(wrapper); |
if (typeInfo->gcType == GarbageCollectedObject) { |
- const PersistentNode* handle = toPersistentHandle(wrapper); |
+ const WrapperPersistentNode* handle = toPersistentHandle(wrapper); |
// This will be null iff a wrapper for a hidden wrapper object, |
// see V8DOMWrapper::setNativeInfoForHiddenWrapper(). |
delete handle; |
} else if (typeInfo->gcType == WillBeGarbageCollectedObject) { |
#if ENABLE(OILPAN) |
- const PersistentNode* handle = toPersistentHandle(wrapper); |
+ const WrapperPersistentNode* handle = toPersistentHandle(wrapper); |
// This will be null iff a wrapper for a hidden wrapper object, |
// see V8DOMWrapper::setNativeInfoForHiddenWrapper(). |
delete handle; |