Revert of Fix WIC encoder to support kJPEG_Type (patchset #3 id:140001 of https://codereview.chromium.org/2245453002/ )

Reason for revert:
Broken Windows bot.

Original issue's description:
> Fix WIC encoder to support kJPEG_Type
>
> (1) Add support for kJPEG to WIC
> (2) Add encoding test.
> (3) Turn on WIC jpeg encoder on Windows and CG jpeg
>     encoder on Mac.
>
> A follow-up may make Skia's encoders the default on all
> platforms.  But, in order to do that, I think we need
> to write better encoding unit tests for CG and WIC.
>
> BUG=skia:3969
> BUG=skia:5632
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2245453002
>
> Committed: https://skia.googlesource.com/skia/+/b3a7ef1fc0adc24859d2498aee54d3ec2cbcac3a

TBR=mtklein@google.com,mtklein@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3969

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

1 files changed, 15 insertions, 34 deletions

diff --git a/src/ports/SkImageEncoder_WIC.cpp b/src/ports/SkImageEncoder_WIC.cpp
index ff651d32fa..5523ea2e11 100644
--- a/src/ports/SkImageEncoder_WIC.cpp
+++ b/src/ports/SkImageEncoder_WIC.cpp
@@ -83,56 +83,35 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream
             return false;
     }
 
-    // First convert to BGRA if necessary.
+    //Convert to 8888 if needed.
     const SkBitmap* bitmap;
     SkBitmap bitmapCopy;
-    if (kBGRA_8888_SkColorType == bitmapOrig.colorType()) {
+    if (kN32_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) {
         bitmap = &bitmapOrig;
     } else {
-        if (!bitmapOrig.copyTo(&bitmapCopy, kBGRA_8888_SkColorType)) {
+        if (!bitmapOrig.copyTo(&bitmapCopy, kN32_SkColorType)) {
             return false;
         }
         bitmap = &bitmapCopy;
     }
 
-    // WIC expects unpremultiplied pixels.  Unpremultiply if necessary.
-    if (kPremul_SkAlphaType == bitmap->alphaType()) {
+    // We cannot use PBGRA so we need to unpremultiply ourselves
+    if (!bitmap->isOpaque()) {
         SkAutoLockPixels alp(*bitmap);
+
         uint8_t* pixels = reinterpret_cast<uint8_t*>(bitmap->getPixels());
         for (int y = 0; y < bitmap->height(); ++y) {
             for (int x = 0; x < bitmap->width(); ++x) {
                 uint8_t* bytes = pixels + y * bitmap->rowBytes() + x * bitmap->bytesPerPixel();
+
                 SkPMColor* src = reinterpret_cast<SkPMColor*>(bytes);
                 SkColor* dst = reinterpret_cast<SkColor*>(bytes);
-                *dst = SkUnPreMultiply::PMColorToColor(*src);
-            }
-        }
-    }
 
-    // Finally, if we are performing a jpeg encode, we must convert to BGR.
-    void* pixels = bitmap->getPixels();
-    size_t rowBytes = bitmap->rowBytes();
-    SkAutoMalloc pixelStorage;
-    WICPixelFormatGUID formatDesired = GUID_WICPixelFormat32bppBGRA;
-    if (kJPEG_Type == fType) {
-        formatDesired = GUID_WICPixelFormat24bppBGR;
-        rowBytes = SkAlign4(bitmap->width() * 3);
-        pixelStorage.reset(rowBytes * bitmap->height());
-        for (int y = 0; y < bitmap->height(); y++) {
-            uint8_t* dstRow = SkTAddOffset<uint8_t>(pixelStorage.get(), y * rowBytes);
-            for (int x = 0; x < bitmap->width(); x++) {
-                uint32_t bgra = *bitmap->getAddr32(x, y);
-                dstRow[0] = (uint8_t) (bgra >>  0);
-                dstRow[1] = (uint8_t) (bgra >>  8);
-                dstRow[2] = (uint8_t) (bgra >> 16);
-                dstRow += 3;
+                *dst = SkUnPreMultiply::PMColorToColor(*src);
             }
         }
-
-        pixels = pixelStorage.get();
     }
 
-
     //Initialize COM.
     SkAutoCoInitialize scopedCo;
     if (!scopedCo.succeeded()) {
@@ -205,6 +184,7 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream
 
     //Set the pixel format of the frame.  If native encoded format cannot match BGRA,
     //it will choose the closest pixel format that it supports.
+    const WICPixelFormatGUID formatDesired = GUID_WICPixelFormat32bppBGRA;
     WICPixelFormatGUID formatGUID = formatDesired;
     if (SUCCEEDED(hr)) {
         hr = piBitmapFrameEncode->SetPixelFormat(&formatGUID);
@@ -217,10 +197,12 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream
     //Write the pixels into the frame.
     if (SUCCEEDED(hr)) {
         SkAutoLockPixels alp(*bitmap);
-        hr = piBitmapFrameEncode->WritePixels(height,
-                                              (UINT) rowBytes,
-                                              (UINT) rowBytes * height,
-                                              reinterpret_cast<BYTE*>(pixels));
+        const UINT stride = (UINT) bitmap->rowBytes();
+        hr = piBitmapFrameEncode->WritePixels(
+            height
+            , stride
+            , stride * height
+            , reinterpret_cast<BYTE*>(bitmap->getPixels()));
     }
 
     if (SUCCEEDED(hr)) {
@@ -241,7 +223,6 @@ static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
         case SkImageEncoder::kBMP_Type:
         case SkImageEncoder::kICO_Type:
         case SkImageEncoder::kPNG_Type:
-        case SkImageEncoder::kJPEG_Type:
             break;
         default:
             return nullptr;