--- a/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -257,8 +257,9 @@
             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;
             }
         }
     }
@@ -320,7 +321,7 @@
     m_preferredPlugins.clear();
 }
 
-#if (!PLATFORM(WINCE)) && (!PLATFORM(SYMBIAN)) && (!PLATFORM(WIN_OS) || PLATFORM(WX) || !ENABLE(NETSCAPE_PLUGIN_API))
+#if (!OS(WINCE)) && (!OS(SYMBIAN)) && (!OS(WINDOWS) || !ENABLE(NETSCAPE_PLUGIN_API))
 // For Safari/Win the following three methods are implemented
 // in PluginDatabaseWin.cpp, but if we can use WebCore constructs
 // for the logic we should perhaps move it here under XP_WIN?
@@ -428,6 +429,6 @@
     }
 }
 
-#endif // !PLATFORM(SYMBIAN) && !PLATFORM(WIN_OS)
+#endif // !OS(SYMBIAN) && !OS(WINDOWS)
 
 }