use new non-255 colormatrix

also use new naming convention for asAColorMode

Test: make

Change-Id: I32ddaf6d2d0ce9b0f29ee32e866879884fc926b4

2 files changed, 2 insertions, 3 deletions

diff --git a/libs/hwui/tests/common/scenes/SimpleColorMatrixAnimation.cpp b/libs/hwui/tests/common/scenes/SimpleColorMatrixAnimation.cpp
index c899a3c8cfc6..06205f67f20a 100644
--- a/libs/hwui/tests/common/scenes/SimpleColorMatrixAnimation.cpp
+++ b/libs/hwui/tests/common/scenes/SimpleColorMatrixAnimation.cpp
@@ -53,7 +53,6 @@ private:
                 x, y, x + width, y + height,
                 [width, height](RenderProperties& props, Canvas& canvas) {
                     SkPaint paint;
-                    
                     // Simple scale/translate case where R, G, and B are all treated equivalently
                     SkColorMatrix cm;
                     cm.setScale(1.1f, 1.1f, 1.1f, 0.5f);
diff --git a/libs/hwui/tests/unit/SkiaBehaviorTests.cpp b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
index df5f45618070..7951537e1525 100644
--- a/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
+++ b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp
@@ -48,14 +48,14 @@ TEST(SkiaBehavior, lightingColorFilter_simplify) {
 
         SkColor observedColor;
         SkBlendMode observedMode;
-        ASSERT_TRUE(filter->asColorMode(&observedColor, &observedMode));
+        ASSERT_TRUE(filter->asAColorMode(&observedColor, &observedMode));
         EXPECT_EQ(0xFF223344, observedColor);
         EXPECT_EQ(SkBlendMode::kModulate, observedMode);
     }
 
     {
         sk_sp<SkColorFilter> failFilter(SkColorMatrixFilter::MakeLightingFilter(0x11223344, 0x1));
-        EXPECT_FALSE(failFilter->asColorMode(nullptr, nullptr));
+        EXPECT_FALSE(failFilter->asAColorMode(nullptr, nullptr));
     }
 }