Use SkPngEncoder in gfx jpeg_codec

ui/gfx/codec/jpeg_codec.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/codec/jpeg_codec.h"
+#include "ui/gfx/codec/vector_wstream.h"

[Elliot Glaysher, 2017/07/10 17:59:07]

this shouldn't be here, it should be in the include section. only the header for
the current file goes above the system headers.

[liyuqian, 2017/07/11 13:39:27]

Done.

 
 #include <setjmp.h>
 
 #include <memory>
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
-#include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/encode/SkJpegEncoder.h"
 
 extern "C" {
 #if defined(USE_SYSTEM_LIBJPEG)
 #include <jpeglib.h>
 #elif defined(USE_LIBJPEG_TURBO)
 #include "third_party/libjpeg_turbo/jpeglib.h"
 #else
 #include "third_party/libjpeg/jpeglib.h"
 #endif
@@ skipping 15 matching lines @@
   CoderErrorMgr *err = reinterpret_cast<CoderErrorMgr*>(cinfo->err);
 
   // Return control to the setjmp point.
   longjmp(err->setjmp_buffer, false);
 }
 
 }  // namespace
 
 // Encoder ---------------------------------------------------------------------
 
-namespace {
-
-class VectorWStream : public SkWStream {
- public:
-  VectorWStream(std::vector<unsigned char>* dst) : dst_(dst) {
-    DCHECK(dst_);
-    DCHECK_EQ(0UL, dst_->size());
-  }
-
-  bool write(const void* buffer, size_t size) override {
-    const unsigned char* ptr = reinterpret_cast<const unsigned char*>(buffer);
-    dst_->insert(dst_->end(), ptr, ptr + size);
-    return true;
-  }
-
-  size_t bytesWritten() const override { return dst_->size(); }
-
- private:
-  // Does not have ownership.
-  std::vector<unsigned char>* dst_;
-};
-};
-
 bool JPEGCodec::Encode(const SkPixmap& src,
                        int quality,
                        std::vector<unsigned char>* output) {
   output->clear();
   VectorWStream dst(output);
 
   SkJpegEncoder::Options options;
   options.fQuality = quality;
   return SkJpegEncoder::Encode(&dst, src, options);
 }
@@ skipping 225 matching lines @@
   int data_length = w * h * 4;
 
   std::unique_ptr<SkBitmap> bitmap(new SkBitmap());
   bitmap->allocN32Pixels(w, h);
   memcpy(bitmap->getAddr32(0, 0), &data_vector[0], data_length);
 
   return bitmap;
 }
 
 }  // namespace gfx