DM: don't change byte order when unpremultiplying to compare to PNGs.

dm/DMWriteTask.cpp

 #include "DMWriteTask.h"
 
 #include "DMUtil.h"
+#include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkString.h"
 #include "SkUnPreMultiply.h"
 
 DEFINE_string2(writePath, w, "", "If set, write GMs here as .pngs.");
 
 namespace DM {
 
@@ skipping 115 matching lines @@
     }
     SkASSERT(expected.config() == bitmap.config());
 
     // Manually unpremultiply 8888 bitmaps to match expected.
     // Their pixels are shared, concurrently even, so we must copy them.
     if (info.fColorType == kPMColor_SkColorType) {
         SkBitmap unpremul;
         unpremul.setConfig(info);
         unpremul.allocPixels();
 
+        // Unpremultiply without changing native byte order.
         SkAutoLockPixels lockSrc(bitmap), lockDst(unpremul);
         const SkPMColor* src = (SkPMColor*)bitmap.getPixels();
-        SkColor* dst = (SkColor*)unpremul.getPixels();
-
+        uint32_t* dst = (uint32_t*)unpremul.getPixels();
         for (size_t i = 0; i < bitmap.getSize()/4; i++) {
-            dst[i] = SkUnPreMultiply::PMColorToColor(src[i]);
+            const U8CPU a = SkGetPackedA32(src[i]);
+            const SkUnPreMultiply::Scale s = SkUnPreMultiply::GetScale(a);
+            dst[i] = SkPackARGB32NoCheck(a,
+                                         SkUnPreMultiply::ApplyScale(s, SkGetPackedR32(src[i])),
+                                         SkUnPreMultiply::ApplyScale(s, SkGetPackedG32(src[i])),
+                                         SkUnPreMultiply::ApplyScale(s, SkGetPackedB32(src[i])));
         }
         bitmap.swap(unpremul);
     }
 
     return BitmapsEqual(expected, bitmap);
 }
 
 }  // namespace DM