third_party/WebKit/Source/core/page/Page.cpp - Issue 1990343002: Fix navigator.plugins and navigator.mimeTypes for OOPIFs.

Unified Diff: third_party/WebKit/Source/core/page/Page.cpp

Issue 1990343002: Fix navigator.plugins and navigator.mimeTypes for OOPIFs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 7 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

« third_party/WebKit/LayoutTests/http/tests/plugins/navigator-plugins-in-cross-origin-frame.html ('K') | « third_party/WebKit/Source/core/loader/DocumentLoader.cpp ('k') | third_party/WebKit/Source/modules/plugins/DOMMimeTypeArray.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/page/Page.cpp

diff --git a/third_party/WebKit/Source/core/page/Page.cpp b/third_party/WebKit/Source/core/page/Page.cpp

index 0ae0ab8d4573026765ff80b967787317550b4104..12e5a4b4fa9a4fd8756c2355ea7b2b20410d69b7 100644

--- a/third_party/WebKit/Source/core/page/Page.cpp

+++ b/third_party/WebKit/Source/core/page/Page.cpp

@@ -258,9 +258,6 @@ void Page::refreshPlugins()

PluginData* Page::pluginData() const

{

- if (!mainFrame()->isLocalFrame()

- || !deprecatedLocalMainFrame()->loader().allowPlugins(NotAboutToInstantiatePlugin))

alexmos 2016/05/19 18:21:56 AFAICT, the places which called this didn't rely o

- return nullptr;

if (!m_pluginData)

m_pluginData = PluginData::create(this);

return m_pluginData.get();

Nate Chapin 2016/05/19 19:44:40 Semi-tangential: What are the rules on what goes o

dcheng 2016/05/19 20:04:37 At one point, I believe the plan for FrameHost was

alexmos 2016/05/19 22:23:27 Yeah, I think the best cleanup for this is actuall