third_party/WebKit/Source/core/html/HTMLPlugInElement.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/html/HTMLPlugInElement.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.cpp ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

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

index fbf2a6b4d2bc1c7996310d764e77c4a408854bbd..253491329d2ba98fd2b3fc4da540d973a90beade 100644

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

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

@@ -516,7 +516,7 @@ bool HTMLPlugInElement::shouldUsePlugin(const KURL& url, const String& mimeType,

// installed a plugin that can handle TIFF (which QuickTime can also

// handle) they probably intended to override QT.

if (document().frame()->page() && (mimeType == "image/tiff" || mimeType == "image/tif" || mimeType == "image/x-tiff")) {

- const PluginData* pluginData = document().frame()->page()->pluginData();

+ const PluginData* pluginData = document().frame()->pluginData();

String pluginName = pluginData ? pluginData->pluginNameForMimeType(mimeType) : String();

if (!pluginName.isEmpty() && !pluginName.contains("QuickTime", TextCaseInsensitive)) {

useFallback = false;

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