third_party/WebKit/Source/core/frame/LocalFrame.cpp - Issue 1476953004: Consolidate functions for updating state after a security origin change.

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/core/frame/LocalFrame.cpp

Issue 1476953004: Consolidate functions for updating state after a security origin change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/core/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/loader/EmptyClients.cpp » ('j') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp

diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp

index 3c9a822842050860c71c59fee2e55e14d968e9b6..9d9f8536d57761b8a8a0b2b763ca10ea46c27793 100644

--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp

+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp

@@ -900,14 +900,10 @@ WebFrameScheduler* LocalFrame::frameScheduler()

return m_frameScheduler.get();

}

-void LocalFrame::updateFrameSecurityOrigin()

+void LocalFrame::updateSecurityOrigin(SecurityOrigin* origin)

{

- SecurityContext* context = securityContext();

- if (!context)

- return;

- WebSecurityOrigin securityOrigin(context->securityOrigin());

- frameScheduler()->setFrameOrigin(&securityOrigin);

+ script().updateSecurityOrigin(origin);

+ frameScheduler()->setFrameOrigin(WebSecurityOrigin(origin));

}

DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);