third_party/WebKit/Source/web/FrameLoaderClientImpl.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/web/FrameLoaderClientImpl.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

Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

index 3e5c1a1ed563ef805381f2775c915b7abcc256d5..2227e44c2c800c2cecacfa28caabf2b3e47e925c 100644

--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

@@ -869,7 +869,7 @@ ObjectContentType FrameLoaderClientImpl::getObjectContentType(

}

// If Chrome is started with the --disable-plugins switch, pluginData is 0.

- PluginData* pluginData = m_webFrame->frame()->page()->pluginData();

+ PluginData* pluginData = m_webFrame->frame()->pluginData();

bool plugInSupportsMIMEType = pluginData && pluginData->supportsMimeType(mimeType);

if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))

« no previous file with comments | « third_party/WebKit/Source/modules/plugins/DOMPluginArray.cpp ('k') | no next file » | no next file with comments »