Move toEventTarget to EventTarget

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

Index: third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
index 2511fed997fea08cadb67a20585b8969ea65230d..8df616db64ac390ada680866c0801f65b3a9562d 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
@@ -796,12 +796,16 @@ EventTarget* toEventTarget(v8::Isolate* isolate, v8::Local<v8::Value> value) {
   // We need to handle a DOMWindow specially, because a DOMWindow wrapper
   // exists on a prototype chain of v8Value.
   if (DOMWindow* window = toDOMWindow(isolate, value))
-    return static_cast<EventTarget*>(window);
+    return window;
   if (V8EventTarget::hasInstance(value, isolate)) {
     v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(value);
-    return toWrapperTypeInfo(object)->toEventTarget(object);
+    const WrapperTypeInfo* wrapperTypeInfo = toWrapperTypeInfo(object);
+    if (wrapperTypeInfo->eventTargetInheritance ==
+        WrapperTypeInfo::NotInheritFromEventTarget)
+      return nullptr;
+    return static_cast<EventTarget*>(toScriptWrappable(object));
   }
-  return 0;
+  return nullptr;
 }
 
 void toFlexibleArrayBufferView(v8::Isolate* isolate,