Bug 1170983 - Re-enable gfx gtests that were skipped on Windows. r=ted

We can run these now that we don't split out gkmedias.

This also changes a test to avoid MSVC codegening a divide by 0

--HG--
extra : rebase_source : 06af10f1d6779237d2cc6c1dabfd9378889893ee

gfx/tests/gtest/TestRect.cpp

@@ -2,6 +2,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include <limits>
 
 #include "gtest/gtest.h"
 
@@ -371,11 +372,9 @@ TestUnion()
 static bool
 TestFiniteGfx()
 {
-  // Doesn't appear that __builtin_inf() and __builtin_nan() are available on
-  // all compilers, so go the old fashioned way for inf and nan.
-  float posInf = 1.0/0.0;
-  float negInf = -1.0/0.0;
-  float justNaN = 0.0/0.0;
+  float posInf = std::numeric_limits<float>::infinity();
+  float negInf = -std::numeric_limits<float>::infinity();
+  float justNaN = std::numeric_limits<float>::quiet_NaN();
 
   gfxFloat values[4] = {5.0, 10.0, 15.0, 20.0};
 

gfx/tests/gtest/moz.build

@@ -15,6 +15,8 @@ UNIFIED_SOURCES += [
     'TestGfxPrefs.cpp',
     'TestGfxWidgets.cpp',
     'TestLayers.cpp',
+    'TestMoz2D.cpp',
+    'TestRect.cpp',
     'TestRegion.cpp',
     'TestSkipChars.cpp',
     # Hangs on linux in ApplyGdkScreenFontOptions
@@ -26,20 +28,13 @@ UNIFIED_SOURCES += [
     'TestVsync.cpp',
 ]
 
-# Because of gkmedia on windows we won't find these
-# symbols in xul.dll.
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
-    UNIFIED_SOURCES += [ '/gfx/2d/unittest/%s' % p for p in [
-        'TestBase.cpp',
-        'TestBugs.cpp',
-        'TestCairo.cpp',
-        'TestPoint.cpp',
-        'TestScaling.cpp',
-    ]]
-    UNIFIED_SOURCES += [
-        'TestMoz2D.cpp',
-        'TestRect.cpp',
-    ]
+UNIFIED_SOURCES += [ '/gfx/2d/unittest/%s' % p for p in [
+    'TestBase.cpp',
+    'TestBugs.cpp',
+    'TestCairo.cpp',
+    'TestPoint.cpp',
+    'TestScaling.cpp',
+]]
 
 include('/ipc/chromium/chromium-config.mozbuild')