Bug 1150944 - Fix gfxPrefs unit test to not rely on skia-gl pref. r=mstange
☠☠ backed out by d45d53f73998 ☠ ☠
authorMatt Woodrow <mwoodrow@mozilla.com>
Wed, 29 Jul 2015 16:35:55 -0400
changeset 281617 7ae813666ed5ac97adf050320ab2bc871a2a29e2
parent 281616 2f29ac2e31cda2c8731531f15e42715bf3929e57
child 281618 1c510537d20b6af344b996d86c6f0ebfdc8bc295
push id3894
push usermconley@mozilla.com
push dateThu, 30 Jul 2015 00:27:47 +0000
reviewersmstange
bugs1150944
milestone42.0a1
Bug 1150944 - Fix gfxPrefs unit test to not rely on skia-gl pref. r=mstange
gfx/tests/gtest/TestGfxPrefs.cpp
--- a/gfx/tests/gtest/TestGfxPrefs.cpp
+++ b/gfx/tests/gtest/TestGfxPrefs.cpp
@@ -20,17 +20,17 @@ TEST(GfxPrefs, Singleton) {
   ASSERT_TRUE(gfxPrefs::SingletonExists());
 }
 
 TEST(GfxPrefs, LiveValues) {
   gfxPrefs::GetSingleton();
   ASSERT_TRUE(gfxPrefs::SingletonExists());
 
   // Live boolean, default false
-  ASSERT_FALSE(gfxPrefs::CanvasAzureAccelerated());
+  ASSERT_FALSE(gfxPrefs::LayersDumpTexture());
 
   // Live int32_t, default 23456
   ASSERT_TRUE(gfxPrefs::LayerScopePort() == 23456);
 
   // Live uint32_t, default 2
   ASSERT_TRUE(gfxPrefs::MSAALevel() == 2);
 }
 
@@ -61,21 +61,21 @@ TEST(GfxPrefs, Set) {
   // Once boolean, default false
   ASSERT_FALSE(gfxPrefs::LayersDump());
   gfxPrefs::SetLayersDump(true);
   ASSERT_TRUE(gfxPrefs::LayersDump());
   gfxPrefs::SetLayersDump(false);
   ASSERT_FALSE(gfxPrefs::LayersDump());
 
   // Live boolean, default false
-  ASSERT_FALSE(gfxPrefs::CanvasAzureAccelerated());
-  gfxPrefs::SetCanvasAzureAccelerated(true);
-  ASSERT_TRUE(gfxPrefs::CanvasAzureAccelerated());
-  gfxPrefs::SetCanvasAzureAccelerated(false);
-  ASSERT_FALSE(gfxPrefs::CanvasAzureAccelerated());
+  ASSERT_FALSE(gfxPrefs::LayersDumpTexture());
+  gfxPrefs::SetLayersDumpTexture(true);
+  ASSERT_TRUE(gfxPrefs::LayersDumpTexture());
+  gfxPrefs::SetLayersDumpTexture(false);
+  ASSERT_FALSE(gfxPrefs::LayersDumpTexture());
 
   // Once float, default -1
   ASSERT_TRUE(gfxPrefs::APZMaxVelocity() == -1.0f);
   gfxPrefs::SetAPZMaxVelocity(1.75f);
   ASSERT_TRUE(gfxPrefs::APZMaxVelocity() == 1.75f);
   gfxPrefs::SetAPZMaxVelocity(-1.0f);
   ASSERT_TRUE(gfxPrefs::APZMaxVelocity() == -1.0f);
 }