third_party/WebKit/Source/core/frame/LocalFrame.cpp - Issue 2121433002: Fix navigator.plugins and navigator.mimeTypes for OOPIFs.

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 2121433002: Fix navigator.plugins and navigator.mimeTypes for OOPIFs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743

Patch Set: Created 4 years, 6 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/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp » ('j') | no next file with comments »
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 65ab27718cf1614de2609df1c306b711204e8909..ec75129d3b2132a38e583588cbfb369498075499 100644

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

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

@@ -78,6 +78,7 @@

#include "platform/graphics/paint/PaintController.h"

#include "platform/graphics/paint/SkPictureBuilder.h"

#include "platform/graphics/paint/TransformDisplayItem.h"

+#include "platform/plugins/PluginData.h"

#include "platform/text/TextStream.h"

#include "public/platform/ServiceRegistry.h"

#include "public/platform/WebFrameScheduler.h"

@@ -805,6 +806,13 @@ FrameLoaderClient* LocalFrame::client() const

return static_cast<FrameLoaderClient*>(Frame::client());

}

+PluginData* LocalFrame::pluginData() const

+ if (!loader().allowPlugins(NotAboutToInstantiatePlugin))

+ return nullptr;

+ return page()->pluginData();

DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);

FrameNavigationDisabler::FrameNavigationDisabler(LocalFrame& frame)

« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp » ('j') | no next file with comments »