| Index: Source/bindings/tests/results/V8TestActiveDOMObject.h
|
| diff --git a/Source/bindings/tests/results/V8TestActiveDOMObject.h b/Source/bindings/tests/results/V8TestActiveDOMObject.h
|
| index e6e1c213b85f832c7c16b81222e3e11bfddfec7a..15758ee14ed9d6d0108f4b8e0cf0600576c540db 100644
|
| --- a/Source/bindings/tests/results/V8TestActiveDOMObject.h
|
| +++ b/Source/bindings/tests/results/V8TestActiveDOMObject.h
|
| @@ -81,7 +81,7 @@ inline v8::Handle<v8::Value> toV8(TestActiveDOMObject* impl, v8::Handle<v8::Obje
|
| }
|
|
|
| template<typename CallbackInfo>
|
| -inline void v8SetReturnValue(const CallbackInfo& callbackInfo, TestActiveDOMObject* impl, v8::Handle<v8::Object> creationContext)
|
| +inline void v8SetReturnValue(const CallbackInfo& callbackInfo, TestActiveDOMObject* impl)
|
| {
|
| if (UNLIKELY(!impl)) {
|
| v8SetReturnValueNull(callbackInfo);
|
| @@ -89,12 +89,12 @@ inline void v8SetReturnValue(const CallbackInfo& callbackInfo, TestActiveDOMObje
|
| }
|
| if (DOMDataStore::setReturnValueFromWrapper<V8TestActiveDOMObject>(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, TestActiveDOMObject* impl, v8::Handle<v8::Object> creationContext)
|
| +inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo, TestActiveDOMObject* impl)
|
| {
|
| ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld);
|
| if (UNLIKELY(!impl)) {
|
| @@ -103,7 +103,7 @@ inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo, TestA
|
| }
|
| if (DOMDataStore::setReturnValueFromWrapperForMainWorld<V8TestActiveDOMObject>(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);
|
| }
|
|
|
| @@ -126,15 +126,15 @@ inline v8::Handle<v8::Value> toV8(PassRefPtr<TestActiveDOMObject > impl, v8::Han
|
| }
|
|
|
| template<class CallbackInfo>
|
| -inline void v8SetReturnValue(const CallbackInfo& callbackInfo, PassRefPtr<TestActiveDOMObject > impl, v8::Handle<v8::Object> creationContext)
|
| +inline void v8SetReturnValue(const CallbackInfo& callbackInfo, PassRefPtr<TestActiveDOMObject > impl)
|
| {
|
| - v8SetReturnValue(callbackInfo, impl.get(), creationContext);
|
| + v8SetReturnValue(callbackInfo, impl.get());
|
| }
|
|
|
| template<class CallbackInfo>
|
| -inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo, PassRefPtr<TestActiveDOMObject > impl, v8::Handle<v8::Object> creationContext)
|
| +inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo, PassRefPtr<TestActiveDOMObject > impl)
|
| {
|
| - v8SetReturnValueForMainWorld(callbackInfo, impl.get(), creationContext);
|
| + v8SetReturnValueForMainWorld(callbackInfo, impl.get());
|
| }
|
|
|
| template<class CallbackInfo, class Wrappable>
|
|
|