| Index: Source/bindings/tests/results/V8TestObject.h
|
| diff --git a/Source/bindings/tests/results/V8TestObject.h b/Source/bindings/tests/results/V8TestObject.h
|
| index 14e84f29eaf686ed16aa439a27a38e201022c7cf..d592fe07f80b640c92bf9cb051bad7e8db632981 100644
|
| --- a/Source/bindings/tests/results/V8TestObject.h
|
| +++ b/Source/bindings/tests/results/V8TestObject.h
|
| @@ -7,6 +7,7 @@
|
| #ifndef V8TestObject_h
|
| #define V8TestObject_h
|
|
|
| +#include "bindings/core/v8/ScriptWrappable.h"
|
| #include "bindings/core/v8/V8Binding.h"
|
| #include "bindings/core/v8/V8DOMWrapper.h"
|
| #include "bindings/core/v8/WrapperTypeInfo.h"
|
| @@ -22,11 +23,11 @@ public:
|
| static v8::Handle<v8::FunctionTemplate> domTemplate(v8::Isolate*);
|
| static TestObject* toNative(v8::Handle<v8::Object> object)
|
| {
|
| - return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
|
| + return fromInternalPointer(blink::toInternalPointer(object));
|
| }
|
| static TestObject* toNativeWithTypeCheck(v8::Isolate*, v8::Handle<v8::Value>);
|
| static const WrapperTypeInfo wrapperTypeInfo;
|
| - static void derefObject(void*);
|
| + static void derefObject(ScriptWrappableBase* internalPointer);
|
| static void customVoidMethodMethodCustom(const v8::FunctionCallbackInfo<v8::Value>&);
|
| #if ENABLE(CONDITION)
|
| static void conditionalConditionCustomVoidMethodMethodCustom(const v8::FunctionCallbackInfo<v8::Value>&);
|
| @@ -63,14 +64,14 @@ public:
|
| static bool attributeForPrivateScriptOnlyAttributeGetterImplementedInPrivateScript(LocalFrame* frame, TestObject* holderImpl, String* result);
|
| static bool attributeForPrivateScriptOnlyAttributeSetterImplementedInPrivateScript(LocalFrame* frame, TestObject* holderImpl, String cppValue);
|
| static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
|
| - static inline void* toInternalPointer(TestObject* impl)
|
| + static inline ScriptWrappableBase* toInternalPointer(TestObject* impl)
|
| {
|
| - return impl;
|
| + return reinterpret_cast<ScriptWrappableBase*>(static_cast<void*>(impl));
|
| }
|
|
|
| - static inline TestObject* fromInternalPointer(void* object)
|
| + static inline TestObject* fromInternalPointer(ScriptWrappableBase* internalPointer)
|
| {
|
| - return static_cast<TestObject*>(object);
|
| + return reinterpret_cast<TestObject*>(static_cast<void*>(internalPointer));
|
| }
|
| static void installPerContextEnabledProperties(v8::Handle<v8::Object>, TestObject*, v8::Isolate*);
|
| static void installPerContextEnabledMethods(v8::Handle<v8::Object>, v8::Isolate*);
|
|
|