Index: Source/bindings/core/v8/V8DOMWrapper.h |
diff --git a/Source/bindings/core/v8/V8DOMWrapper.h b/Source/bindings/core/v8/V8DOMWrapper.h |
index d3304ea626f5aeaca29f3d3450d3ac3fd90138c8..9e7711afd4891b600a2af66a8673f5123911748a 100644 |
--- a/Source/bindings/core/v8/V8DOMWrapper.h |
+++ b/Source/bindings/core/v8/V8DOMWrapper.h |
@@ -45,13 +45,13 @@ struct WrapperTypeInfo; |
class V8DOMWrapper { |
public: |
- static v8::Local<v8::Object> createWrapper(v8::Isolate*, v8::Handle<v8::Object> creationContext, const WrapperTypeInfo*, ScriptWrappable*); |
+ static v8::Local<v8::Object> createWrapper(v8::Isolate*, v8::Local<v8::Object> creationContext, const WrapperTypeInfo*, ScriptWrappable*); |
static bool isWrapper(v8::Isolate*, v8::Local<v8::Value>); |
- static v8::Handle<v8::Object> associateObjectWithWrapper(v8::Isolate*, ScriptWrappable*, const WrapperTypeInfo*, v8::Handle<v8::Object>); |
- static v8::Handle<v8::Object> associateObjectWithWrapper(v8::Isolate*, Node*, const WrapperTypeInfo*, v8::Handle<v8::Object>); |
- static void setNativeInfo(v8::Handle<v8::Object>, const WrapperTypeInfo*, ScriptWrappable*); |
- static void clearNativeInfo(v8::Handle<v8::Object>, const WrapperTypeInfo*); |
+ static v8::Local<v8::Object> associateObjectWithWrapper(v8::Isolate*, ScriptWrappable*, const WrapperTypeInfo*, v8::Local<v8::Object>); |
+ static v8::Local<v8::Object> associateObjectWithWrapper(v8::Isolate*, Node*, const WrapperTypeInfo*, v8::Local<v8::Object>); |
+ static void setNativeInfo(v8::Local<v8::Object>, const WrapperTypeInfo*, ScriptWrappable*); |
+ static void clearNativeInfo(v8::Local<v8::Object>, const WrapperTypeInfo*); |
// hasInternalFieldsSet only checks if the value has the internal fields for |
// wrapper obejct and type, and does not check if it's valid or not. The |
// value may not be a Blink's wrapper object. In order to make sure of it, |
@@ -59,7 +59,7 @@ public: |
static bool hasInternalFieldsSet(v8::Local<v8::Value>); |
}; |
-inline void V8DOMWrapper::setNativeInfo(v8::Handle<v8::Object> wrapper, const WrapperTypeInfo* wrapperTypeInfo, ScriptWrappable* scriptWrappable) |
+inline void V8DOMWrapper::setNativeInfo(v8::Local<v8::Object> wrapper, const WrapperTypeInfo* wrapperTypeInfo, ScriptWrappable* scriptWrappable) |
{ |
ASSERT(wrapper->InternalFieldCount() >= 2); |
ASSERT(scriptWrappable); |
@@ -68,7 +68,7 @@ inline void V8DOMWrapper::setNativeInfo(v8::Handle<v8::Object> wrapper, const Wr |
wrapper->SetAlignedPointerInInternalField(v8DOMWrapperTypeIndex, const_cast<WrapperTypeInfo*>(wrapperTypeInfo)); |
} |
-inline void V8DOMWrapper::clearNativeInfo(v8::Handle<v8::Object> wrapper, const WrapperTypeInfo* wrapperTypeInfo) |
+inline void V8DOMWrapper::clearNativeInfo(v8::Local<v8::Object> wrapper, const WrapperTypeInfo* wrapperTypeInfo) |
{ |
ASSERT(wrapper->InternalFieldCount() >= 2); |
ASSERT(wrapperTypeInfo); |
@@ -78,7 +78,7 @@ inline void V8DOMWrapper::clearNativeInfo(v8::Handle<v8::Object> wrapper, const |
wrapper->SetAlignedPointerInInternalField(v8DOMWrapperObjectIndex, 0); |
} |
-inline v8::Handle<v8::Object> V8DOMWrapper::associateObjectWithWrapper(v8::Isolate* isolate, ScriptWrappable* impl, const WrapperTypeInfo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper) |
+inline v8::Local<v8::Object> V8DOMWrapper::associateObjectWithWrapper(v8::Isolate* isolate, ScriptWrappable* impl, const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper) |
{ |
wrapperTypeInfo->refObject(impl); |
setNativeInfo(wrapper, wrapperTypeInfo, impl); |
@@ -87,7 +87,7 @@ inline v8::Handle<v8::Object> V8DOMWrapper::associateObjectWithWrapper(v8::Isola |
return wrapper; |
} |
-inline v8::Handle<v8::Object> V8DOMWrapper::associateObjectWithWrapper(v8::Isolate* isolate, Node* node, const WrapperTypeInfo* wrapperTypeInfo, v8::Handle<v8::Object> wrapper) |
+inline v8::Local<v8::Object> V8DOMWrapper::associateObjectWithWrapper(v8::Isolate* isolate, Node* node, const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object> wrapper) |
{ |
wrapperTypeInfo->refObject(ScriptWrappable::fromNode(node)); |
setNativeInfo(wrapper, wrapperTypeInfo, ScriptWrappable::fromNode(node)); |
@@ -98,7 +98,7 @@ inline v8::Handle<v8::Object> V8DOMWrapper::associateObjectWithWrapper(v8::Isola |
class V8WrapperInstantiationScope { |
public: |
- V8WrapperInstantiationScope(v8::Handle<v8::Object> creationContext, v8::Isolate* isolate) |
+ V8WrapperInstantiationScope(v8::Local<v8::Object> creationContext, v8::Isolate* isolate) |
: m_didEnterContext(false) |
, m_context(isolate->GetCurrentContext()) |
{ |
@@ -106,7 +106,7 @@ public: |
// empty creationContext, we will end up creating |
// a new object in the context currently entered. This is wrong. |
RELEASE_ASSERT(!creationContext.IsEmpty()); |
- v8::Handle<v8::Context> contextForWrapper = creationContext->CreationContext(); |
+ v8::Local<v8::Context> contextForWrapper = creationContext->CreationContext(); |
// For performance, we enter the context only if the currently running context |
// is different from the context that we are about to enter. |
if (contextForWrapper == m_context) |
@@ -123,11 +123,11 @@ public: |
m_context->Exit(); |
} |
- v8::Handle<v8::Context> context() const { return m_context; } |
+ v8::Local<v8::Context> context() const { return m_context; } |
private: |
bool m_didEnterContext; |
- v8::Handle<v8::Context> m_context; |
+ v8::Local<v8::Context> m_context; |
}; |
} // namespace blink |