make pm4f be RGBA always, not pmcolor order

src/core/SkColor.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkFixed.h"
@@ skipping 84 matching lines @@
         case 1: r = q; g = v; b = p; break;
         case 2: r = p; g = v; b = t; break;
         case 3: r = p; g = q; b = v; break;
         case 4: r = t;  g = p; b = v; break;
         default: r = v; g = p; b = q; break;
     }
     return SkColorSetARGB(a, r, g, b);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "SkPM4f.h"
-#include "SkNx.h"
+#include "SkPM4fPriv.h"
 #include "SkHalf.h"
 
 SkPM4f SkPM4f::FromPMColor(SkPMColor c) {
-    Sk4f value = SkNx_cast<float>(Sk4b::Load(&c));
+    Sk4f value = to_4f_rgba(c);
     SkPM4f c4;
     (value * Sk4f(1.0f / 255)).store(&c4);
     return c4;
 }
 
 SkColor4f SkPM4f::unpremul() const {
     float alpha = fVec[A];
     if (0 == alpha) {
         return { 0, 0, 0, 0 };
     } else {
@@ skipping 43 matching lines @@
     SkColor4f c4;
     Sk4f::Min(Sk4f::Max(Sk4f(a, r, g, b), Sk4f(0)), Sk4f(1)).store(c4.vec());
     return c4;
 }
 
 SkPM4f SkColor4f::premul() const {
     auto src = Sk4f::Load(this->pin().vec());
     float srcAlpha = src[0];  // need the pinned version of our alpha
     src = src * Sk4f(1, srcAlpha, srcAlpha, srcAlpha);
 
-#ifdef SK_PMCOLOR_IS_BGRA
-    // ARGB -> BGRA
-    Sk4f dst = SkNx_shuffle<3,2,1,0>(src);
-#else
     // ARGB -> RGBA
     Sk4f dst = SkNx_shuffle<1,2,3,0>(src);
-#endif
 
-    SkPM4f pm4;
-    dst.store(&pm4);
-    return pm4;
+    return SkPM4f::From4f(dst);
 }