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

Side by Side Diff: Source/core/platform/image-encoders/skia/JPEGImageEncoder.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 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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/JPEGImageEncoder.h" 32 #include "core/platform/image-encoders/skia/JPEGImageEncoder.h"
33 33
34 #include "SkBitmap.h" 34 #include "SkBitmap.h"
35 #include "SkColorPriv.h" 35 #include "SkColorPriv.h"
36 #include "core/html/ImageData.h" 36 #include "core/platform/graphics/ImageBuffer.h"
37 #include "platform/geometry/IntSize.h" 37 #include "platform/geometry/IntSize.h"
38 extern "C" { 38 extern "C" {
39 #include <setjmp.h> 39 #include <setjmp.h>
40 #include <stdio.h> // jpeglib.h needs stdio.h FILE 40 #include <stdio.h> // jpeglib.h needs stdio.h FILE
41 #include "jpeglib.h" 41 #include "jpeglib.h"
42 } 42 }
43 43
44 namespace WebCore { 44 namespace WebCore {
45 45
46 struct JPEGOutputBuffer : public jpeg_destination_mgr { 46 struct JPEGOutputBuffer : public jpeg_destination_mgr {
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 bool JPEGImageEncoder::encode(const SkBitmap& bitmap, int quality, Vector<unsign ed char>* output) 187 bool JPEGImageEncoder::encode(const SkBitmap& bitmap, int quality, Vector<unsign ed char>* output)
188 { 188 {
189 SkAutoLockPixels bitmapLock(bitmap); 189 SkAutoLockPixels bitmapLock(bitmap);
190 190
191 if (bitmap.config() != SkBitmap::kARGB_8888_Config || !bitmap.getPixels()) 191 if (bitmap.config() != SkBitmap::kARGB_8888_Config || !bitmap.getPixels())
192 return false; // Only support 32 bit/pixel skia bitmaps. 192 return false; // Only support 32 bit/pixel skia bitmaps.
193 193
194 return encodePixels(IntSize(bitmap.width(), bitmap.height()), static_cast<un signed char *>(bitmap.getPixels()), true, quality, output); 194 return encodePixels(IntSize(bitmap.width(), bitmap.height()), static_cast<un signed char *>(bitmap.getPixels()), true, quality, output);
195 } 195 }
196 196
197 bool JPEGImageEncoder::encode(const ImageData& imageData, int quality, Vector<un signed char>* output) 197 bool JPEGImageEncoder::encode(const ImageDataBuffer& imageData, int quality, Vec tor<unsigned char>* output)
198 { 198 {
199 return encodePixels(imageData.size(), imageData.data()->data(), false, quali ty, output); 199 return encodePixels(imageData.size(), imageData.data(), false, quality, outp ut);
200 } 200 }
201 201
202 } // namespace WebCore 202 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698