Source/core/html/HTMLPlugInElement.cpp - Issue 598533003: Revert "Mixed Content: Make MixedContentChecker completely static."

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: Source/core/html/HTMLPlugInElement.cpp

Issue 598533003: Revert "Mixed Content: Make MixedContentChecker completely static." (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 3 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

Index: Source/core/html/HTMLPlugInElement.cpp

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

index 357a43a6961b0bfb17092f215f82291c6ef0c58f..b264749247dd2b43f68c10c62e7eb1c1977eb0c5 100644

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

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

@@ -39,7 +39,6 @@

#include "core/html/HTMLImageLoader.h"

#include "core/html/PluginDocument.h"

#include "core/loader/FrameLoaderClient.h"

-#include "core/loader/MixedContentChecker.h"

#include "core/page/EventHandler.h"

#include "core/page/Page.h"

#include "core/plugins/PluginView.h"

@@ -562,7 +561,7 @@ bool HTMLPlugInElement::pluginIsLoadable(const KURL& url, const String& mimeType

return false;

}

- return !MixedContentChecker::shouldBlockFetch(frame, WebURLRequest::RequestContextObject, WebURLRequest::FrameTypeNone, url);

+ return frame->loader().mixedContentChecker()->canRunInsecureContent(document().securityOrigin(), url);

}

void HTMLPlugInElement::didAddUserAgentShadowRoot(ShadowRoot&)

« no previous file with comments | « Source/core/html/HTMLFormElement.cpp ('k') | Source/core/html/parser/XSSAuditor.cpp » ('j') | no next file with comments »