[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[jhoneycutt at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 4f11aa7ce5656980d2114c1c0c3f5ff0b01412f0
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 16 23:49:35 2010 +0000

    <rdar://problem/7288853> Message about missing plugin does not specify
    the type or download link for download
    
    Reviewed by Mark Rowe.
    
    * plugins/PluginDatabase.cpp:
    (WebCore::PluginDatabase::findPlugin):
    Only update the mimeType out param if we find a plug-in for the file
    extension.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54841 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aeb53d5..f3654a5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-15  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        <rdar://problem/7288853> Message about missing plugin does not specify
+        the type or download link for download
+
+        Reviewed by Mark Rowe.
+
+        * plugins/PluginDatabase.cpp:
+        (WebCore::PluginDatabase::findPlugin):
+        Only update the mimeType out param if we find a plug-in for the file
+        extension.
+
 2010-02-16  Simon Fraser  <simon.fraser at apple.com>
 
         Build fix for Tiger.
diff --git a/WebCore/plugins/PluginDatabase.cpp b/WebCore/plugins/PluginDatabase.cpp
index 5385b79..62d847f 100644
--- a/WebCore/plugins/PluginDatabase.cpp
+++ b/WebCore/plugins/PluginDatabase.cpp
@@ -257,8 +257,9 @@ PluginPackage* PluginDatabase::findPlugin(const KURL& url, String& mimeType)
             if (extensionPos != -1) {
                 String extension = filename.substring(extensionPos + 1);
 
-                mimeType = MIMETypeForExtension(extension);
-                plugin = pluginForMIMEType(mimeType);
+                String mimeTypeForExtension = MIMETypeForExtension(extension);
+                if (plugin = pluginForMIMEType(mimeTypeForExtension))
+                    mimeType = mimeTypeForExtension;
             }
         }
     }

-- 
WebKit Debian packaging