Force avatar and wallpaper decoding to use robust JPEG.

chrome/browser/image_decoder.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_IMAGE_DECODER_H_
 #define CHROME_BROWSER_IMAGE_DECODER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 15 matching lines @@
                                 const SkBitmap& decoded_image) = 0;
 
     // Called when decoding image failed. Delegate can do some cleanup in
     // this handler.
     virtual void OnDecodeImageFailed(const ImageDecoder* decoder) {}
 
    protected:
     virtual ~Delegate() {}
   };
 
+  enum ImageCodec {
+    DEFAULT_CODEC = 0,
+    ONLY_IJG_LIBJPEG_CODEC,
+  };

[oshima, 2012/08/29 01:32:29]

document enum

[Emmanuel Saint-loubert-Bié, 2012/08/29 01:57:18]

Done.

+
   ImageDecoder(Delegate* delegate,
-               const std::string& image_data);
+               const std::string& image_data,
+               ImageCodec image_codec);
 
   // Starts image decoding.
   void Start();
 
   const std::vector<unsigned char>& get_image_data() const {
     return image_data_;
   }
 
   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
 
  private:
   // It's a reference counted object, so destructor is private.
   virtual ~ImageDecoder();
 
   // Overidden from UtilityProcessHostClient:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // IPC message handlers.
   void OnDecodeImageSucceeded(const SkBitmap& decoded_image);
   void OnDecodeImageFailed();
 
   // Launches sandboxed process that will decode the image.
   void DecodeImageInSandbox(const std::vector<unsigned char>& image_data);
 
   Delegate* delegate_;
   std::vector<unsigned char> image_data_;
+  ImageCodec image_codec_;
   content::BrowserThread::ID target_thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageDecoder);
 };
 
 #endif  // CHROME_BROWSER_IMAGE_DECODER_H_