Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 3 insertions, 5 deletions

diff --git a/devtools/client/inspector/flexbox/components/FlexItemSizingProperties.js b/devtools/client/inspector/flexbox/components/FlexItemSizingProperties.js
index 00bea31e57..ad26d3beab 100644
--- a/devtools/client/inspector/flexbox/components/FlexItemSizingProperties.js
+++ b/devtools/client/inspector/flexbox/components/FlexItemSizingProperties.js
@@ -90,12 +90,10 @@ class FlexItemSizingProperties extends PureComponent {
    *         The name for this CSS property
    * @param  {String} value
    *         The property value
-   * @param  {Booleam} isDefaultValue
-   *         Whether the value come from the browser default style
    * @return {Object}
    *         The React component representing this CSS property
    */
-  renderCssProperty(name, value, isDefaultValue) {
+  renderCssProperty(name, value) {
     return dom.span({ className: "css-property-link" }, `(${name}: ${value})`);
   }
 
@@ -115,7 +113,7 @@ class FlexItemSizingProperties extends PureComponent {
     );
   }
 
-  renderBaseSizeSection({ mainBaseSize, clampState }, properties, dimension) {
+  renderBaseSizeSection({ mainBaseSize }, properties, dimension) {
     const flexBasisValue = properties["flex-basis"];
     const dimensionValue = properties[dimension];
 
diff --git a/devtools/client/inspector/flexbox/reducers/flexbox.js b/devtools/client/inspector/flexbox/reducers/flexbox.js
index 856294a549..46c1d4525c 100644
--- a/devtools/client/inspector/flexbox/reducers/flexbox.js
+++ b/devtools/client/inspector/flexbox/reducers/flexbox.js
@@ -58,7 +58,7 @@ const INITIAL_FLEXBOX = {
 };
 
 const reducers = {
-  [CLEAR_FLEXBOX](flexbox, _) {
+  [CLEAR_FLEXBOX](_) {
     return INITIAL_FLEXBOX;
   },