932786 - CTP doorhanger is not showing the right corresponding pop-up

Status: VERIFIED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Paul Silaghi, QA [:pauly]]

Starting with Nightly 2013-10-28, FF 26b1 the CTP doorhanger doesn't show the right pop-up. Suspected bug 926605.
STR:
1. Set Flash to 'Ask to activate'
2. Open youtube video and activate Flash
3. Click on the doorhanger

AR: Pop-up shows 'Allow now' , 'Allow and remember'
ER: 'Block plugin', 'Continue allowing'

Comment 1

[u279076]

Which operating systems and Flash versions did you test?

Comment 2

[Benjamin Smedberg]

It doesn't matter. This was a good catch, although not a stop-ship issue because it only affects the case where you're changing a permission and load the doorhanger again.

Comment 3

[Benjamin Smedberg]

Attachment: CTP doorhanger does not update to show the new plugin state after the user clicks allow or block; update pluginInfo.fallbackType with the new state in gPluginHandler._updatePluginPermission, r?jaws

I'm sorry jaws for throwing a bunch of things at your review queue like this. Let me know if you're backed up and if there's somebody else you think can help with reviews.

Comment 4

[Dana Keeler (she/her) (use needinfo) [:keeler] (on leave)]

Comment on attachment 824916 [details] [diff] [review]
CTP doorhanger does not update to show the new plugin state after the user clicks allow or block; update pluginInfo.fallbackType with the new state in gPluginHandler._updatePluginPermission, r?jaws

Review of attachment 824916 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good. r=me as long as my comments are addressed.

::: browser/base/content/browser-plugins.js
@@ +682,5 @@
>          permission = Ci.nsIPermissionManager.ALLOW_ACTION;
>          expireType = Ci.nsIPermissionManager.EXPIRE_SESSION;
>          expireTime = Date.now() + Services.prefs.getIntPref(this.PREF_SESSION_PERSIST_MINUTES) * 60 * 1000;
>          histogram.add(0);
> +        aPluginInfo.fallbackType = Ci.nsIObjectLoadingContent.PLUGIN_ACTIVE;

I'm concerned that this code could get out of sync with how fallbackType is calculated, but if the page has removed the plugin elements in question, then we can't query them for the value, so I don't really see any other option. Although, if we have tests that ensure these values stay correct, then that should be fine.

@@ +700,5 @@
>          expireType = Ci.nsIPermissionManager.EXPIRE_NEVER;
>          expireTime = 0;
>          histogram.add(2);
> +        switch (aPluginInfo.blocklistState) {
> +	  case Ci.nsIBlocklistService.STATE_OUTDATED:

Shouldn't this be STATE_VULNERABLE_UPDATE_AVAILABLE? Or both?

Comment 5

[Benjamin Smedberg]

https://hg.mozilla.org/integration/fx-team/rev/04fabfcc28c5

Comment 6

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/04fabfcc28c5

Comment 7

[Benjamin Smedberg]

Comment on attachment 824916 [details] [diff] [review]
CTP doorhanger does not update to show the new plugin state after the user clicks allow or block; update pluginInfo.fallbackType with the new state in gPluginHandler._updatePluginPermission, r?jaws

[Approval Request Comment] Rollup approval summary being sent to firefox-dev and r-d.

Comment 8

[Lukas Blakk [:lsblakk] use ?needinfo]

Comment on attachment 824916 [details] [diff] [review]
CTP doorhanger does not update to show the new plugin state after the user clicks allow or block; update pluginInfo.fallbackType with the new state in gPluginHandler._updatePluginPermission, r?jaws

Same as the others, approving for landing asap to get early beta feedback.

Comment 9

[u279076]

Paul, please verify this is fixed in all patched branches.

Comment 10

[Paul Silaghi, QA [:pauly]]

Verified fixed FF 28.0a1 (2013-11-04) on Win 7, Mac OS X 10.7.5, Ubuntu 12.04

Comment 11

[Benjamin Smedberg]

https://hg.mozilla.org/releases/mozilla-aurora/rev/82c4cd6c3b93
https://hg.mozilla.org/releases/mozilla-beta/rev/42519ce90e7f

Comment 12

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-b2g26_v1_2/rev/42519ce90e7f

Comment 13

[Ioana (away)]

Verified as fixed on Firefox 26b3 - 20131107161719 - on Windows 7 64bit, Ubuntu 13.04 32bit and Mac OS X 10.9.

Comment 14

[Bogdan Maris, Desktop QA]

Mozilla/5.0 (Windows NT 6.1; WOW64; rv:26.0) Gecko/20100101 Firefox/26.0
Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:26.0) Gecko/20100101 Firefox/26.0
Mozilla/5.0 (X11; Linux i686; rv:26.0) Gecko/20100101 Firefox/26.0

Verified as fixed on latest Aurora 27.0a1 (buildID: 20131122004001).