| Index: Source/bindings/tests/results/V8TestObject.h
|
| diff --git a/Source/bindings/tests/results/V8TestObject.h b/Source/bindings/tests/results/V8TestObject.h
|
| index 8dc923e5966b238fee7d69a93825552beca166e8..c3387a0253e8f319cad5dfc581a6f77a5438fc1e 100644
|
| --- a/Source/bindings/tests/results/V8TestObject.h
|
| +++ b/Source/bindings/tests/results/V8TestObject.h
|
| @@ -90,7 +90,7 @@ inline v8::Handle<v8::Value> toV8(TestObj* impl, v8::Handle<v8::Object> creation
|
| }
|
|
|
| template<typename CallbackInfo>
|
| -inline void v8SetReturnValue(const CallbackInfo& callbackInfo, TestObj* impl, v8::Handle<v8::Object> creationContext)
|
| +inline void v8SetReturnValue(const CallbackInfo& callbackInfo, TestObj* impl)
|
| {
|
| if (UNLIKELY(!impl)) {
|
| v8SetReturnValueNull(callbackInfo);
|
| @@ -98,12 +98,12 @@ inline void v8SetReturnValue(const CallbackInfo& callbackInfo, TestObj* impl, v8
|
| }
|
| if (DOMDataStore::setReturnValueFromWrapper<V8TestObject>(callbackInfo.GetReturnValue(), impl))
|
| return;
|
| - v8::Handle<v8::Object> wrapper = wrap(impl, creationContext, callbackInfo.GetIsolate());
|
| + v8::Handle<v8::Object> wrapper = wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
|
| v8SetReturnValue(callbackInfo, wrapper);
|
| }
|
|
|
| template<typename CallbackInfo>
|
| -inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo, TestObj* impl, v8::Handle<v8::Object> creationContext)
|
| +inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo, TestObj* impl)
|
| {
|
| ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
|
| if (UNLIKELY(!impl)) {
|
| @@ -112,7 +112,7 @@ inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo, TestO
|
| }
|
| if (DOMDataStore::setReturnValueFromWrapperForMainWorld<V8TestObject>(callbackInfo.GetReturnValue(), impl))
|
| return;
|
| - v8::Handle<v8::Value> wrapper = wrap(impl, creationContext, callbackInfo.GetIsolate());
|
| + v8::Handle<v8::Value> wrapper = wrap(impl, callbackInfo.Holder(), callbackInfo.GetIsolate());
|
| v8SetReturnValue(callbackInfo, wrapper);
|
| }
|
|
|
| @@ -135,15 +135,15 @@ inline v8::Handle<v8::Value> toV8(PassRefPtr<TestObj > impl, v8::Handle<v8::Obje
|
| }
|
|
|
| template<class CallbackInfo>
|
| -inline void v8SetReturnValue(const CallbackInfo& callbackInfo, PassRefPtr<TestObj > impl, v8::Handle<v8::Object> creationContext)
|
| +inline void v8SetReturnValue(const CallbackInfo& callbackInfo, PassRefPtr<TestObj > impl)
|
| {
|
| - v8SetReturnValue(callbackInfo, impl.get(), creationContext);
|
| + v8SetReturnValue(callbackInfo, impl.get());
|
| }
|
|
|
| template<class CallbackInfo>
|
| -inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo, PassRefPtr<TestObj > impl, v8::Handle<v8::Object> creationContext)
|
| +inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo, PassRefPtr<TestObj > impl)
|
| {
|
| - v8SetReturnValueForMainWorld(callbackInfo, impl.get(), creationContext);
|
| + v8SetReturnValueForMainWorld(callbackInfo, impl.get());
|
| }
|
|
|
| template<class CallbackInfo, class Wrappable>
|
|
|