third_party/WebKit/Source/modules/plugins/DOMPluginArray.cpp - Issue 1990343002: 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/modules/plugins/DOMPluginArray.cpp

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

Patch Set: Undo accidental blank line 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

« no previous file with comments | « third_party/WebKit/Source/modules/plugins/DOMMimeTypeArray.cpp ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/plugins/DOMPluginArray.cpp

diff --git a/third_party/WebKit/Source/modules/plugins/DOMPluginArray.cpp b/third_party/WebKit/Source/modules/plugins/DOMPluginArray.cpp

index e2a931f1a49a602e7bc8e32124f10bdb5a28dfc1..32d1c9683c85f25157b6b53ebee80719f089dae9 100644

--- a/third_party/WebKit/Source/modules/plugins/DOMPluginArray.cpp

+++ b/third_party/WebKit/Source/modules/plugins/DOMPluginArray.cpp

@@ -82,10 +82,7 @@ PluginData* DOMPluginArray::pluginData() const

{

if (!m_frame)

return nullptr;

- Page* page = m_frame->page();

- if (!page)

- return nullptr;

- return page->pluginData();

+ return m_frame->pluginData();

}

} // namespace blink