third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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/WindowProxy.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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

« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/WindowProxy.h ('k') | third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp

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

index 60c4b8c22aa4f2bbce52234533592ac149023994..19e62421b367c519d2529984dceeaa6eaf6462d0 100644

--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp

+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp

@@ -257,7 +257,7 @@ bool WindowProxy::initialize()

if (m_world->isMainWorld()) {

// ActivityLogger for main world is updated within updateDocument().

updateDocument();

- origin = m_frame->securityContext()->securityOrigin();

+ origin = m_frame->securityContext()->getSecurityOrigin();

// FIXME: Can this be removed when CSP moves to browser?

ContentSecurityPolicy* csp = m_frame->securityContext()->contentSecurityPolicy();

context->AllowCodeGenerationFromStrings(csp->allowEval(0, ContentSecurityPolicy::SuppressReport));

@@ -475,7 +475,7 @@ void WindowProxy::setSecurityToken(SecurityOrigin* origin)

if (m_world->isPrivateScriptIsolatedWorld()) {

token = "private-script://" + token;

} else if (m_world->isIsolatedWorld()) {

- SecurityOrigin* frameSecurityOrigin = m_frame->securityContext()->securityOrigin();

+ SecurityOrigin* frameSecurityOrigin = m_frame->securityContext()->getSecurityOrigin();

String frameSecurityToken = frameSecurityOrigin->toString();

// We need to check the return value of domainWasSetInDOM() on the

// frame's SecurityOrigin because, if that's the case, only

@@ -504,7 +504,7 @@ void WindowProxy::updateDocument()

return;

updateActivityLogger();

updateDocumentProperty();

- updateSecurityOrigin(m_frame->securityContext()->securityOrigin());

+ updateSecurityOrigin(m_frame->securityContext()->getSecurityOrigin());

}

static v8::Local<v8::Value> getNamedProperty(HTMLDocument* htmlDocument, const AtomicString& key, v8::Local<v8::Object> creationContext, v8::Isolate* isolate)