Modified: trunk/Source/WebCore/ChangeLog (268161 => 268162)
--- trunk/Source/WebCore/ChangeLog 2020-10-07 23:31:25 UTC (rev 268161)
+++ trunk/Source/WebCore/ChangeLog 2020-10-08 00:01:27 UTC (rev 268162)
@@ -1,3 +1,42 @@
+2020-10-07 Tim Horton <[email protected]>
+
+ REGRESSION: Safari unable to load PDF in <embed> (docs.legalconnect.com)
+ https://bugs.webkit.org/show_bug.cgi?id=217451
+ <rdar://problem/69767043>
+
+ Reviewed by Alex Christensen.
+
+ Test: fast/replaced/pdf-as-embed-with-no-mime-type-is-not-blank.html
+
+ If plugins are enabled, we'll always let the request go through, and WebKit will
+ guess that files with PDFPlugin-handled extensions should instantiate PDFPlugin,
+ even if no other plugins are available.
+
+ However, if plugins are disabled, requestPlugin() will early return if the explicitly
+ specified MIME type is not handled by an application plugin (even though the downstream
+ WebKit code would have happily instantiated an application plugin for us).
+
+ Application plugins shouldn't depend on the plugin enablement setting.
+ To fix this, have SubframeLoader guess the MIME type if not explicitly specified
+ (matching WebKit's behavior), and allow the request if it matches an application plugin.
+
+ * loader/SubframeLoader.cpp:
+ (WebCore::findPluginMIMETypeFromURL):
+ Improve this previously logging-only function to use the lastPathComponent
+ of the URL instead of randomly looking at the end of the URL, to ignore
+ query strings and fragments when looking for the file extension.
+
+ (WebCore::FrameLoader::SubframeLoader::requestPlugin):
+ Make use of findPluginMIMETypeFromURL to guess the MIME type if it's not
+ explicitly specified. If the guessed MIME type is one that is handled
+ by application plugins, allow the request to go out to WebKit (which
+ may then instantiate a PDFPlugin, for example).
+
+ (WebCore::logPluginRequest):
+ (WebCore::FrameLoader::SubframeLoader::requestObject):
+ (WebCore::FrameLoader::SubframeLoader::createJavaAppletWidget):
+ Pass the URL instead of stringifying it, so we can lastPathComponent as above.
+
2020-10-07 Chris Dumez <[email protected]>
Constructing a AudioWorkletNode should construct an AudioWorkletProcessor on the Worklet thread
Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (268161 => 268162)
--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2020-10-07 23:31:25 UTC (rev 268161)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2020-10-08 00:01:27 UTC (rev 268162)
@@ -148,31 +148,14 @@
return true;
}
-bool FrameLoader::SubframeLoader::requestPlugin(HTMLPlugInImageElement& ownerElement, const URL& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback)
+static String findPluginMIMETypeFromURL(Page& page, const URL& url)
{
- // Application plug-ins are plug-ins implemented by the user agent, for example Qt plug-ins,
- // as opposed to third-party code such as Flash. The user agent decides whether or not they are
- // permitted, rather than WebKit.
- if (!(m_frame.settings().arePluginsEnabled() || MIMETypeRegistry::isApplicationPluginMIMEType(mimeType)))
- return false;
-
- if (!pluginIsLoadable(url, mimeType))
- return false;
-
- ASSERT(ownerElement.hasTagName(objectTag) || ownerElement.hasTagName(embedTag));
- return loadPlugin(ownerElement, url, mimeType, paramNames, paramValues, useFallback);
-}
-
-static String findPluginMIMETypeFromURL(Page& page, const StringView& url)
-{
- if (!url)
- return { };
-
- size_t dotIndex = url.reverseFind('.');
+ auto lastPathComponent = url.lastPathComponent();
+ size_t dotIndex = lastPathComponent.reverseFind('.');
if (dotIndex == notFound)
return { };
- auto extensionFromURL = url.substring(dotIndex + 1);
+ auto extensionFromURL = lastPathComponent.substring(dotIndex + 1);
for (auto& type : page.pluginData().webVisibleMimeTypes()) {
for (auto& extension : type.extensions) {
@@ -184,8 +167,29 @@
return { };
}
-static void logPluginRequest(Page* page, const String& mimeType, const String& url, bool success)
+bool FrameLoader::SubframeLoader::requestPlugin(HTMLPlugInImageElement& ownerElement, const URL& url, const String& explicitMIMEType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback)
{
+ String mimeType = explicitMIMEType;
+ if (mimeType.isEmpty()) {
+ if (auto page = ownerElement.document().page())
+ mimeType = findPluginMIMETypeFromURL(*page, url);
+ }
+
+ // Application plug-ins are plug-ins implemented by the user agent, for example Qt plug-ins,
+ // as opposed to third-party code such as Flash. The user agent decides whether or not they are
+ // permitted, rather than WebKit.
+ if (!(m_frame.settings().arePluginsEnabled() || MIMETypeRegistry::isApplicationPluginMIMEType(mimeType)))
+ return false;
+
+ if (!pluginIsLoadable(url, explicitMIMEType))
+ return false;
+
+ ASSERT(ownerElement.hasTagName(objectTag) || ownerElement.hasTagName(embedTag));
+ return loadPlugin(ownerElement, url, explicitMIMEType, paramNames, paramValues, useFallback);
+}
+
+static void logPluginRequest(Page* page, const String& mimeType, const URL& url, bool success)
+{
if (!page)
return;
@@ -230,7 +234,7 @@
bool useFallback;
if (shouldUsePlugin(completedURL, mimeType, hasFallbackContent, useFallback)) {
bool success = requestPlugin(ownerElement, completedURL, mimeType, paramNames, paramValues, useFallback);
- logPluginRequest(document.page(), mimeType, completedURL.string(), success);
+ logPluginRequest(document.page(), mimeType, completedURL, success);
return success;
}
@@ -276,7 +280,7 @@
if (m_frame.settings().arePluginsEnabled())
widget = m_frame.loader().client().createJavaAppletWidget(size, element, baseURL, paramNames, paramValues);
- logPluginRequest(m_frame.page(), element.serviceType(), String(), widget);
+ logPluginRequest(m_frame.page(), element.serviceType(), { }, widget);
if (!widget) {
RenderEmbeddedObject* renderer = element.renderEmbeddedObject();
