Merge 196373 "binding: Supports static operations/attrs returnin..."

Source/bindings/core/v8/V8Binding.h

Index: Source/bindings/core/v8/V8Binding.h
===================================================================
--- Source/bindings/core/v8/V8Binding.h	(revision 197430)
+++ Source/bindings/core/v8/V8Binding.h	(working copy)
@@ -191,7 +191,7 @@
 }
 
 template<typename CallbackInfo>
-inline void v8SetReturnValue(const CallbackInfo& callbackInfo, ScriptWrappable* impl)
+inline void v8SetReturnValue(const CallbackInfo& callbackInfo, ScriptWrappable* impl, v8::Local<v8::Object> creationContext)
 {
     if (UNLIKELY(!impl)) {
         v8SetReturnValueNull(callbackInfo);
@@ -199,11 +199,17 @@
     }
     if (DOMDataStore::setReturnValue(callbackInfo.GetReturnValue(), impl))
         return;
-    v8::Handle<v8::Object> wrapper = impl->wrap(callbackInfo.Holder(), callbackInfo.GetIsolate());
+    v8::Handle<v8::Object> wrapper = impl->wrap(creationContext, callbackInfo.GetIsolate());
     v8SetReturnValue(callbackInfo, wrapper);
 }
 
 template<typename CallbackInfo>
+inline void v8SetReturnValue(const CallbackInfo& callbackInfo, ScriptWrappable* impl)
+{
+    v8SetReturnValue(callbackInfo, impl, callbackInfo.Holder());
+}
+
+template<typename CallbackInfo>
 inline void v8SetReturnValue(const CallbackInfo& callbackInfo, Node* impl)
 {
     if (UNLIKELY(!impl)) {