src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp
changeset 30 5dc02b23752f
parent 3 41300fa6a67c
equal deleted inserted replaced
29:b72c6db6890b 30:5dc02b23752f
   255         if (!filename.endsWith("/")) {
   255         if (!filename.endsWith("/")) {
   256             int extensionPos = filename.reverseFind('.');
   256             int extensionPos = filename.reverseFind('.');
   257             if (extensionPos != -1) {
   257             if (extensionPos != -1) {
   258                 String extension = filename.substring(extensionPos + 1);
   258                 String extension = filename.substring(extensionPos + 1);
   259 
   259 
   260                 mimeType = MIMETypeForExtension(extension);
   260                 String mimeTypeForExtension = MIMETypeForExtension(extension);
   261                 plugin = pluginForMIMEType(mimeType);
   261                 if ((plugin = pluginForMIMEType(mimeTypeForExtension)))
       
   262                     mimeType = mimeTypeForExtension;
   262             }
   263             }
   263         }
   264         }
   264     }
   265     }
   265 
   266 
   266     // FIXME: if no plugin could be found, query Windows for the mime type
   267     // FIXME: if no plugin could be found, query Windows for the mime type
   318     m_pluginPathsWithTimes.clear();
   319     m_pluginPathsWithTimes.clear();
   319     m_registeredMIMETypes.clear();
   320     m_registeredMIMETypes.clear();
   320     m_preferredPlugins.clear();
   321     m_preferredPlugins.clear();
   321 }
   322 }
   322 
   323 
   323 #if (!PLATFORM(WINCE)) && (!PLATFORM(SYMBIAN)) && (!PLATFORM(WIN_OS) || PLATFORM(WX) || !ENABLE(NETSCAPE_PLUGIN_API))
   324 #if (!OS(WINCE)) && (!OS(SYMBIAN)) && (!OS(WINDOWS) || !ENABLE(NETSCAPE_PLUGIN_API))
   324 // For Safari/Win the following three methods are implemented
   325 // For Safari/Win the following three methods are implemented
   325 // in PluginDatabaseWin.cpp, but if we can use WebCore constructs
   326 // in PluginDatabaseWin.cpp, but if we can use WebCore constructs
   326 // for the logic we should perhaps move it here under XP_WIN?
   327 // for the logic we should perhaps move it here under XP_WIN?
   327 
   328 
   328 Vector<String> PluginDatabase::defaultPluginDirectories()
   329 Vector<String> PluginDatabase::defaultPluginDirectories()
   426             paths.add(*pIt);
   427             paths.add(*pIt);
   427         }
   428         }
   428     }
   429     }
   429 }
   430 }
   430 
   431 
   431 #endif // !PLATFORM(SYMBIAN) && !PLATFORM(WIN_OS)
   432 #endif // !OS(SYMBIAN) && !OS(WINDOWS)
   432 
   433 
   433 }
   434 }