binding: Changes the association among global-proxy/global/window-instance (2nd attempt).

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 39 matching lines @@
 #include "core/dom/NotShared.h"
 #include "platform/heap/Handle.h"
 #include "platform/wtf/text/AtomicString.h"
 #include "platform/wtf/text/StringView.h"
 #include "v8/include/v8.h"
 
 namespace blink {
 
 class DOMWindow;
 class EventListener;
-class EventTarget;
 class ExceptionState;
 class ExecutionContext;
 class FlexibleArrayBufferView;
 class Frame;
 class LocalDOMWindow;
 class LocalFrame;
 class NodeFilter;
 class XPathNSResolver;
 
 template <typename T>
@@ skipping 117 matching lines @@
 inline void V8SetReturnValue(const CallbackInfo& callback_info,
                              ScriptWrappable* impl) {
   V8SetReturnValue(callback_info, impl, callback_info.Holder());
 }
 
 template <typename CallbackInfo>
 inline void V8SetReturnValue(const CallbackInfo& callback_info, Node* impl) {
   V8SetReturnValue(callback_info, ScriptWrappable::FromNode(impl));
 }
 
-// Special versions for DOMWindow and EventTarget
-
-template <typename CallbackInfo>
-inline void V8SetReturnValue(const CallbackInfo& callback_info,
-                             DOMWindow* impl) {
-  V8SetReturnValue(callback_info, ToV8(impl, callback_info.Holder(),
-                                       callback_info.GetIsolate()));
-}
-
-template <typename CallbackInfo>
-inline void V8SetReturnValue(const CallbackInfo& callback_info,
-                             EventTarget* impl) {
-  V8SetReturnValue(callback_info, ToV8(impl, callback_info.Holder(),
-                                       callback_info.GetIsolate()));
-}
-
 template <typename CallbackInfo, typename T>
 inline void V8SetReturnValue(const CallbackInfo& callback_info,
                              PassRefPtr<T> impl) {
   V8SetReturnValue(callback_info, impl.Get());
 }
 
 template <typename CallbackInfo, typename T>
 inline void V8SetReturnValue(const CallbackInfo& callbackInfo,
                              NotShared<T> notShared) {
   V8SetReturnValue(callbackInfo, notShared.View());
 }
 
 template <typename CallbackInfo>
 inline void V8SetReturnValueForMainWorld(const CallbackInfo& callback_info,
                                          ScriptWrappable* impl) {
   DCHECK(DOMWrapperWorld::Current(callback_info.GetIsolate()).IsMainWorld());
   if (UNLIKELY(!impl)) {
     V8SetReturnValueNull(callback_info);
     return;
   }
   if (DOMDataStore::SetReturnValueForMainWorld(callback_info.GetReturnValue(),
                                                impl))
     return;
   v8::Local<v8::Object> wrapper =
       impl->Wrap(callback_info.GetIsolate(), callback_info.Holder());
   V8SetReturnValue(callback_info, wrapper);
 }
 
-template <typename CallbackInfo>
-inline void V8SetReturnValueForMainWorld(const CallbackInfo& callback_info,
-                                         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(callback_info, ScriptWrappable::FromNode(impl));
-}
-
-// Special versions for DOMWindow and EventTarget
-
-template <typename CallbackInfo>
-inline void V8SetReturnValueForMainWorld(const CallbackInfo& callback_info,
-                                         DOMWindow* impl) {
-  V8SetReturnValue(callback_info, ToV8(impl, callback_info.Holder(),
-                                       callback_info.GetIsolate()));
-}
-
-template <typename CallbackInfo>
-inline void V8SetReturnValueForMainWorld(const CallbackInfo& callback_info,
-                                         EventTarget* impl) {
-  V8SetReturnValue(callback_info, ToV8(impl, callback_info.Holder(),
-                                       callback_info.GetIsolate()));
-}
-
 template <typename CallbackInfo, typename T>
 inline void V8SetReturnValueForMainWorld(const CallbackInfo& callback_info,
                                          PassRefPtr<T> impl) {
   V8SetReturnValueForMainWorld(callback_info, impl.Get());
 }
 
 template <typename CallbackInfo>
 inline void V8SetReturnValueFast(const CallbackInfo& callback_info,
                                  ScriptWrappable* impl,
                                  const ScriptWrappable* wrappable) {
@@ skipping 10 matching lines @@
 }
 
 template <typename CallbackInfo>
 inline void V8SetReturnValueFast(const CallbackInfo& callback_info,
                                  Node* impl,
                                  const ScriptWrappable* wrappable) {
   V8SetReturnValueFast(callback_info, ScriptWrappable::FromNode(impl),
                        wrappable);
 }
 
-// Special versions for DOMWindow and EventTarget
-
-template <typename CallbackInfo>
-inline void V8SetReturnValueFast(const CallbackInfo& callback_info,
-                                 DOMWindow* impl,
-                                 const ScriptWrappable*) {
-  V8SetReturnValue(callback_info, ToV8(impl, callback_info.Holder(),
-                                       callback_info.GetIsolate()));
-}
-
-template <typename CallbackInfo>
-inline void V8SetReturnValueFast(const CallbackInfo& callback_info,
-                                 EventTarget* impl,
-                                 const ScriptWrappable*) {
-  V8SetReturnValue(callback_info, ToV8(impl, callback_info.Holder(),
-                                       callback_info.GetIsolate()));
-}
-
 template <typename CallbackInfo, typename T, typename Wrappable>
 inline void V8SetReturnValueFast(const CallbackInfo& callback_info,
                                  PassRefPtr<T> impl,
                                  const Wrappable* wrappable) {
   V8SetReturnValueFast(callback_info, impl.Get(), wrappable);
 }
 
 template <typename CallbackInfo, typename T>
 inline void V8SetReturnValueFast(const CallbackInfo& callback_info,
                                  const v8::Local<T> handle,
@@ skipping 852 matching lines @@
     exception_state.ThrowTypeError(
         "The provided ArrayBufferView value must not be shared.");
     return NotSharedType();
   }
   return NotSharedType(dom_typed_array);
 }
 
 }  // namespace blink
 
 #endif  // V8Binding_h