Switch ChromeOS Chromium login to use IJG libjpeg

ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h

Index: ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h
diff --git a/ui/gfx/codec/jpeg_codec.h b/ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h
similarity index 54%
copy from ui/gfx/codec/jpeg_codec.h
copy to ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h
index 8219221283e7979b62a9cfb4c4afac240dfffbfb..dcbed3ccff9488173db6ccd0c85861fd903d2064 100644
--- a/ui/gfx/codec/jpeg_codec.h
+++ b/ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2014 The Chromium Authors. All rights reserved.

[sky, 2015/05/06 21:44:27]

2015 and no c.

[Ed Baker, 2015/05/07 00:31:41]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_CODEC_JPEG_CODEC_H_
-#define UI_GFX_CODEC_JPEG_CODEC_H_
+#ifndef UI_GFX_CHROMEOS_CODEC_JPEG_CODEC_ROBUST_SLOW_H_
+#define UI_GFX_CHROMEOS_CODEC_JPEG_CODEC_ROBUST_SLOW_H_
 
 #include <stddef.h>
 #include <vector>
@@ -15,10 +15,10 @@ class SkBitmap;
 namespace gfx {
 
 // Interface for encoding/decoding JPEG data. This is a wrapper around libjpeg,
-// which has an inconvenient interface for callers. This is only used for UI
-// elements, WebKit has its own more complicated JPEG decoder which handles,
-// among other things, partially downloaded data.
-class GFX_EXPORT JPEGCodec {
+// which has an inconvenient interface for callers. This is only used for
+// servicing ChromeUtilityMsg_RobustJPEGDecodeImage and is currently unique
+// to Chrome OS.
+class GFX_EXPORT JPEGCodecRobustSlow {

[sky, 2015/05/06 21:44:27]

Similar comment about name.

[Ed Baker, 2015/05/07 00:31:41]

Acknowledged.

  public:
   enum ColorFormat {
     // 3 bytes per pixel (packed), in RGB order regardless of endianness.
@@ -37,29 +37,6 @@ class GFX_EXPORT JPEGCodec {
     FORMAT_SkBitmap
   };
 
-  enum LibraryVariant {
-    SYSTEM_LIBJPEG = 0,
-    LIBJPEG_TURBO,
-    IJG_LIBJPEG,
-  };
-
-  // This method helps identify at run time which library chromium is using.
-  static LibraryVariant JpegLibraryVariant();
-
-  // Encodes the given raw 'input' data, with each pixel being represented as
-  // given in 'format'. The encoded JPEG data will be written into the supplied
-  // vector and true will be returned on success. On failure (false), the
-  // contents of the output buffer are undefined.
-  //
-  // w, h: dimensions of the image
-  // row_byte_width: the width in bytes of each row. This may be greater than
-  //   w * bytes_per_pixel if there is extra padding at the end of each row
-  //   (often, each row is padded to the next machine word).
-  // quality: an integer in the range 0-100, where 100 is the highest quality.
-  static bool Encode(const unsigned char* input, ColorFormat format,
-                     int w, int h, int row_byte_width,
-                     int quality, std::vector<unsigned char>* output);
-
   // Decodes the JPEG data contained in input of length input_size. The
   // decoded data will be placed in *output with the dimensions in *w and *h
   // on success (returns true). This data will be written in the'format'
@@ -76,4 +53,4 @@ class GFX_EXPORT JPEGCodec {
 
 }  // namespace gfx
 
-#endif  // UI_GFX_CODEC_JPEG_CODEC_H_
+#endif  // UI_GFX_CHROMEOS_CODEC_JPEG_CODEC_ROBUST_SLOW_H_