Backed out 2 changesets (bug 1531025) for WR failures on outline-013.html . CLOSED TREE
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Fri, 01 Mar 2019 07:22:50 +0200
changeset 519733 1003ed8243c5633f9a67a0e1323f6faf0abd067a
parent 519732 6b8e4909d303024cef8f404fc1d2ae4f3ecce055
child 519734 ab719ccd5501eab69ec791da3a7edd939227e743
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1531025
milestone67.0a1
backs outfd71937c6f25db7365001a491e32f283a41397e7
e4028e1ca6c7f6b62ba06ab10abfcb2301a4257d
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1531025) for WR failures on outline-013.html . CLOSED TREE Backed out changeset fd71937c6f25 (bug 1531025) Backed out changeset e4028e1ca6c7 (bug 1531025)
layout/generic/nsFrame.cpp
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -1688,23 +1688,20 @@ bool nsIFrame::ComputeBorderRadii(const 
   bool haveRadius = false;
   double ratio = 1.0f;
   NS_FOR_CSS_SIDES(side) {
     uint32_t hc1 = SideToHalfCorner(side, false, true);
     uint32_t hc2 = SideToHalfCorner(side, true, true);
     nscoord length =
         SideIsVertical(side) ? aBorderArea.height : aBorderArea.width;
     nscoord sum = aRadii[hc1] + aRadii[hc2];
-    if (sum) {
-      haveRadius = true;
-      // avoid floating point division in the normal case
-      if (length < sum) {
-        ratio = std::min(ratio, double(length) / sum);
-      }
-    }
+    if (sum) haveRadius = true;
+
+    // avoid floating point division in the normal case
+    if (length < sum) ratio = std::min(ratio, double(length) / sum);
   }
   if (ratio < 1.0) {
     NS_FOR_CSS_HALF_CORNERS(corner) { aRadii[corner] *= ratio; }
   }
 
   return haveRadius;
 }