Bug 35565 – Google Analytics triggers "blocked plugin" UI

• Component: New Bugs
• Status: RESOLVED FIXED

[Adam Barth]

Google Analytics triggers "blocked plugin" UI

[Adam Barth]

Created attachment 49784 [details]
Patch

[Adam Barth]

http://code.google.com/p/chromium/issues/detail?id=36879

[Darin Fisher (:fishd, Google)]

Comment on attachment 49784 [details]
Patch

Thanks for working on this!  Just some minor issues:


> +++ b/WebCore/loader/FrameLoader.cpp

> +    const bool allowed = m_client->allowPlugins(settings && settings->arePluginsEnabled());

nit: gratuitous const :)


> +++ b/WebCore/loader/FrameLoader.h
> @@ -82,6 +82,11 @@ class Widget;
>  struct FrameLoadRequest;
>  struct WindowFeatures;
>  
> +enum ReasonForCallingAllowPlugins {
> +    AboutToInstantiatePlugin,
> +    NotAboutToInstantiatePlugin
> +};

^^^ maybe this should go in FrameLoaderTypes.h?


> +++ b/WebCore/loader/MainResourceLoader.cpp
...
> +    if (!m_frame->loader()->allowPlugins(NowAboutToInstantiatePlugin))

NowAboutToInstantiatePlugin -> AboutToInstantiatePlugin, right?


> +++ b/WebKit/chromium/public/WebFrameClient.h

> +    // Notifies the client that the frame would have instanitated a plug-in if plug-ins were enabled.

instanitated -> instantiated

[Adam Barth]

Created attachment 49809 [details]
Patch

[Adam Barth]

> nit: gratuitous const :)

Removed.

> ^^^ maybe this should go in FrameLoaderTypes.h?

Done.

> > +++ b/WebCore/loader/MainResourceLoader.cpp
> ...
> > +    if (!m_frame->loader()->allowPlugins(NowAboutToInstantiatePlugin))
> 
> NowAboutToInstantiatePlugin -> AboutToInstantiatePlugin, right?

"Now" is a typo.  I think it's supposed to be "Not".

> instanitated -> instantiated

Fixed.

[WebKit Commit Bot]

Comment on attachment 49809 [details]
Patch

Clearing flags on attachment: 49809

Committed r55449: <http://trac.webkit.org/changeset/55449>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.