Merge autoland to mozilla-central. a=merge

sylvestre · Mar 7, 2022 · f3532fd · f3532fd
2 parents 07192e0 + 0e1c12c
commit f3532fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/devtools/server/actors/highlighters/box-model.js b/devtools/server/actors/highlighters/box-model.js
@@ -723,7 +723,7 @@ class BoxModelHighlighter extends AutoRefreshHighlighter {
     // Move guide into place or hide it if no valid co-ordinate was found.
     this._updateGuide("top", Math.round(toShowY[0]));
     this._updateGuide("right", Math.round(toShowX[1]) - 1);
-    this._updateGuide("bottom", Math.round(toShowY[1] - 1));
+    this._updateGuide("bottom", Math.round(toShowY[1]) - 1);
     this._updateGuide("left", Math.round(toShowX[0]));
   }
 
@@ -742,10 +742,10 @@ class BoxModelHighlighter extends AutoRefreshHighlighter {
    * @param  {Integer} point
    *         x or y co-ordinate. If this is undefined we hide the guide.
    */
-  _updateGuide(side, point = -1) {
+  _updateGuide(side, point) {
     const guide = this.getElement("guide-" + side);
 
-    if (point <= 0) {
+    if (!point || point <= 0) {
       guide.setAttribute("hidden", "true");
       return false;
     }

diff --git a/layout/reftests/transform-3d/reftest.list b/layout/reftests/transform-3d/reftest.list
@@ -72,8 +72,8 @@ fuzzy(0-240,0-660) == animate-cube-degrees.html animate-cube-degrees-ref.html #
 fuzzy(0-240,0-400) fails-if(useDrawSnapshot) == animate-cube-degrees-zoom.html animate-cube-degrees-zoom-ref.html
 != animate-cube-degrees-ref.html animate-cube-degrees-zoom-ref.html
 fuzzy-if(gtkWidget,0-128,0-100) fuzzy-if(Android||OSX==1010||(gtkWidget&&layersGPUAccelerated),0-143,0-100) fuzzy-if(winWidget||OSX,0-141,0-100) == preserves3d-nested.html preserves3d-nested-ref.html
-fuzzy(0-255,0-150) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-parent.html animate-preserve3d-ref.html # intermittently fuzzy on Mac
-fuzzy(0-255,0-150) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-child.html animate-preserve3d-ref.html # intermittently fuzzy on Mac, bug 1461311 for Android
+fuzzy(0-255,0-153) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-parent.html animate-preserve3d-ref.html # intermittently fuzzy on Mac
+fuzzy(0-255,0-153) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-child.html animate-preserve3d-ref.html # intermittently fuzzy on Mac, bug 1461311 for Android
 == animate-backface-hidden.html about:blank
 == 1245450-1.html green-rect.html
 fuzzy(0-1,0-2000) == opacity-preserve3d-1.html opacity-preserve3d-1-ref.html