Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1270)

Unified Diff: third_party/WebKit/Source/platform/image-encoders/PNGImageEncoder.cpp

Issue 2891373002: Use SkPngEncoder and SkWebpEncoder in WebKit platform (Closed)
Patch Set: Response to comments Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/image-encoders/PNGImageEncoder.cpp
diff --git a/third_party/WebKit/Source/platform/image-encoders/PNGImageEncoder.cpp b/third_party/WebKit/Source/platform/image-encoders/PNGImageEncoder.cpp
deleted file mode 100644
index c178bc1236a2746398df0a72072de028d99ff7a0..0000000000000000000000000000000000000000
--- a/third_party/WebKit/Source/platform/image-encoders/PNGImageEncoder.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2010, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "platform/image-encoders/PNGImageEncoder.h"
-
-#include <memory>
-#include "platform/graphics/ImageBuffer.h"
-#include "platform/wtf/PtrUtil.h"
-
-#include "zlib.h"
-
-namespace blink {
-
-PNGImageEncoderState::~PNGImageEncoderState() {
- png_destroy_write_struct(&png_, &info_);
-}
-
-static void WriteOutput(png_structp png, png_bytep data, png_size_t size) {
- static_cast<Vector<unsigned char>*>(png_get_io_ptr(png))->Append(data, size);
-}
-
-std::unique_ptr<PNGImageEncoderState> PNGImageEncoderState::Create(
- const IntSize& image_size,
- Vector<unsigned char>* output) {
- if (image_size.Width() <= 0 || image_size.Height() <= 0)
- return nullptr;
-
- png_struct* png = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
- png_info* info = png_create_info_struct(png);
- if (!png || !info || setjmp(png_jmpbuf(png))) {
- png_destroy_write_struct(png ? &png : 0, info ? &info : 0);
- return nullptr;
- }
-
- // Optimize compression for speed.
- // The parameters are the same as what libpng uses by default for RGB and RGBA
- // images, except:
- // The zlib compression level is set to 3 instead of 6, to avoid the lazy
- // Ziv-Lempel match searching.
- png_set_compression_level(png, 3);
-
- // The zlib memory level is set to 8. This actually matches the default, we
- // are just future-proofing.
- png_set_compression_mem_level(png, 8);
-
- // The zlib strategy is set to Z_FILTERED, which does not match the default.
- // Avoid the zlib strategies Z_HUFFMAN_ONLY or Z_RLE.
- // Although they are the fastest for poorly-compressible images (e.g.
- // photographs), they are very slow for highly-compressible images (e.g. text,
- // drawings or business graphics)
- png_set_compression_strategy(png, Z_FILTERED);
-
- // The delta filter is PNG_FILTER_SUB instead of PNG_ALL_FILTERS, to reduce
- // the filter computations.
- png_set_filter(png, PNG_FILTER_TYPE_BASE, PNG_FILTER_SUB);
-
- png_set_write_fn(png, output, WriteOutput, 0);
- png_set_IHDR(png, info, image_size.Width(), image_size.Height(), 8,
- PNG_COLOR_TYPE_RGB_ALPHA, 0, 0, 0);
- png_write_info(png, info);
-
- return WTF::WrapUnique(new PNGImageEncoderState(png, info));
-}
-
-void PNGImageEncoder::WriteOneRowToPng(unsigned char* pixels,
- PNGImageEncoderState* encoder_state) {
- png_write_row(encoder_state->Png(), pixels);
-}
-
-void PNGImageEncoder::FinalizePng(PNGImageEncoderState* encoder_state) {
- png_write_end(encoder_state->Png(), encoder_state->Info());
-}
-
-static bool EncodePixels(const IntSize& image_size,
- const unsigned char* input_pixels,
- Vector<unsigned char>* output) {
- std::unique_ptr<PNGImageEncoderState> encoder_state =
- PNGImageEncoderState::Create(image_size, output);
- if (!encoder_state.get())
- return false;
-
- unsigned char* pixels = const_cast<unsigned char*>(input_pixels);
- const size_t pixel_row_stride = image_size.Width() * 4;
- for (int y = 0; y < image_size.Height(); ++y) {
- PNGImageEncoder::WriteOneRowToPng(pixels, encoder_state.get());
- pixels += pixel_row_stride;
- }
-
- PNGImageEncoder::FinalizePng(encoder_state.get());
- return true;
-}
-
-bool PNGImageEncoder::Encode(const ImageDataBuffer& image_data,
- Vector<unsigned char>* output) {
- if (!image_data.Pixels())
- return false;
-
- return EncodePixels(image_data.size(), image_data.Pixels(), output);
-}
-
-} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698