Bug 35565 - Google Analytics triggers "blocked plugin" UI
Summary: Google Analytics triggers "blocked plugin" UI
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Other OS X 10.5
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-03-01 23:44 PST by Adam Barth
Modified: 2010-03-02 19:17 PST (History)
3 users (show)

See Also:

Attachments
Patch (9.57 KB, patch)
2010-03-01 23:47 PST, Adam Barth 		no flags Details | Formatted Diff | Diff
Patch (9.90 KB, patch)
2010-03-02 09:31 PST, Adam Barth 		no flags Details | Formatted Diff | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Adam Barth 2010-03-01 23:44:33 PST 
Google Analytics triggers "blocked plugin" UI
Comment 1 Adam Barth 2010-03-01 23:47:00 PST 
Created attachment 49784 [details]
Patch
Comment 3 Darin Fisher (:fishd, Google) 2010-03-02 00:27:36 PST 
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
Comment 4 Adam Barth 2010-03-02 09:31:07 PST 
Created attachment 49809 [details]
Patch
Comment 5 Adam Barth 2010-03-02 09:32:50 PST 
> 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.
Comment 6 WebKit Commit Bot 2010-03-02 19:16:57 PST 
Comment on attachment 49809 [details]
Patch

Clearing flags on attachment: 49809

Committed r55449: <http://trac.webkit.org/changeset/55449>
Comment 7 WebKit Commit Bot 2010-03-02 19:17:02 PST 
All reviewed patches have been landed.  Closing bug.