Revert of Move ui/gfx/codec/ into its own component.

ui/gfx/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
@@ skipping 32 matching lines @@
 
 component("gfx") {
   sources = [
     "android/gfx_jni_registrar.cc",
     "android/gfx_jni_registrar.h",
     "android/java_bitmap.cc",
     "android/java_bitmap.h",
     "android/view_configuration.cc",
     "android/view_configuration.h",
     "break_list.h",
+    "codec/jpeg_codec.cc",
+    "codec/jpeg_codec.h",
+    "codec/png_codec.cc",
+    "codec/png_codec.h",
+    "codec/skia_image_encoder_adapter.cc",
+    "codec/skia_image_encoder_adapter.h",
     "color_analysis.cc",
     "color_analysis.h",
     "color_palette.h",
     "color_space.cc",
     "color_space_win.cc",
     "color_space_win.h",
     "color_transform.cc",
     "color_transform.h",
     "color_utils.cc",
     "color_utils.h",
@@ skipping 179 matching lines @@
   public_deps = [
     ":color_space",
     ":geometry_skia",
     ":memory_buffer_sources",
     ":native_widget_types",
     ":selection_bound_sources",
     "//base",
     "//skia",
     "//third_party/icu",
     "//ui/gfx/animation",
-    "//ui/gfx/codec",
     "//ui/gfx/geometry",
     "//ui/gfx/range",
   ]
   deps = [
     ":gfx_export",
     "//base",
     "//base:base_static",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//skia",
+    "//third_party/libpng",
     "//third_party/qcms",
     "//third_party/zlib",
   ]
 
   # Text rendering conditions (complicated so separated out).
   if (use_aura || is_mac) {
     # Mac doesn't use RenderTextHarfBuzz by default yet.
     sources += [
       "harfbuzz_font_skia.cc",
       "harfbuzz_font_skia.h",
@@ skipping 19 matching lines @@
       "platform_font_android.cc",
       "text_utils_android.cc",
     ]
     set_sources_assignment_filter([])
     sources += [ "platform_font_linux.cc" ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
   # iOS.
   if (is_ios) {
+    sources -= [
+      "codec/jpeg_codec.cc",
+      "codec/jpeg_codec.h",
+    ]
     set_sources_assignment_filter([])
     sources += [ "scoped_cg_context_save_gstate_mac.h" ]
     set_sources_assignment_filter(sources_assignment_filter)
   } else {
     deps += [
       "//cc/paint",
+      "//third_party:jpeg",
       "//third_party/harfbuzz-ng",
     ]
   }
 
   # Android.
   if (is_android) {
     if (use_aura) {
       sources -= [ "canvas_notimplemented.cc" ]
       sources += [ "font_fallback_android.cc" ]
     } else {
@@ skipping 22 matching lines @@
   if (use_aura || (!is_ios && !is_android)) {
     sources += [
       "paint_vector_icon.cc",
       "paint_vector_icon.h",
       "vector_icon_types.h",
     ]
   }
 
   # Windows.
   if (is_win) {
+    cflags = [ "/wd4324" ]  # Structure was padded due to __declspec(align()), which is
+                            # uninteresting.
+
     libs = [
       "setupapi.lib",
       "dwrite.lib",
     ]
   } else {
     sources -= [
       "gdi_util.cc",
       "gdi_util.h",
       "icon_util.cc",
       "icon_util.h",
       "sys_color_change_listener.cc",
       "sys_color_change_listener.h",
     ]
   }
 
   # Linux.
   if (is_linux) {
     deps += [ "//build/linux:fontconfig" ]
   }
 
+  # Chrome OS
+  if (is_chromeos) {
+    # Robust JPEG decoding for the login screen.
+    sources += [
+      "chromeos/codec/jpeg_codec_robust_slow.cc",
+      "chromeos/codec/jpeg_codec_robust_slow.h",
+    ]
+    deps += [ "//third_party/libjpeg" ]
+  }
+
   if (is_mac) {
     libs = [
       "AppKit.framework",
       "CoreFoundation.framework",
       "CoreGraphics.framework",
       "CoreText.framework",
       "IOSurface.framework",
     ]
   }
 
@@ skipping 307 matching lines @@
 
   if (is_android) {
     deps += [ "//ui/android:ui_java" ]
   }
 
   if (!use_aura && !is_ios) {
     sources -= [ "nine_image_painter_unittest.cc" ]
   }
 
   if (is_chromeos) {
-    sources += [ "codec/chromeos/jpeg_codec_robust_slow_unittest.cc" ]
+    sources += [ "chromeos/codec/jpeg_codec_robust_slow_unittest.cc" ]
   }
 
   if (is_win) {
     sources += [
       "font_fallback_win_unittest.cc",
       "icon_util_unittest.cc",
       "icon_util_unittests.rc",
       "path_win_unittest.cc",
       "platform_font_win_unittest.cc",
       "win/text_analysis_source_unittest.cc",
@@ skipping 37 matching lines @@
 
 fuzzer_test("color_transform_fuzztest") {
   sources = [
     "color_transform_fuzzer.cc",
   ]
   deps = [
     ":gfx",
   ]
   libfuzzer_options = [ "max_len=1024" ]
 }