From 696f79c12210763412e71b96f24ceb9655dce03d Mon Sep 17 00:00:00 2001 From: "pam@chromium.org" Date: Thu, 2 Apr 2009 22:56:21 +0000 Subject: An empty MIME type doesn't match any plugin, no matter what they may claim. BUG=9549 TEST=install Silverlight, 'run_webkit_tests.sh --force LayoutTests/webarchive/loading', see no crashes (timeouts are OK) Review URL: http://codereview.chromium.org/60021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13051 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/webframeloaderclient_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webkit/glue') diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index 265f82e..469fb02 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -1246,7 +1246,7 @@ bool WebFrameLoaderClient::canShowMIMEType(const String& mime_type) const { // See if the type is handled by an installed plugin, if so, we can show it. // TODO(beng): (http://b/1085524) This is the place to stick a preference to // disable full page plugins (optionally for certain types!) - return plugin_data && plugin_data->supportsMimeType(mime_type); + return !mime_type.isEmpty() && plugin_data && plugin_data->supportsMimeType(mime_type); } bool WebFrameLoaderClient::representationExistsForURLScheme(const String& URLScheme) const { -- cgit v1.1