789620 - click-to-play: a plugin made click-to-play by the blocklist won't go back to normal if unblocked

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Dana Keeler (she/her) [:keeler]]

So, it turns out if we were to blocklist a plugin but later undo that block, the plugin would stay click-to-play.

Comment 1

[Dana Keeler (she/her) [:keeler]]

Attachment: patch

Comment 2

[Blair McBride [:Unfocused] (UNAVAILABLE)]

Comment on attachment 659409 [details] [diff] [review]
patch

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

::: toolkit/mozapps/extensions/nsBlocklistService.js
@@ +970,5 @@
>          plugin.blocklisted = state == Ci.nsIBlocklistService.STATE_BLOCKED;
>          if (state == Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE ||
>              state == Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE)
>            plugin.clicktoplay = true;
> +        // turn off clicktoplay if it was previously set by the blocklist

Hmm, just realized this is going to be a pain when we expose UI for click-to-play for individual plugins (bug 549697), since this will undo the user's choice. Before we get that UI, I think we'll have to separate out blocklist-setting and user-setting for clicktoplay. Shouldn't be too painful - change usage here to .blocklistClicktoplay, add a .userClicktoplay, and make .clicktoplay only an accessor property whose value is based on those two.

Comment 3

[Dana Keeler (she/her) [:keeler]]

This ran green: https://tbpl.mozilla.org/?tree=Try&rev=49bef3992cf8
Marking checkin-needed.

Comment 4

[John Schoenick [:johns]]

Comment on attachment 659409 [details] [diff] [review]
patch

https://hg.mozilla.org/integration/mozilla-inbound/rev/74d24d902ad6

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/74d24d902ad6

Comment 6

[Dana Keeler (she/her) [:keeler]]

Comment on attachment 659409 [details] [diff] [review]
patch

[Approval Request Comment]
Bug caused by (feature/regressing bug #): blocklist/click-to-play plugins (bug 760625)
User impact if declined: if a plugin is click-to-play-blocklisted and then removed from the blocklist, it will continue to be a click-to-play plugin (with no UI to make it go back to normal)
Testing completed (on m-c, etc.): tested on m-c, been on nightly for a few weeks
Risk to taking this patch (and alternatives if risky): no particular risk
String or UUID changes made by this patch: none

Comment 7

[Alex Keybl [:akeybl]]

Comment on attachment 659409 [details] [diff] [review]
patch

[Triage Comment]
Good fix for a newly uplifted feature.

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/21dc87c86767