Revert of binding: Changes the association among global-proxy/global/window-instance.

third_party/WebKit/Source/bindings/core/v8/V8Binding.h

 /*
 * Copyright (C) 2009 Google Inc. All rights reserved.
 * Copyright (C) 2012 Ericsson AB. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
@@ skipping 184 matching lines @@
     v8SetReturnValueNull(callbackInfo);
     return;
   }
   if (DOMDataStore::setReturnValue(callbackInfo.GetReturnValue(), impl))
     return;
   v8::Local<v8::Object> wrapper = ScriptWrappable::fromNode(impl)->wrap(
       callbackInfo.GetIsolate(), callbackInfo.Holder());
   v8SetReturnValue(callbackInfo, wrapper);
 }
 
+// Special versions for DOMWindow and EventTarget
+
+template <typename CallbackInfo>
+inline void v8SetReturnValue(const CallbackInfo& callbackInfo,
+                             DOMWindow* impl) {
+  v8SetReturnValue(callbackInfo, ToV8(impl, callbackInfo.Holder(),
+                                      callbackInfo.GetIsolate()));
+}
+
+template <typename CallbackInfo>
+inline void v8SetReturnValue(const CallbackInfo& callbackInfo,
+                             EventTarget* impl) {
+  v8SetReturnValue(callbackInfo, ToV8(impl, callbackInfo.Holder(),
+                                      callbackInfo.GetIsolate()));
+}
+
 template <typename CallbackInfo, typename T>
 inline void v8SetReturnValue(const CallbackInfo& callbackInfo,
                              PassRefPtr<T> impl) {
   v8SetReturnValue(callbackInfo, impl.get());
 }
 
 template <typename CallbackInfo>
 inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo,
                                          ScriptWrappable* impl) {
   ASSERT(DOMWrapperWorld::current(callbackInfo.GetIsolate()).isMainWorld());
   if (UNLIKELY(!impl)) {
     v8SetReturnValueNull(callbackInfo);
     return;
   }
   if (DOMDataStore::setReturnValueForMainWorld(callbackInfo.GetReturnValue(),
                                                impl))
     return;
   v8::Local<v8::Object> wrapper =
       impl->wrap(callbackInfo.GetIsolate(), callbackInfo.Holder());
   v8SetReturnValue(callbackInfo, wrapper);
 }
 
+template <typename CallbackInfo>
+inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo,
+                                         Node* impl) {
+  // Since EventTarget has a special version of ToV8 and V8EventTarget.h
+  // defines its own v8SetReturnValue family, which are slow, we need to
+  // override them with optimized versions for Node and its subclasses.
+  // Without this overload, v8SetReturnValueForMainWorld for Node would be
+  // very slow.
+  //
+  // class hierarchy:
+  //     ScriptWrappable <-- EventTarget <--+-- Node <-- ...
+  //                                        +-- Window
+  // overloads:
+  //     v8SetReturnValueForMainWorld(ScriptWrappable*)
+  //         Optimized and very fast.
+  //     v8SetReturnValueForMainWorld(EventTarget*)
+  //         Uses custom toV8 function and slow.
+  //     v8SetReturnValueForMainWorld(Node*)
+  //         Optimized and very fast.
+  //     v8SetReturnValueForMainWorld(Window*)
+  //         Uses custom toV8 function and slow.
+  v8SetReturnValueForMainWorld(callbackInfo, ScriptWrappable::fromNode(impl));
+}
+
+// Special versions for DOMWindow and EventTarget
+
+template <typename CallbackInfo>
+inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo,
+                                         DOMWindow* impl) {
+  v8SetReturnValue(callbackInfo, ToV8(impl, callbackInfo.Holder(),
+                                      callbackInfo.GetIsolate()));
+}
+
+template <typename CallbackInfo>
+inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo,
+                                         EventTarget* impl) {
+  v8SetReturnValue(callbackInfo, ToV8(impl, callbackInfo.Holder(),
+                                      callbackInfo.GetIsolate()));
+}
+
 template <typename CallbackInfo, typename T>
 inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo,
                                          PassRefPtr<T> impl) {
   v8SetReturnValueForMainWorld(callbackInfo, impl.get());
 }
 
 template <typename CallbackInfo>
 inline void v8SetReturnValueFast(const CallbackInfo& callbackInfo,
                                  ScriptWrappable* impl,
                                  const ScriptWrappable* wrappable) {
@@ skipping 18 matching lines @@
     return;
   }
   if (DOMDataStore::setReturnValueFast(callbackInfo.GetReturnValue(), impl,
                                        callbackInfo.Holder(), wrappable))
     return;
   v8::Local<v8::Object> wrapper = ScriptWrappable::fromNode(impl)->wrap(
       callbackInfo.GetIsolate(), callbackInfo.Holder());
   v8SetReturnValue(callbackInfo, wrapper);
 }
 
+// Special versions for DOMWindow and EventTarget
+
+template <typename CallbackInfo>
+inline void v8SetReturnValueFast(const CallbackInfo& callbackInfo,
+                                 DOMWindow* impl,
+                                 const ScriptWrappable*) {
+  v8SetReturnValue(callbackInfo, ToV8(impl, callbackInfo.Holder(),
+                                      callbackInfo.GetIsolate()));
+}
+
+template <typename CallbackInfo>
+inline void v8SetReturnValueFast(const CallbackInfo& callbackInfo,
+                                 EventTarget* impl,
+                                 const ScriptWrappable*) {
+  v8SetReturnValue(callbackInfo, ToV8(impl, callbackInfo.Holder(),
+                                      callbackInfo.GetIsolate()));
+}
+
 template <typename CallbackInfo, typename T, typename Wrappable>
 inline void v8SetReturnValueFast(const CallbackInfo& callbackInfo,
                                  PassRefPtr<T> impl,
                                  const Wrappable* wrappable) {
   v8SetReturnValueFast(callbackInfo, impl.get(), wrappable);
 }
 
 template <typename CallbackInfo, typename T>
 inline void v8SetReturnValueFast(const CallbackInfo& callbackInfo,
                                  const v8::Local<T> handle,
@@ skipping 812 matching lines @@
 // If the argument isn't an object, this will crash.
 CORE_EXPORT v8::Local<v8::Value> freezeV8Object(v8::Local<v8::Value>,
                                                 v8::Isolate*);
 
 CORE_EXPORT v8::Local<v8::Value> fromJSONString(v8::Isolate*,
                                                 const String& stringifiedJSON,
                                                 ExceptionState&);
 }  // namespace blink
 
 #endif  // V8Binding_h