Title: [229902] tags/Safari-606.1.7.3/Source/WebKit
- Revision
- 229902
- Author
- jmarc...@apple.com
- Date
- 2018-03-23 10:29:26 -0700 (Fri, 23 Mar 2018)
Log Message
Cherry-pick r229418. rdar://problem/38770923
Modified Paths
Diff
Modified: tags/Safari-606.1.7.3/Source/WebKit/ChangeLog (229901 => 229902)
--- tags/Safari-606.1.7.3/Source/WebKit/ChangeLog 2018-03-23 17:16:16 UTC (rev 229901)
+++ tags/Safari-606.1.7.3/Source/WebKit/ChangeLog 2018-03-23 17:29:26 UTC (rev 229902)
@@ -1,3 +1,18 @@
+2018-03-23 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r229418. rdar://problem/38770923
+
+ 2018-03-08 Youenn Fablet <you...@apple.com>
+
+ PluginInfoStore::isSupportedPlugin should check for empty mime type
+ https://bugs.webkit.org/show_bug.cgi?id=183457
+ <rdar://problem/38159575>
+
+ Reviewed by Chris Dumez.
+
+ * UIProcess/Plugins/PluginInfoStore.cpp:
+ (WebKit::PluginInfoStore::isSupportedPlugin):
+
2018-03-13 Jason Marcell <jmarc...@apple.com>
Cherry-pick r229575. rdar://problem/38219763
Modified: tags/Safari-606.1.7.3/Source/WebKit/UIProcess/Plugins/PluginInfoStore.cpp (229901 => 229902)
--- tags/Safari-606.1.7.3/Source/WebKit/UIProcess/Plugins/PluginInfoStore.cpp 2018-03-23 17:16:16 UTC (rev 229901)
+++ tags/Safari-606.1.7.3/Source/WebKit/UIProcess/Plugins/PluginInfoStore.cpp 2018-03-23 17:29:26 UTC (rev 229902)
@@ -206,7 +206,7 @@
bool PluginInfoStore::isSupportedPlugin(const PluginInfoStore::SupportedPlugin& plugin, const String& mimeType, const URL& pluginURL)
{
- if (plugin.mimeTypes.contains(mimeType))
+ if (!mimeType.isEmpty() && plugin.mimeTypes.contains(mimeType))
return true;
auto extension = pathExtension(pluginURL);
return extension.isEmpty() ? false : plugin.extensions.contains(extension);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
