third_party/WebKit/Source/bindings/core/v8/custom/V8InjectedScriptManager.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/V8InjectedScriptManager.cpp

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

Patch Set: Fixed the assertion condition. 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

« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/custom/V8EventTargetCustom.cpp ('k') | third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.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/V8InjectedScriptManager.cpp

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

index c5d2934fcc755b35658ee202a19fd2dbff0602ea..bb56576d37f2b2ca94309171798d5e509c32ae80 100644

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

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

@@ -83,15 +83,8 @@ bool InjectedScriptManager::canAccessInspectedWindow(ScriptState* scriptState)

if (!scriptState->contextIsValid())

return false;

ScriptState::Scope scope(scriptState);

- v8::Local<v8::Object> global = scriptState->context()->Global();

- if (global.IsEmpty())

- return false;

- v8::Local<v8::Object> holder = V8Window::findInstanceInPrototypeChain(global, scriptState->isolate());

- if (holder.IsEmpty())

- return false;

- LocalFrame* frame = toLocalDOMWindow(V8Window::toImpl(holder))->frame();

- return BindingSecurity::shouldAllowAccessToFrame(scriptState->isolate(), callingDOMWindow(scriptState->isolate()), frame, DoNotReportSecurityError);

+ DOMWindow* window = toDOMWindow(scriptState->isolate(), scriptState->context()->Global());

+ return window && BindingSecurity::shouldAllowAccessTo(scriptState->isolate(), callingDOMWindow(scriptState->isolate()), window, DoNotReportSecurityError);

}

} // namespace blink