From f800c98231355ce4badaa89cd16080c2d202ccb1 Mon Sep 17 00:00:00 2001 From: Marian-Vasile Laza Date: Wed, 15 Mar 2023 23:10:14 +0200 Subject: [PATCH] Backed out changeset 954ebee9baae (bug 1816859) for bc failures on browser_togglePolicies.js. CLOSED TREE --- .../data/picture_in_picture_overrides.js | 4 ---- .../PictureInPictureControls.sys.mjs | 6 ++---- .../tests/browser_togglePolicies.js | 1 - toolkit/themes/shared/media/pipToggle.css | 20 ------------------- 4 files changed, 2 insertions(+), 29 deletions(-) diff --git a/browser/extensions/pictureinpicture/data/picture_in_picture_overrides.js b/browser/extensions/pictureinpicture/data/picture_in_picture_overrides.js index be6c0a58730f..1f95d833d08d 100644 --- a/browser/extensions/pictureinpicture/data/picture_in_picture_overrides.js +++ b/browser/extensions/pictureinpicture/data/picture_in_picture_overrides.js @@ -177,10 +177,6 @@ let AVAILABLE_PIP_OVERRIDES; }, }, - reddit: { - "https://*.reddit.com/*": { policy: TOGGLE_POLICIES.ONE_QUARTER }, - }, - sonyliv: { "https://*.sonyliv.com/*": { videoWrapperScriptPath: "video-wrappers/videojsWrapper.js", diff --git a/toolkit/components/pictureinpicture/PictureInPictureControls.sys.mjs b/toolkit/components/pictureinpicture/PictureInPictureControls.sys.mjs index 1f898a9078ea..d91e07f7be45 100644 --- a/toolkit/components/pictureinpicture/PictureInPictureControls.sys.mjs +++ b/toolkit/components/pictureinpicture/PictureInPictureControls.sys.mjs @@ -21,9 +21,8 @@ export const TOGGLE_POLICIES = { HIDDEN: 2, TOP: 3, ONE_QUARTER: 4, - MIDDLE: 5, - THREE_QUARTERS: 6, - BOTTOM: 7, + THREE_QUARTERS: 5, + BOTTOM: 6, }; // These strings are used in the videocontrols.css stylesheet as @@ -34,7 +33,6 @@ export const TOGGLE_POLICY_STRINGS = { [TOGGLE_POLICIES.HIDDEN]: "hidden", [TOGGLE_POLICIES.TOP]: "top", [TOGGLE_POLICIES.ONE_QUARTER]: "one-quarter", - [TOGGLE_POLICIES.MIDDLE]: "middle", [TOGGLE_POLICIES.THREE_QUARTERS]: "three-quarters", [TOGGLE_POLICIES.BOTTOM]: "bottom", }; diff --git a/toolkit/components/pictureinpicture/tests/browser_togglePolicies.js b/toolkit/components/pictureinpicture/tests/browser_togglePolicies.js index ea05eff3a9fa..165fa1c72bf9 100644 --- a/toolkit/components/pictureinpicture/tests/browser_togglePolicies.js +++ b/toolkit/components/pictureinpicture/tests/browser_togglePolicies.js @@ -12,7 +12,6 @@ add_task(async () => { let positionPolicies = [ TOGGLE_POLICIES.TOP, TOGGLE_POLICIES.ONE_QUARTER, - TOGGLE_POLICIES.MIDDLE, TOGGLE_POLICIES.THREE_QUARTERS, TOGGLE_POLICIES.BOTTOM, ]; diff --git a/toolkit/themes/shared/media/pipToggle.css b/toolkit/themes/shared/media/pipToggle.css index 2ef729f98a70..561adfd9d535 100644 --- a/toolkit/themes/shared/media/pipToggle.css +++ b/toolkit/themes/shared/media/pipToggle.css @@ -58,26 +58,6 @@ display: none; } -.pip-wrapper[policy="top"] { - top: 0% -} - -.pip-wrapper[policy="one-quarter"] { - top: 25% -} - -.pip-wrapper[policy="middle"] { - top: 50% -} - -.pip-wrapper[policy="three-quarters"] { - top: 75% -} - -.pip-wrapper[policy="bottom"] { - top: 100% -} - .pip-wrapper[medium-video] > .pip-expanded > .pip-icon-label > .pip-label { font-size: 13px; }