Landings for Stack Containing D216992

Failed to land

Landing requested on , by dmeehan@mozilla.com.

Revisions: D216988 diff 891695 ← D216989 diff 891696 ← D216990 diff 891697 ← D216991 diff 891698 ← D216992 diff 891699

While applying revision D216988 to esr128, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from esr128 and re-submitting.)

  • toolkit/modules/LightweightThemeConsumer.sys.mjs @ b92f36cdf91baea4b6327040af9ec57c0c4b5877
  • --- LightweightThemeConsumer.sys.mjs
    +++ LightweightThemeConsumer.sys.mjs
    ...
    
    --- LightweightThemeConsumer.sys.mjs
    +++ LightweightThemeConsumer.sys.mjs
    @@ -691,15 +692,16 @@
               val = _rgbaToString(val);
             }
           }
     
           // Add processed color to themeData.
    -      themeData._processedColors[lwtProperty] = val;
    +      _processedColors[lwtProperty] = val;
     
           _setProperty(root, hasTheme, cssVarName, val);
         }
       }
    +  return _processedColors;
     }
     
     const kInvalidColor = { r: 0, g: 0, b: 0, a: 1 };
     
     function _cssColorToRGBA(doc, cssColor) {
    
Raw error output:
Problem while applying patch in revision 216988:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmpi97h0yzf: applying /tmp/tmpi97h0yzf

patching file toolkit/modules/LightweightThemeConsumer.sys.mjs
Hunk #4 FAILED at 691
1 out of 4 hunks FAILED -- saving rejects to file toolkit/modules/LightweightThemeConsumer.sys.mjs.rej
abort: patch failed to apply

Stack containing revision D216992

Land Bug Status Revision Reviewers
1830144
Blocked
Repository is not supported by Lando.
Closed
D216992: Bug 1830144 - Clarify use of startupData in ext-theme.js
  • @release-managers accepted a prior diff
  • @dmeehan accepted a prior diff
1830144
Blocked
Repository is not supported by Lando.
Closed
D216991: Bug 1830144 - Only use startupData.lwtData for static themes
  • @release-managers accepted a prior diff
  • @dmeehan accepted a prior diff
1830144
Blocked
Repository is not supported by Lando.
Closed
D216990: Bug 1830144 - Stop overwriting startupData when theme.update is called
  • @release-managers accepted a prior diff
  • @dmeehan accepted a prior diff
1830136
Blocked
Repository is not supported by Lando.
Closed
D216989: Bug 1830136 - Delete obsolete _processedColors entries
  • @release-managers accepted a prior diff
  • @dmeehan accepted a prior diff
1830136
Blocked
Repository is not supported by Lando.
Closed
D216988: Bug 1830136 - Stop adding _processedColors to startupData of theme
  • @release-managers accepted a prior diff
  • @dmeehan accepted a prior diff