third_party/WebKit/Source/bindings/core/v8/custom/V8EventTargetCustom.cpp - Issue 1417023006: bindings: Refactors BindingSecurity::shouldAllowAccessToXXX.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/bindings/core/v8/custom/V8EventTargetCustom.cpp

Issue 1417023006: bindings: Refactors BindingSecurity::shouldAllowAccessToXXX. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Synced. Created 5 years, 1 month 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

« third_party/WebKit/Source/bindings/core/v8/BindingSecurity.cpp ('K') | « third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp ('k') | third_party/WebKit/Source/bindings/core/v8/custom/V8InjectedScriptManager.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/bindings/core/v8/custom/V8EventTargetCustom.cpp

diff --git a/third_party/WebKit/Source/bindings/core/v8/custom/V8EventTargetCustom.cpp b/third_party/WebKit/Source/bindings/core/v8/custom/V8EventTargetCustom.cpp

index 3b3fc0d7cfa47d80fd8cef9faf6455d8356f6fc9..d7bc424aceae00c47e0c019f4040f5c14bbb1d24 100644

--- a/third_party/WebKit/Source/bindings/core/v8/custom/V8EventTargetCustom.cpp

+++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8EventTargetCustom.cpp

@@ -81,13 +81,9 @@ void V8EventTarget::addEventListenerMethodCustom(const v8::FunctionCallbackInfo<

{

ExceptionState exceptionState(ExceptionState::ExecutionContext, "addEventListener", "EventTarget", info.Holder(), info.GetIsolate());

EventTarget* impl = V8EventTarget::toImpl(info.Holder());

- if (LocalDOMWindow* window = impl->toDOMWindow()) {

- if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), window->frame(), exceptionState)) {

- exceptionState.throwIfNeeded();

- return;

- }

- if (!window->document())

- return;

+ if (!BindingSecurity::shouldAllowAccessTo(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), impl, exceptionState)) {

+ exceptionState.throwIfNeeded();

+ return;

}

V8StringResource<TreatNullAsNullString> type;

RefPtrWillBeRawPtr<EventListener> listener;

@@ -127,13 +123,9 @@ void V8EventTarget::removeEventListenerMethodCustom(const v8::FunctionCallbackIn

{

ExceptionState exceptionState(ExceptionState::ExecutionContext, "removeEventListener", "EventTarget", info.Holder(), info.GetIsolate());

EventTarget* impl = V8EventTarget::toImpl(info.Holder());

- if (LocalDOMWindow* window = impl->toDOMWindow()) {

- if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), window->frame(), exceptionState)) {

- exceptionState.throwIfNeeded();

- return;

- }

- if (!window->document())

- return;

+ if (!BindingSecurity::shouldAllowAccessTo(info.GetIsolate(), callingDOMWindow(info.GetIsolate()), impl, exceptionState)) {

+ exceptionState.throwIfNeeded();

+ return;

}

V8StringResource<TreatNullAsNullString> type;

RefPtrWillBeRawPtr<EventListener> listener;