Bug 905219 - BaseRect::IsFinite() now uses std::isfinite(), rather than NS_finite(). r=jrmuizel
authorMilan Sreckovic <milan@mozilla.com>
Wed, 14 Aug 2013 12:29:47 -0400
changeset 142790 417918b47df2b12da11043bf8470e71de470e1f3
parent 142789 1fc27a76fca8ebe3472c4d7340a6b54339b2d0cd
child 142791 4b1152b6380d5a5097fa9a7f85b8f5c032420283
push id25109
push usercbook@mozilla.com
push dateFri, 16 Aug 2013 08:28:16 +0000
treeherdermozilla-central@6bcbba818727 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs905219
milestone26.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 905219 - BaseRect::IsFinite() now uses std::isfinite(), rather than NS_finite(). r=jrmuizel
gfx/2d/BaseRect.h
--- a/gfx/2d/BaseRect.h
+++ b/gfx/2d/BaseRect.h
@@ -4,17 +4,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef MOZILLA_GFX_BASERECT_H_
 #define MOZILLA_GFX_BASERECT_H_
 
 #include <cmath>
 #include <mozilla/Assertions.h>
 #include <algorithm>
-#include "nsMathUtils.h"
 
 namespace mozilla {
 namespace gfx {
 
 /**
  * Rectangles have two interpretations: a set of (zero-size) points,
  * and a rectangular area of the plane. Most rectangle operations behave
  * the same no matter what interpretation is being used, but some operations
@@ -55,20 +54,20 @@ struct BaseRect {
   // Emptiness. An empty rect is one that has no area, i.e. its height or width
   // is <= 0
   bool IsEmpty() const { return height <= 0 || width <= 0; }
   void SetEmpty() { width = height = 0; }
 
   // "Finite" means not inf and not NaN
   bool IsFinite() const
   {
-    return (NS_finite(x) &&
-            NS_finite(y) &&
-            NS_finite(width) &&
-            NS_finite(height));
+    return (std::isfinite(x) &&
+            std::isfinite(y) &&
+            std::isfinite(width) &&
+            std::isfinite(height));
   }
 
   // Returns true if this rectangle contains the interior of aRect. Always
   // returns true if aRect is empty, and always returns false is aRect is
   // nonempty but this rect is empty.
   bool Contains(const Sub& aRect) const
   {
     return aRect.IsEmpty() ||