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

Side by Side Diff: Source/core/platform/image-encoders/skia/WEBPImageEncoder.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
« no previous file with comments | « Source/core/platform/image-encoders/skia/WEBPImageEncoder.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011, Google Inc. All rights reserved. 2 * Copyright (c) 2011, 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 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
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/WEBPImageEncoder.h" 32 #include "core/platform/image-encoders/skia/WEBPImageEncoder.h"
33 33
34 #include "SkBitmap.h" 34 #include "SkBitmap.h"
35 #include "core/html/ImageData.h" 35 #include "core/platform/graphics/ImageBuffer.h"
36 #include "platform/geometry/IntSize.h" 36 #include "platform/geometry/IntSize.h"
37 #include "webp/encode.h" 37 #include "webp/encode.h"
38 38
39 typedef int (*WebPImporter)(WebPPicture* const, const uint8_t* const data, int r owStride); 39 typedef int (*WebPImporter)(WebPPicture* const, const uint8_t* const data, int r owStride);
40 40
41 namespace WebCore { 41 namespace WebCore {
42 42
43 static int writeOutput(const uint8_t* data, size_t size, const WebPPicture* cons t picture) 43 static int writeOutput(const uint8_t* data, size_t size, const WebPPicture* cons t picture)
44 { 44 {
45 static_cast<Vector<unsigned char>*>(picture->custom_ptr)->append(data, size) ; 45 static_cast<Vector<unsigned char>*>(picture->custom_ptr)->append(data, size) ;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 bool WEBPImageEncoder::encode(const SkBitmap& bitmap, int quality, Vector<unsign ed char>* output) 118 bool WEBPImageEncoder::encode(const SkBitmap& bitmap, int quality, Vector<unsign ed char>* output)
119 { 119 {
120 SkAutoLockPixels bitmapLock(bitmap); 120 SkAutoLockPixels bitmapLock(bitmap);
121 121
122 if (bitmap.config() != SkBitmap::kARGB_8888_Config || !bitmap.getPixels()) 122 if (bitmap.config() != SkBitmap::kARGB_8888_Config || !bitmap.getPixels())
123 return false; // Only support 32 bit/pixel skia bitmaps. 123 return false; // Only support 32 bit/pixel skia bitmaps.
124 124
125 return encodePixels(IntSize(bitmap.width(), bitmap.height()), static_cast<un signed char *>(bitmap.getPixels()), true, quality, output); 125 return encodePixels(IntSize(bitmap.width(), bitmap.height()), static_cast<un signed char *>(bitmap.getPixels()), true, quality, output);
126 } 126 }
127 127
128 bool WEBPImageEncoder::encode(const ImageData& imageData, int quality, Vector<un signed char>* output) 128 bool WEBPImageEncoder::encode(const ImageDataBuffer& imageData, int quality, Vec tor<unsigned char>* output)
129 { 129 {
130 return encodePixels(imageData.size(), imageData.data()->data(), false, quali ty, output); 130 return encodePixels(imageData.size(), imageData.data(), false, quality, outp ut);
131 } 131 }
132 132
133 } // namespace WebCore 133 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/image-encoders/skia/WEBPImageEncoder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698