Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(512)

Unified Diff: third_party/WebKit/Source/core/loader/DocumentLoader.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
Index: third_party/WebKit/Source/core/loader/DocumentLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
index 8d320475baeebc8b197aa2ad247952ffb564b645..0c1c85b95abdf5eea136745e695d8948f715c9d7 100644
--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp
@@ -319,11 +319,11 @@ void DocumentLoader::redirectReceived(Resource* resource, ResourceRequest& reque
frameLoader()->receivedMainResourceRedirect(requestURL);
}
-static bool canShowMIMEType(const String& mimeType, Page* page)
+static bool canShowMIMEType(const String& mimeType, LocalFrame* frame)
{
if (Platform::current()->mimeRegistry()->supportsMIMEType(mimeType) == WebMimeRegistry::IsSupported)
return true;
- PluginData* pluginData = page->pluginData();
+ PluginData* pluginData = frame->pluginData();
return !mimeType.isEmpty() && pluginData && pluginData->supportsMimeType(mimeType);
}
@@ -345,7 +345,7 @@ bool DocumentLoader::shouldContinueForResponse() const
return false;
}
- if (!canShowMIMEType(m_response.mimeType(), m_frame->page()))
+ if (!canShowMIMEType(m_response.mimeType(), m_frame))
return false;
return true;
}
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp ('k') | third_party/WebKit/Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698