commit 35f255f0f77dd0dea58d2f7aa07f6ec8b3994819
author mtklein <mtklein@chromium.org> Tue Jul 19 12:59:35 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 19 12:59:35 2016 -0700
tree 65698bf0f2246827f19c9a8a6363db5b3f9796b7
parent 523e76d2795f4c49e6740676394aa015aa5798ae

Fix color order on LCD text when using sRGB software backend.

BUG=skia:5182
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2166533002

Review-Url: https://codereview.chromium.org/2166533002

src/core/SkXfermode4f.cpp

diff --git a/src/core/SkXfermode4f.cpp b/src/core/SkXfermode4f.cpp
index 8671df7..d861973 100644
--- a/src/core/SkXfermode4f.cpp
+++ b/src/core/SkXfermode4f.cpp
@@ -441,7 +441,7 @@
 
 template <DstType D>
 void src_1_lcd(uint32_t dst[], const SkPM4f* src, int count, const uint16_t lcd[]) {
-    const Sk4f s4 = Sk4f::Load(src->fVec);
+    const Sk4f s4 = src->to4f_pmorder();
 
     if (D == kLinear_Dst) {
         // operate in bias-255 space for src and dst
@@ -473,7 +473,7 @@
         if (0 == rgb) {
             continue;
         }
-        Sk4f s4 = Sk4f::Load(src[i].fVec);
+        Sk4f s4 = src[i].to4f_pmorder();
         Sk4f d4 = load_dst<D>(dst[i]);
         dst[i] = store_dst<D>(lerp(s4, d4, lcd16_to_unit_4f(rgb))) | (SK_A32_MASK << SK_A32_SHIFT);
     }
@@ -481,7 +481,7 @@
 
 template <DstType D>
 void srcover_1_lcd(uint32_t dst[], const SkPM4f* src, int count, const uint16_t lcd[]) {
-    const Sk4f s4 = Sk4f::Load(src->fVec);
+    const Sk4f s4 = src->to4f_pmorder();
     Sk4f dst_scale = Sk4f(1 - get_alpha(s4));
 
     for (int i = 0; i < count; ++i) {
@@ -503,7 +503,7 @@
         if (0 == rgb) {
             continue;
         }
-        Sk4f s4 = Sk4f::Load(src[i].fVec);
+        Sk4f s4 = src[i].to4f_pmorder();
         Sk4f dst_scale = Sk4f(1 - get_alpha(s4));
         Sk4f d4 = load_dst<D>(dst[i]);
         Sk4f r4 = s4 + d4 * dst_scale;