Revert "Eliminate mime_util dependency from WebFrameLoaderClient."

Revert "Eliminate mime_util dependency from WebFrameLoaderClient."

This reverts commit f6429666a47eac17a18409d1743841bc44ed9a7a.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=30676

[darin (slow to review), 2009-11-01 13:57:29]

OK, I wonder why it didn't work...
-Darin

On Sat, Oct 31, 2009 at 8:05 PM, <mhm@chromium.org> wrote:

> Reviewers: darin,
>
> Description:
> Revert "Eliminate mime_util dependency from WebFrameLoaderClient."
>
> This reverts commit f6429666a47eac17a18409d1743841bc44ed9a7a.
>
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=30676
>
> Please review this at http://codereview.chromium.org/351001
>
> Affected files:
>  M webkit/api/public/WebMimeRegistry.h
>  M webkit/api/src/FrameLoaderClientImpl.cpp
>  M webkit/glue/simple_webmimeregistry_impl.h
>  M webkit/glue/simple_webmimeregistry_impl.cc
>
>
> Index: webkit/api/public/WebMimeRegistry.h
> diff --git a/webkit/api/public/WebMimeRegistry.h
> b/webkit/api/public/WebMimeRegistry.h
> index
>
afdf7366e1869a628bfdc94f393835273cccbb45..e85b9cd8797e890be460301db44d05ee713a6f93
> 100644
> --- a/webkit/api/public/WebMimeRegistry.h
> +++ b/webkit/api/public/WebMimeRegistry.h
> @@ -40,7 +40,6 @@ namespace WebKit {
>     public:
>         enum SupportsType { IsNotSupported, IsSupported, MayBeSupported };
>
> -        virtual SupportsType supportsMIMEType(const WebString& mimeType) =
> 0;
>         virtual SupportsType supportsImageMIMEType(const WebString&
> mimeType) = 0;
>         virtual SupportsType supportsJavaScriptMIMEType(const WebString&
> mimeType) = 0;
>         virtual SupportsType supportsMediaMIMEType(const WebString&
> mimeType,
> Index: webkit/api/src/FrameLoaderClientImpl.cpp
> diff --git a/webkit/api/src/FrameLoaderClientImpl.cpp
> b/webkit/api/src/FrameLoaderClientImpl.cpp
> index
>
e2707749daa54a6f57af511fa172ad5a36b3abe1..b7b310e452fdf9f63113049569938c0e41e8a583
> 100644
> --- a/webkit/api/src/FrameLoaderClientImpl.cpp
> +++ b/webkit/api/src/FrameLoaderClientImpl.cpp
> @@ -53,7 +53,6 @@
>  #include "WebFrameImpl.h"
>  #include "WebKit.h"
>  #include "WebKitClient.h"
> -#include "WebMimeRegistry.h"
>  #include "WebNode.h"
>  #include "WebPlugin.h"
>  #include "WebPluginParams.h"
> @@ -71,6 +70,7 @@
>  #include "WrappedResourceResponse.h"
>
>  // FIXME: remove these
> +#include "net/base/mime_util.h"
>  #include "webkit/glue/webdevtoolsagent_impl.h"
>
>  using namespace WebCore;
> @@ -1118,7 +1118,7 @@ bool FrameLoaderClientImpl::canShowMIMEType(const
> String& mimeType) const
>     // mimeType strings are supposed to be ASCII, but if they are not for
> some
>     // reason, then it just means that the mime type will fail all of these
> "is
>     // supported" checks and go down the path of an unhandled mime type.
> -    if (WebKit::webKitClient()->mimeRegistry()->supportsMIMEType(mimeType)
> == WebMimeRegistry::IsSupported)
> +    if (net::IsSupportedMimeType(mimeType.latin1().data()))
>         return true;
>
>     // If Chrome is started with the --disable-plugins switch, pluginData
> is null.
> Index: webkit/glue/simple_webmimeregistry_impl.cc
> diff --git a/webkit/glue/simple_webmimeregistry_impl.cc
> b/webkit/glue/simple_webmimeregistry_impl.cc
> index
>
285700244b678b58ee9b0049c41f31ed92bfa38b..a2b792dcbbb22c7217bb5ada278661e90c0c284a
> 100644
> --- a/webkit/glue/simple_webmimeregistry_impl.cc
> +++ b/webkit/glue/simple_webmimeregistry_impl.cc
> @@ -28,13 +28,6 @@ std::string AsASCII(const WebString& string) {
>
>  namespace webkit_glue {
>
> -WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsMIMEType(
> -    const WebString& mime_type) {
> -  if (!net::IsSupportedMimeType(AsASCII(mime_type).c_str()))
> -    return WebMimeRegistry::IsNotSupported;
> -  return WebMimeRegistry::IsSupported;
> -}
> -
>  WebMimeRegistry::SupportsType
> SimpleWebMimeRegistryImpl::supportsImageMIMEType(
>     const WebString& mime_type) {
>   if (!net::IsSupportedImageMimeType(AsASCII(mime_type).c_str()))
> Index: webkit/glue/simple_webmimeregistry_impl.h
> diff --git a/webkit/glue/simple_webmimeregistry_impl.h
> b/webkit/glue/simple_webmimeregistry_impl.h
> index
>
95875622b5ac7760adcb6868549f391aeb2fb639..003a9f43ac6c9324e53ed63d002e460918476c62
> 100644
> --- a/webkit/glue/simple_webmimeregistry_impl.h
> +++ b/webkit/glue/simple_webmimeregistry_impl.h
> @@ -12,8 +12,6 @@ namespace webkit_glue {
>  class SimpleWebMimeRegistryImpl : public WebKit::WebMimeRegistry {
>  public:
>   // WebMimeRegistry methods:
> -  virtual WebKit::WebMimeRegistry::SupportsType supportsMIMEType(
> -      const WebKit::WebString&);
>   virtual WebKit::WebMimeRegistry::SupportsType supportsImageMIMEType(
>       const WebKit::WebString&);
>   virtual WebKit::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
>
>
>

[Mohamed Mansour, 2009-11-01 14:53:55]

On 2009/11/01 13:57:29, darin wrote:
> OK, I wonder why it didn't work...
> -Darin
I tried to figure out why :( But it compiled fine, but every other test was
completely red :( I don't understand why ...