Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Unified Diff: Source/bindings/tests/results/V8TestObject.cpp

Issue 18112019: Have Window inherit EventTarget interface (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/bindings/tests/results/V8TestObject.cpp
diff --git a/Source/bindings/tests/results/V8TestObject.cpp b/Source/bindings/tests/results/V8TestObject.cpp
index 641c26f17df133c57db671b51a9a32e7f066078b..a087f346c8d10a7fa17f9a02be2efeb0b6a46234 100644
--- a/Source/bindings/tests/results/V8TestObject.cpp
+++ b/Source/bindings/tests/results/V8TestObject.cpp
@@ -53,6 +53,7 @@
#include "core/dom/CustomElementCallbackDispatcher.h"
#include "core/dom/Document.h"
#include "core/dom/ExceptionCode.h"
+#include "core/page/DOMWindow.h"
#include "core/page/Frame.h"
#include "core/page/PageConsole.h"
#include "core/page/UseCounter.h"
@@ -3275,10 +3276,19 @@ static void customMethodWithArgsMethodCallback(const v8::FunctionCallbackInfo<v8
static void addEventListenerMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ EventTarget* impl = V8TestObject::toNative(args.Holder());
+ if (DOMWindow* window = impl->toDOMWindow()) {
+ if (!BindingSecurity::shouldAllowAccessToFrame(window->frame()))
+ return;
+
+ if (!window->document())
+ return;
+ }
+
RefPtr<EventListener> listener = V8EventListenerList::getEventListener(args[1], false, ListenerFindOrCreate);
if (listener) {
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, stringResource, args[0]);
- V8TestObject::toNative(args.Holder())->addEventListener(stringResource, listener, args[2]->BooleanValue());
+ impl->addEventListener(stringResource, listener, args[2]->BooleanValue());
createHiddenDependency(args.Holder(), args[1], V8TestObject::eventListenerCacheIndex, args.GetIsolate());
}
}
@@ -3292,10 +3302,19 @@ static void addEventListenerMethodCallback(const v8::FunctionCallbackInfo<v8::Va
static void removeEventListenerMethod(const v8::FunctionCallbackInfo<v8::Value>& args)
{
+ EventTarget* impl = V8TestObject::toNative(args.Holder());
+ if (DOMWindow* window = impl->toDOMWindow()) {
+ if (!BindingSecurity::shouldAllowAccessToFrame(window->frame()))
+ return;
+
+ if (!window->document())
+ return;
+ }
+
RefPtr<EventListener> listener = V8EventListenerList::getEventListener(args[1], false, ListenerFindOnly);
if (listener) {
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, stringResource, args[0]);
- V8TestObject::toNative(args.Holder())->removeEventListener(stringResource, listener.get(), args[2]->BooleanValue());
+ impl->removeEventListener(stringResource, listener.get(), args[2]->BooleanValue());
removeHiddenDependency(args.Holder(), args[1], V8TestObject::eventListenerCacheIndex, args.GetIsolate());
}
}

Powered by Google App Engine
This is Rietveld 408576698