Bug 1341102: Fix bustage on a CLOSED TREE; r=bustage
☠☠ backed out by 7f5d8fe1c870 ☠ ☠
authorManish Goregaokar <manishearth@gmail.com>
Wed, 26 Jul 2017 16:51:35 -0700
changeset 419933 849c109d96b452e92485bb899bf5a2ca7cf4e447
parent 419932 cf333ee9e227b187dfd080c2991925a068ebc890
child 419934 1c4310082e35d51a44c759ea1323699e2ae2f8c7
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1341102
milestone56.0a1
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
Bug 1341102: Fix bustage on a CLOSED TREE; r=bustage MozReview-Commit-ID: Ho2PNnBhR3M
gfx/src/nsCoord.h
layout/base/crashtests/crashtests.list
--- a/gfx/src/nsCoord.h
+++ b/gfx/src/nsCoord.h
@@ -127,18 +127,18 @@ inline nscoord _nscoordSaturatingMultipl
     MOZ_ASSERT(aScale >= 0.0f,
                "negative scaling factors must be handled manually");
   }
 #ifdef NS_COORD_IS_FLOAT
   return floorf(aCoord * aScale);
 #else
   float product = aCoord * aScale;
   if (requireNotNegative ? aCoord > 0 : (aCoord > 0) == (aScale > 0))
-    return NSToCoordRoundWithClamp(std::min<float>(nscoord_MAX, product));
-  return NSToCoordRoundWithClamp(std::max<float>(nscoord_MIN, product));
+    return NSToCoordRoundWithClamp(std::min<float>((float)nscoord_MAX, product));
+  return NSToCoordRoundWithClamp(std::max<float>((float)nscoord_MIN, product));
 #endif
 }
 
 /**
  * Returns aCoord * aScale, capping the product to nscoord_MAX or nscoord_MIN as
  * appropriate for the sign of aCoord.  This method requires aScale to not be
  * negative; use this method when you know that aScale should never be
  * negative to get a sanity check of that invariant in debug builds.
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -36,17 +36,17 @@ load 243519-1.html
 load 244490-1.html
 load 254367-1.html
 load 263359-1.html
 load 265027-1.html
 load 265736-1.html
 load 265736-2.html
 load 265899-1.html
 load 265973-1.html
-asserts-if(!stylo, 6-12) load 265986-1.html # Bug 512405 , bug 718883
+asserts-if(!stylo,6-12) load 265986-1.html # Bug 512405 , bug 718883
 load 265999-1.html
 load 266222-1.html
 asserts(1-7) load 266360-1.html # bug 576358
 load 266445-1.html
 asserts(2) load 266445-2.html
 load 268157-1.html
 load 269566-1.html
 load 272647-1.html