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

Side by Side Diff: Source/core/platform/image-encoders/skia/PNGImageEncoder.cpp

Issue 54653004: Break dependency of platform/graphics on html/ImageData.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Move struct into ImageBuffer.h Created 7 years, 1 month 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010, Google Inc. All rights reserved. 2 * Copyright (c) 2010, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/platform/image-encoders/skia/PNGImageEncoder.h" 32 #include "core/platform/image-encoders/skia/PNGImageEncoder.h"
33 33
34 #include "SkBitmap.h" 34 #include "SkBitmap.h"
35 #include "SkColorPriv.h" 35 #include "SkColorPriv.h"
36 #include "SkUnPreMultiply.h" 36 #include "SkUnPreMultiply.h"
37 #include "core/html/ImageData.h" 37 #include "core/platform/graphics/ImageBuffer.h"
38 #include "platform/geometry/IntSize.h" 38 #include "platform/geometry/IntSize.h"
39 extern "C" { 39 extern "C" {
40 #include "png.h" 40 #include "png.h"
41 } 41 }
42 42
43 namespace WebCore { 43 namespace WebCore {
44 44
45 static void writeOutput(png_structp png, png_bytep data, png_size_t size) 45 static void writeOutput(png_structp png, png_bytep data, png_size_t size)
46 { 46 {
47 static_cast<Vector<unsigned char>*>(png_get_io_ptr(png))->append(data, size) ; 47 static_cast<Vector<unsigned char>*>(png_get_io_ptr(png))->append(data, size) ;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 bool PNGImageEncoder::encode(const SkBitmap& bitmap, Vector<unsigned char>* outp ut) 117 bool PNGImageEncoder::encode(const SkBitmap& bitmap, Vector<unsigned char>* outp ut)
118 { 118 {
119 SkAutoLockPixels bitmapLock(bitmap); 119 SkAutoLockPixels bitmapLock(bitmap);
120 120
121 if (bitmap.config() != SkBitmap::kARGB_8888_Config || !bitmap.getPixels()) 121 if (bitmap.config() != SkBitmap::kARGB_8888_Config || !bitmap.getPixels())
122 return false; // Only support 32 bit/pixel skia bitmaps. 122 return false; // Only support 32 bit/pixel skia bitmaps.
123 123
124 return encodePixels(IntSize(bitmap.width(), bitmap.height()), static_cast<un signed char*>(bitmap.getPixels()), true, output); 124 return encodePixels(IntSize(bitmap.width(), bitmap.height()), static_cast<un signed char*>(bitmap.getPixels()), true, output);
125 } 125 }
126 126
127 bool PNGImageEncoder::encode(const ImageData& imageData, Vector<unsigned char>* output) 127 bool PNGImageEncoder::encode(const ImageDataBuffer& imageData, Vector<unsigned c har>* output)
128 { 128 {
129 return encodePixels(imageData.size(), imageData.data()->data(), false, outpu t); 129 return encodePixels(imageData.size(), imageData.data(), false, output);
130 } 130 }
131 131
132 } // namespace WebCore 132 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698