commit df3fbd6a0ecababda933a09915467380d135ec4e
author Matt Sarett <msarett@google.com> Mon Oct 17 13:52:49 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 17 18:15:55 2016 +0000
tree 575946c9d46c78ead5a6bcf58a05bf167fd7babc
parent 5bab65ba33bd3f313e6120f5c8468de07bb21be8

Apply correct sRGB->Linear4f conversion in SkModeColorFilter

This fixes a software rendering bug in Android.  Vector drawable
icons were being drawn "too light" because they were missing this
step.

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3563

Change-Id: I9b9c0dc571244dab17ee125ecb7814d7f85181e2
Reviewed-on: https://skia-review.googlesource.com/3563
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>

src/core/SkModeColorFilter.cpp

diff --git a/src/core/SkModeColorFilter.cpp b/src/core/SkModeColorFilter.cpp
index e165f69..8da7c00 100644
--- a/src/core/SkModeColorFilter.cpp
+++ b/src/core/SkModeColorFilter.cpp
@@ -75,7 +75,7 @@
 void SkModeColorFilter::updateCache() {
     fPMColor = SkPreMultiplyColor(fColor);
     fProc = SkXfermode::GetProc(fMode);
-    fPM4f = SkPM4f::FromPMColor(fPMColor);
+    fPM4f = SkColor4f::FromColor(fColor).premul();
 }
 
 sk_sp<SkFlattenable> SkModeColorFilter::CreateProc(SkReadBuffer& buffer) {

tests/SkColor4fTest.cpp

diff --git a/tests/SkColor4fTest.cpp b/tests/SkColor4fTest.cpp
index 0cbd5ce..a36bc86 100644
--- a/tests/SkColor4fTest.cpp
+++ b/tests/SkColor4fTest.cpp
@@ -76,71 +76,6 @@
     }
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////////////
-
-static sk_sp<SkColorFilter> make_mode_cf() {
-    return SkColorFilter::MakeModeFilter(0xFFBB8855, SkXfermode::kPlus_Mode);
-}
-
-static sk_sp<SkColorFilter> make_mx_cf() {
-    const float mx[] = {
-        0.5f, 0,    0, 0, 0.1f,
-        0,    0.5f, 0, 0, 0.2f,
-        0,    0,    1, 0, -0.1f,
-        0,    0,    0, 1, 0,
-    };
-    return SkColorFilter::MakeMatrixFilterRowMajor255(mx);
-}
-
-static sk_sp<SkColorFilter> make_compose_cf() {
-    return SkColorFilter::MakeComposeFilter(make_mode_cf(), make_mx_cf());
-}
-
-static bool compare_spans(const SkPM4f span4f[], const SkPMColor span4b[], int count,
-                          float tolerance = 1.0f/255) {
-    for (int i = 0; i < count; ++i) {
-        SkPM4f c0 = SkPM4f::FromPMColor(span4b[i]);
-        SkPM4f c1 = span4f[i];
-        if (!nearly_equal(c0, c1, tolerance)) {
-            return false;
-        }
-    }
-    return true;
-}
-
-DEF_TEST(Color4f_colorfilter, reporter) {
-    struct {
-        sk_sp<SkColorFilter>    (*fFact)();
-        bool                    fSupports4f;
-        const char*             fName;
-    } recs[] = {
-        { make_mode_cf,     true, "mode" },
-        { make_mx_cf,       true, "matrix" },
-        { make_compose_cf,  true, "compose" },
-    };
-
-    // prepare the src
-    const int N = 100;
-    SkPMColor src4b[N];
-    SkPM4f    src4f[N];
-    SkRandom rand;
-    for (int i = 0; i < N; ++i) {
-        src4b[i] = SkPreMultiplyColor(rand.nextU());
-        src4f[i] = SkPM4f::FromPMColor(src4b[i]);
-    }
-    // confirm that our srcs are (nearly) equal
-    REPORTER_ASSERT(reporter, compare_spans(src4f, src4b, N));
-
-    for (const auto& rec : recs) {
-        auto filter(rec.fFact());
-        SkPMColor dst4b[N];
-        filter->filterSpan(src4b, N, dst4b);
-        SkPM4f dst4f[N];
-        filter->filterSpan4f(src4f, N, dst4f);
-        REPORTER_ASSERT(reporter, compare_spans(dst4f, dst4b, N));
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 typedef SkPM4f (*SkXfermodeProc4f)(const SkPM4f& src, const SkPM4f& dst);