third_party/WebKit/Source/core/html/HTMLPlugInElement.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/core/html/HTMLPlugInElement.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/core/html/HTMLMediaElement.cpp ('k') | third_party/WebKit/Source/core/html/PublicURLManager.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

index 088e801cca84bcabe5163912eb370149aaa7f802..921c864324a5e0e2d81527f3938928446c9480b0 100644

--- a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

@@ -453,7 +453,7 @@ bool HTMLPlugInElement::allowedToLoadFrameURL(const String& url)

{

KURL completeURL = document().completeURL(url);

if (contentFrame() && protocolIsJavaScript(completeURL)

- && !document().securityOrigin()->canAccess(contentFrame()->securityContext()->securityOrigin()))

+ && !document().getSecurityOrigin()->canAccess(contentFrame()->securityContext()->getSecurityOrigin()))

return false;

return document().frame()->isURLAllowed(completeURL);

}

@@ -583,7 +583,7 @@ bool HTMLPlugInElement::allowedToLoadObject(const KURL& url, const String& mimeT

if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType))

return false;

- if (!document().securityOrigin()->canDisplay(url)) {

+ if (!document().getSecurityOrigin()->canDisplay(url)) {

FrameLoader::reportLocalLoadFailed(frame, url.getString());

return false;

}