Move toEventTarget to EventTarget

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 778 matching lines @@
   // We return 0 here because |context| is detached from the Frame. If we
   // did return |frame| we could get in trouble because the frame could be
   // navigated to another security origin.
   return nullptr;
 }
 
 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,
                                v8::Local<v8::Value> value,
                                FlexibleArrayBufferView& result,
                                void* storage) {
   ASSERT(value->IsArrayBufferView());
   v8::Local<v8::ArrayBufferView> buffer = value.As<v8::ArrayBufferView>();
   if (!storage) {
     result.setFull(V8ArrayBufferView::toImpl(buffer));
@@ skipping 198 matching lines @@
   if (!v8Call(v8::JSON::Parse(isolate, v8String(isolate, stringifiedJSON)),
               parsed, tryCatch)) {
     if (tryCatch.HasCaught())
       exceptionState.rethrowV8Exception(tryCatch.Exception());
   }
 
   return parsed;
 }
 
 }  // namespace blink