diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_lib.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/resource_handle_win.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 4 | ||||
| -rw-r--r-- | webkit/port/bridge/PluginsWin.cpp | 2 | ||||
| -rw-r--r-- | webkit/port/platform/MIMETypeRegistry.cpp | 6 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.cc | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/webkit/glue/plugins/plugin_lib.cc b/webkit/glue/plugins/plugin_lib.cc index bf36152..8f28284 100644 --- a/webkit/glue/plugins/plugin_lib.cc +++ b/webkit/glue/plugins/plugin_lib.cc @@ -181,7 +181,7 @@ bool PluginLib::SupportsType(const std::string &mime_type, for (size_t i = 0; i < web_plugin_info_->mime_types.size(); ++i) { const WebPluginMimeType& mime_info = web_plugin_info_->mime_types[i]; - if (mime_util::MatchesMimeType(mime_info.mime_type, mime_type)) { + if (net::MatchesMimeType(mime_info.mime_type, mime_type)) { if (!allow_wildcard && (mime_info.mime_type == "*")) { continue; } diff --git a/webkit/glue/resource_handle_win.cc b/webkit/glue/resource_handle_win.cc index 1646f0a..f309274 100644 --- a/webkit/glue/resource_handle_win.cc +++ b/webkit/glue/resource_handle_win.cc @@ -91,7 +91,7 @@ bool GetInfoFromDataUrl(const GURL& url, std::string* data, URLRequestStatus* status) { std::string mime_type; std::string charset; - if (DataURL::Parse(url, &mime_type, &charset, data)) { + if (net::DataURL::Parse(url, &mime_type, &charset, data)) { info->request_time = Time::Now(); info->response_time = Time::Now(); info->mime_type.swap(mime_type); diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index b1056d8..232230f 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -1169,8 +1169,8 @@ bool WebFrameLoaderClient::canShowMIMEType(const String& mime_type) const { // "internally" (i.e. inside the browser) regardless of whether or not the // browser or a plugin is doing the rendering. - if (mime_util::IsSupportedMimeType( - WideToASCII(webkit_glue::StringToStdWString(mime_type)))) + if (net::IsSupportedMimeType( + WideToASCII(webkit_glue::StringToStdWString(mime_type)))) return true; // See if the type is handled by an installed plugin, if so, we can show it. 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) diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index 407b95d..cbe8561 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -1008,17 +1008,17 @@ void AppendToLog(const char* file, int line, const char* msg) { } bool GetMimeTypeFromExtension(std::wstring &ext, std::string *mime_type) { - return mime_util::GetMimeTypeFromExtension(ext, mime_type); + return net::GetMimeTypeFromExtension(ext, mime_type); } bool GetMimeTypeFromFile(const std::wstring &file_path, std::string *mime_type) { - return mime_util::GetMimeTypeFromFile(file_path, mime_type); + return net::GetMimeTypeFromFile(file_path, mime_type); } bool GetPreferredExtensionForMimeType(const std::string& mime_type, std::wstring* ext) { - return mime_util::GetPreferredExtensionForMimeType(mime_type, ext); + return net::GetPreferredExtensionForMimeType(mime_type, ext); } IMLangFontLink2* GetLangFontLink() { |