commit 0cf377c6ae8877af10b4ccdf508a2d84da31fd26
author Chris Craik <ccraik@google.com> Fri May 13 23:17:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 13 23:17:34 2016 +0000
tree 72c69a1b0036bbbe55e031be822e04875a7faa2f
parent d361bbd0dbb87d00c6e4abbe32c7866f90ff56bd
parent 0c5bd7dffec8e5a5f21eed79dc827ef809048c2a

Merge "Fix Skia filter behavior test" into nyc-dev
am: 0c5bd7dffe

* commit '0c5bd7dffec8e5a5f21eed79dc827ef809048c2a':
  Fix Skia filter behavior test

Change-Id: I505e0cf42d47afed31dda7dfcae8a890f17f2dff

libs/hwui/tests/unit/SkiaBehaviorTests.cpp

diff --git a/libs/hwui/tests/unit/SkiaBehaviorTests.cpp b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
index e7e8af1..cd759cb 100644
--- a/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
+++ b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
@@ -51,15 +51,20 @@
 }
 
 TEST(SkiaBehavior, lightingColorFilter_simplify) {
-    SkAutoTUnref<SkColorFilter> filter(SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0));
+    {
+        SkAutoTUnref<SkColorFilter> filter(
+                SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0));
 
-    SkColor observedColor;
-    SkXfermode::Mode observedMode;
-    ASSERT_TRUE(filter->asColorMode(&observedColor, &observedMode));
-    EXPECT_EQ(0xFF223344, observedColor);
-    EXPECT_EQ(SkXfermode::Mode::kModulate_Mode, observedMode);
+        SkColor observedColor;
+        SkXfermode::Mode observedMode;
+        ASSERT_TRUE(filter->asColorMode(&observedColor, &observedMode));
+        EXPECT_EQ(0xFF223344, observedColor);
+        EXPECT_EQ(SkXfermode::Mode::kModulate_Mode, observedMode);
+    }
 
-    SkAutoTUnref<SkColorFilter> failFilter(
-            SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0x1));
-    EXPECT_FALSE(filter->asColorMode(nullptr, nullptr));
+    {
+        SkAutoTUnref<SkColorFilter> failFilter(
+                SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0x1));
+        EXPECT_FALSE(failFilter->asColorMode(nullptr, nullptr));
+    }
 }