Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 0c5bd7dffe

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

Change-Id: Ifff29ff78c32bf2af43ffaa2b8c922b3a41fa195
This commit is contained in:
Chris Craik
2016-05-13 23:17:33 +00:00
committed by android-build-merger
parent 1ba77621c6 0c5bd7dffe
commit de6400a282
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libs/hwui/tests/unit/SkiaBehaviorTests.cpp
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( {
SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0x1)); SkAutoTUnref<SkColorFilter> failFilter(
EXPECT_FALSE(filter->asColorMode(nullptr, nullptr)); SkColorMatrixFilter::CreateLightingFilter(0x11223344, 0x1));
EXPECT_FALSE(failFilter->asColorMode(nullptr, nullptr));
}
} }