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

Side by Side Diff: chrome/browser/image_decoder.h

Issue 820673004: json_schema_compiler: Use std::vector<char> for binary values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simplify_json_schema
Patch Set: Fix merge error. Created 5 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_IMAGE_DECODER_H_ 5 #ifndef CHROME_BROWSER_IMAGE_DECODER_H_
6 #define CHROME_BROWSER_IMAGE_DECODER_H_ 6 #define CHROME_BROWSER_IMAGE_DECODER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 25 matching lines...) Expand all
36 36
37 enum ImageCodec { 37 enum ImageCodec {
38 DEFAULT_CODEC = 0, // Uses WebKit image decoding (via WebImage). 38 DEFAULT_CODEC = 0, // Uses WebKit image decoding (via WebImage).
39 ROBUST_JPEG_CODEC, // Restrict decoding to robust jpeg codec. 39 ROBUST_JPEG_CODEC, // Restrict decoding to robust jpeg codec.
40 }; 40 };
41 41
42 ImageDecoder(Delegate* delegate, 42 ImageDecoder(Delegate* delegate,
43 const std::string& image_data, 43 const std::string& image_data,
44 ImageCodec image_codec); 44 ImageCodec image_codec);
45 45
46 ImageDecoder(Delegate* delegate,
47 const std::vector<char>& image_data,
48 ImageCodec image_codec);
49
46 // Starts asynchronous image decoding. Once finished, the callback will be 50 // Starts asynchronous image decoding. Once finished, the callback will be
47 // posted back to |task_runner|. 51 // posted back to |task_runner|.
48 void Start(scoped_refptr<base::SequencedTaskRunner> task_runner); 52 void Start(scoped_refptr<base::SequencedTaskRunner> task_runner);
49 53
50 const std::vector<unsigned char>& get_image_data() const { 54 const std::vector<unsigned char>& get_image_data() const {
51 return image_data_; 55 return image_data_;
52 } 56 }
53 57
54 void set_delegate(Delegate* delegate) { delegate_ = delegate; } 58 void set_delegate(Delegate* delegate) { delegate_ = delegate; }
55 void set_shrink_to_fit(bool shrink_to_fit) { shrink_to_fit_ = shrink_to_fit; } 59 void set_shrink_to_fit(bool shrink_to_fit) { shrink_to_fit_ = shrink_to_fit; }
(...skipping 15 matching lines...) Expand all
71 Delegate* delegate_; 75 Delegate* delegate_;
72 std::vector<unsigned char> image_data_; 76 std::vector<unsigned char> image_data_;
73 const ImageCodec image_codec_; 77 const ImageCodec image_codec_;
74 scoped_refptr<base::SequencedTaskRunner> task_runner_; 78 scoped_refptr<base::SequencedTaskRunner> task_runner_;
75 bool shrink_to_fit_; // if needed for IPC msg size limit 79 bool shrink_to_fit_; // if needed for IPC msg size limit
76 80
77 DISALLOW_COPY_AND_ASSIGN(ImageDecoder); 81 DISALLOW_COPY_AND_ASSIGN(ImageDecoder);
78 }; 82 };
79 83
80 #endif // CHROME_BROWSER_IMAGE_DECODER_H_ 84 #endif // CHROME_BROWSER_IMAGE_DECODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698