Merge "Fix Skia filter behavior test" into nyc-dev

This commit is contained in:
Chris Craik
2016-05-13 23:12:17 +00:00
committed by Android (Google) Code Review

View File

@@ -51,15 +51,20 @@ TEST(SkiaBehavior, genIds) {
} }
TEST(SkiaBehavior, lightingColorFilter_simplify) { TEST(SkiaBehavior, lightingColorFilter_simplify) {
SkAutoTUnref<SkColorFilter> filter(SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0)); {
SkAutoTUnref<SkColorFilter> filter(
SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0));
SkColor observedColor; SkColor observedColor;
SkXfermode::Mode observedMode; SkXfermode::Mode observedMode;
ASSERT_TRUE(filter->asColorMode(&observedColor, &observedMode)); ASSERT_TRUE(filter->asColorMode(&observedColor, &observedMode));
EXPECT_EQ(0xFF223344, observedColor); EXPECT_EQ(0xFF223344, observedColor);
EXPECT_EQ(SkXfermode::Mode::kModulate_Mode, observedMode); EXPECT_EQ(SkXfermode::Mode::kModulate_Mode, observedMode);
}
{
SkAutoTUnref<SkColorFilter> failFilter( SkAutoTUnref<SkColorFilter> failFilter(
SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0x1)); SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0x1));
EXPECT_FALSE(filter->asColorMode(nullptr, nullptr)); EXPECT_FALSE(failFilter->asColorMode(nullptr, nullptr));
}
} }