diff options
Diffstat (limited to 'webkit/port')
-rw-r--r-- | webkit/port/bridge/PluginsWin.cpp | 2 | ||||
-rw-r--r-- | webkit/port/platform/MIMETypeRegistry.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/port/bridge/PluginsWin.cpp b/webkit/port/bridge/PluginsWin.cpp index b310b36..f1f837d 100644 --- a/webkit/port/bridge/PluginsWin.cpp +++ b/webkit/port/bridge/PluginsWin.cpp @@ -109,7 +109,7 @@ bool PluginInfoStore::supportsMIMEType(const WebCore::String &mime_type) for (size_t i = 0; i < g_plugins.size(); ++i) { for (size_t j = 0; j < g_plugins[i].mime_types.size(); ++j) { - if (mime_util::MatchesMimeType( + if (net::MatchesMimeType( g_plugins[i].mime_types[j].mime_type, WideToNativeMB(converted_mime_type))) { // Don't allow wildcard matches here as this will result in diff --git a/webkit/port/platform/MIMETypeRegistry.cpp b/webkit/port/platform/MIMETypeRegistry.cpp index 4905004..6c936d1 100644 --- a/webkit/port/platform/MIMETypeRegistry.cpp +++ b/webkit/port/platform/MIMETypeRegistry.cpp @@ -71,13 +71,13 @@ String MIMETypeRegistry::getMIMETypeForPath(const String& path) bool MIMETypeRegistry::isSupportedImageMIMEType(const String& mimeType) { return !mimeType.isEmpty() - && mime_util::IsSupportedImageMimeType(mimeType.latin1().data()); + && net::IsSupportedImageMimeType(mimeType.latin1().data()); } bool MIMETypeRegistry::isSupportedJavaScriptMIMEType(const String& mimeType) { return !mimeType.isEmpty() - && mime_util::IsSupportedJavascriptMimeType(mimeType.latin1().data()); + && net::IsSupportedJavascriptMimeType(mimeType.latin1().data()); } bool MIMETypeRegistry::isSupportedImageResourceMIMEType(const String& mimeType) @@ -88,7 +88,7 @@ bool MIMETypeRegistry::isSupportedImageResourceMIMEType(const String& mimeType) bool MIMETypeRegistry::isSupportedNonImageMIMEType(const String& mimeType) { return !mimeType.isEmpty() - && mime_util::IsSupportedNonImageMimeType(mimeType.latin1().data()); + && net::IsSupportedNonImageMimeType(mimeType.latin1().data()); } bool MIMETypeRegistry::isJavaAppletMIMEType(const String& mimeType) |