Switch ChromeOS Chromium login to use IJG libjpeg

ui/gfx/codec/jpeg_codec.cc

 // Copyright (c) 2011 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.
 
 #include "ui/gfx/codec/jpeg_codec.h"
 
 #include <setjmp.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 
 extern "C" {
 #if defined(USE_SYSTEM_LIBJPEG)
 #include <jpeglib.h>
-#elif defined(USE_LIBJPEG_TURBO)
+#elif defined(USE_LIBJPEG_TURBO) && !defined(OS_CHROMEOS)

[sky, 2014/09/18 22:19:37]

Why is SE_LIBJPEG_TURBO set for chromeos if we're not using it?

[Ed Baker, 2014/09/18 23:07:35]

Chrome OS uses both IJG libjpeg and libjpeg_turbo. The robust decodes go through
IJG libjpeg. All other decodes (blink) are handled by libjpeg_turbo.

 #include "third_party/libjpeg_turbo/jpeglib.h"
 #else
 #include "third_party/libjpeg/jpeglib.h"
 #endif
 }
 
 namespace gfx {
 
 // Encoder/decoder shared stuff ------------------------------------------------
 
@@ skipping 11 matching lines @@
   // Return control to the setjmp point.
   longjmp(err->setjmp_buffer, false);
 }
 
 }  // namespace
 
 // This method helps identify at run time which library chromium is using.
 JPEGCodec::LibraryVariant JPEGCodec::JpegLibraryVariant() {
 #if defined(USE_SYSTEM_LIBJPEG)
   return SYSTEM_LIBJPEG;
-#elif defined(USE_LIBJPEG_TURBO)
+#elif defined(USE_LIBJPEG_TURBO) && !defined(OS_CHROMEOS)
   return LIBJPEG_TURBO;
 #else
   return IJG_LIBJPEG;
 #endif
 }
 
 // Encoder ---------------------------------------------------------------------
 //
 // This code is based on nsJPEGEncoder from Mozilla.
 // Copyright 2005 Google Inc. (Brett Wilson, contributor)
@@ skipping 553 matching lines @@
   int data_length = w * h * 4;
 
   SkBitmap* bitmap = new SkBitmap();
   bitmap->allocN32Pixels(w, h);
   memcpy(bitmap->getAddr32(0, 0), &data_vector[0], data_length);
 
   return bitmap;
 }
 
 }  // namespace gfx