Revert 225857 "gfx: Create a separate gfx component out of ui."

> gfx: Create a separate gfx component out of ui.
> 
> BUG=103304
> R=ben@chromium.org
> 
> Review URL: https://codereview.chromium.org/25015003

TBR=sadrul@chromium.org

Review URL: https://codereview.chromium.org/25161002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225859 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 301 insertions, 2 deletions

diff --git a/ui/ui.gyp b/ui/ui.gyp
index ce767ac..3c5dbcb 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -28,10 +28,11 @@
         '../third_party/zlib/zlib.gyp:zlib',
         '../url/url.gyp:url_lib',
         'base/strings/ui_strings.gyp:ui_strings',
-        'gfx/gfx.gyp:gfx',
         'ui_resources',
       ],
       'defines': [
+        # TODO(sky): remove once gfx dependencies are corrected.
+        'GFX_IMPLEMENTATION',
         'UI_IMPLEMENTATION',
       ],
       # Export these dependencies since text_elider.h includes ICU headers.
@@ -39,7 +40,6 @@
         '../net/net.gyp:net',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        'gfx/gfx.gyp:gfx',
       ],
       'sources' : [
         'android/ui_jni_registrar.cc',
@@ -380,6 +380,240 @@
         'events/x/events_x_utils.h',
         'events/x/touch_factory_x11.cc',
         'events/x/touch_factory_x11.h',
+        'gfx/android/device_display_info.cc',
+        'gfx/android/device_display_info.h',
+        'gfx/android/java_bitmap.cc',
+        'gfx/android/java_bitmap.h',
+        'gfx/animation/animation.cc',
+        'gfx/animation/animation.h',
+        'gfx/animation/animation_container.cc',
+        'gfx/animation/animation_container.h',
+        'gfx/animation/animation_container_element.h',
+        'gfx/animation/animation_container_observer.h',
+        'gfx/animation/animation_delegate.h',
+        'gfx/animation/linear_animation.cc',
+        'gfx/animation/linear_animation.h',
+        'gfx/animation/multi_animation.cc',
+        'gfx/animation/multi_animation.h',
+        'gfx/animation/slide_animation.cc',
+        'gfx/animation/slide_animation.h',
+        'gfx/animation/throb_animation.cc',
+        'gfx/animation/throb_animation.h',
+        'gfx/animation/tween.cc',
+        'gfx/animation/tween.h',
+        'gfx/blit.cc',
+        'gfx/blit.h',
+        'gfx/box_f.cc',
+        'gfx/box_f.h',
+        'gfx/break_list.h',
+        'gfx/canvas.cc',
+        'gfx/canvas.h',
+        'gfx/canvas_android.cc',
+        'gfx/canvas_paint_gtk.cc',
+        'gfx/canvas_paint_gtk.h',
+        'gfx/canvas_paint_mac.h',
+        'gfx/canvas_paint_mac.mm',
+        'gfx/canvas_paint_win.cc',
+        'gfx/canvas_paint_win.h',
+        'gfx/canvas_skia.cc',
+        'gfx/canvas_skia_paint.h',
+        'gfx/codec/jpeg_codec.cc',
+        'gfx/codec/jpeg_codec.h',
+        'gfx/codec/png_codec.cc',
+        'gfx/codec/png_codec.h',
+        'gfx/color_analysis.cc',
+        'gfx/color_analysis.h',
+        'gfx/color_profile.cc',
+        'gfx/color_profile.h',
+        'gfx/color_profile_mac.cc',
+        'gfx/color_profile_win.cc',
+        'gfx/color_utils.cc',
+        'gfx/color_utils.h',
+        'gfx/display.cc',
+        'gfx/display.h',
+        'gfx/display_observer.cc',
+        'gfx/display_observer.h',
+        'gfx/favicon_size.cc',
+        'gfx/favicon_size.h',
+        'gfx/font.cc',
+        'gfx/font.h',
+        'gfx/font_fallback_win.cc',
+        'gfx/font_fallback_win.h',
+        'gfx/font_list.cc',
+        'gfx/font_list.h',
+        'gfx/font_render_params_android.cc',
+        'gfx/font_render_params_linux.cc',
+        'gfx/font_render_params_linux.h',
+        'gfx/font_smoothing_win.cc',
+        'gfx/font_smoothing_win.h',
+        'gfx/gfx_export.h',
+        'gfx/gfx_paths.cc',
+        'gfx/gfx_paths.h',
+        'gfx/gpu_memory_buffer.cc',
+        'gfx/gpu_memory_buffer.h',
+        'gfx/image/canvas_image_source.cc',
+        'gfx/image/canvas_image_source.h',
+        'gfx/image/image.cc',
+        'gfx/image/image.h',
+        'gfx/image/image_family.cc',
+        'gfx/image/image_family.h',
+        'gfx/image/image_ios.mm',
+        'gfx/image/image_mac.mm',
+        'gfx/image/image_png_rep.cc',
+        'gfx/image/image_png_rep.h',
+        'gfx/image/image_skia.cc',
+        'gfx/image/image_skia.h',
+        'gfx/image/image_skia_operations.cc',
+        'gfx/image/image_skia_operations.h',
+        'gfx/image/image_skia_rep.cc',
+        'gfx/image/image_skia_rep.h',
+        'gfx/image/image_skia_source.h',
+        'gfx/image/image_skia_util_ios.h',
+        'gfx/image/image_skia_util_ios.mm',
+        'gfx/image/image_skia_util_mac.h',
+        'gfx/image/image_skia_util_mac.mm',
+        'gfx/image/image_util.cc',
+        'gfx/image/image_util.h',
+        'gfx/image/image_util_ios.mm',
+        'gfx/insets.cc',
+        'gfx/insets.h',
+        'gfx/insets_base.h',
+        'gfx/insets_f.cc',
+        'gfx/insets_f.h',
+        'gfx/interpolated_transform.cc',
+        'gfx/interpolated_transform.h',
+        'gfx/mac/scoped_ns_disable_screen_updates.h',
+        'gfx/matrix3_f.cc',
+        'gfx/matrix3_f.h',
+        'gfx/native_widget_types.h',
+        'gfx/ozone/surface_factory_ozone.cc',
+        'gfx/ozone/surface_factory_ozone.h',
+        'gfx/pango_util.cc',
+        'gfx/pango_util.h',
+        'gfx/path.cc',
+        'gfx/path.h',
+        'gfx/path_aura.cc',
+        'gfx/path_gtk.cc',
+        'gfx/path_win.cc',
+        'gfx/path_win.h',
+        'gfx/path_x11.cc',
+        'gfx/path_x11.h',
+        'gfx/platform_font.h',
+        'gfx/platform_font_android.cc',
+        'gfx/platform_font_ios.h',
+        'gfx/platform_font_ios.mm',
+        'gfx/platform_font_mac.h',
+        'gfx/platform_font_mac.mm',
+        'gfx/platform_font_pango.cc',
+        'gfx/platform_font_pango.h',
+        'gfx/platform_font_win.cc',
+        'gfx/platform_font_win.h',
+        'gfx/point.cc',
+        'gfx/point.h',
+        'gfx/point3_f.cc',
+        'gfx/point3_f.h',
+        'gfx/point_base.h',
+        'gfx/point_conversions.cc',
+        'gfx/point_conversions.h',
+        'gfx/point_f.cc',
+        'gfx/point_f.h',
+        'gfx/quad_f.cc',
+        'gfx/quad_f.h',
+        'gfx/range/range.cc',
+        'gfx/range/range.h',
+        'gfx/range/range_mac.mm',
+        'gfx/range/range_win.cc',
+        'gfx/rect.cc',
+        'gfx/rect.h',
+        'gfx/rect_base.h',
+        'gfx/rect_base_impl.h',
+        'gfx/rect_conversions.cc',
+        'gfx/rect_conversions.h',
+        'gfx/rect_f.cc',
+        'gfx/rect_f.h',
+        'gfx/render_text.cc',
+        'gfx/render_text.h',
+        'gfx/render_text_linux.cc',
+        'gfx/render_text_linux.h',
+        'gfx/render_text_mac.cc',
+        'gfx/render_text_mac.h',
+        'gfx/render_text_win.cc',
+        'gfx/render_text_win.h',
+        'gfx/safe_integer_conversions.h',
+        'gfx/scoped_cg_context_save_gstate_mac.h',
+        'gfx/scoped_ns_graphics_context_save_gstate_mac.h',
+        'gfx/scoped_ns_graphics_context_save_gstate_mac.mm',
+        'gfx/scoped_ui_graphics_push_context_ios.h',
+        'gfx/scoped_ui_graphics_push_context_ios.mm',
+        'gfx/screen.cc',
+        'gfx/screen.h',
+        'gfx/screen_android.cc',
+        'gfx/screen_aura.cc',
+        'gfx/screen_gtk.cc',
+        'gfx/screen_ios.mm',
+        'gfx/screen_mac.mm',
+        'gfx/screen_win.cc',
+        'gfx/screen_win.h',
+        'gfx/scrollbar_size.cc',
+        'gfx/scrollbar_size.h',
+        'gfx/selection_model.cc',
+        'gfx/selection_model.h',
+        'gfx/sequential_id_generator.cc',
+        'gfx/sequential_id_generator.h',
+        'gfx/shadow_value.cc',
+        'gfx/shadow_value.h',
+        'gfx/size.cc',
+        'gfx/size.h',
+        'gfx/size_base.h',
+        'gfx/size_conversions.cc',
+        'gfx/size_conversions.h',
+        'gfx/size_f.cc',
+        'gfx/size_f.h',
+        'gfx/skbitmap_operations.cc',
+        'gfx/skbitmap_operations.h',
+        'gfx/skia_util.cc',
+        'gfx/skia_util.h',
+        'gfx/skia_utils_gtk.cc',
+        'gfx/skia_utils_gtk.h',
+        'gfx/switches.cc',
+        'gfx/switches.h',
+        'gfx/sys_color_change_listener.cc',
+        'gfx/sys_color_change_listener.h',
+        'gfx/text_constants.h',
+        'gfx/text_elider.cc',
+        'gfx/text_elider.h',
+        'gfx/text_utils.cc',
+        'gfx/text_utils.h',
+        'gfx/text_utils_android.cc',
+        'gfx/text_utils_ios.mm',
+        'gfx/text_utils_skia.cc',
+        'gfx/transform.cc',
+        'gfx/transform.h',
+        'gfx/transform_util.cc',
+        'gfx/transform_util.h',
+        'gfx/utf16_indexing.cc',
+        'gfx/utf16_indexing.h',
+        'gfx/vector2d.cc',
+        'gfx/vector2d.h',
+        'gfx/vector2d_conversions.cc',
+        'gfx/vector2d_conversions.h',
+        'gfx/vector2d_f.cc',
+        'gfx/vector2d_f.h',
+        'gfx/vector3d_f.cc',
+        'gfx/vector3d_f.h',
+        'gfx/win/dpi.cc',
+        'gfx/win/dpi.h',
+        'gfx/win/hwnd_util.cc',
+        'gfx/win/hwnd_util.h',
+        'gfx/win/scoped_set_map_mode.h',
+        'gfx/win/singleton_hwnd.cc',
+        'gfx/win/singleton_hwnd.h',
+        'gfx/win/window_impl.cc',
+        'gfx/win/window_impl.h',
+        'gfx/x/x11_atom_cache.cc',
+        'gfx/x/x11_atom_cache.h',
+        'gfx/x/x11_types.cc',
+        'gfx/x/x11_types.h',
         'webui/jstemplate_builder.cc',
         'webui/jstemplate_builder.h',
         'webui/web_ui_util.cc',
@@ -397,12 +631,19 @@
           'includes': [
             'base/ime/ime.gypi',
           ],
+          'dependencies': [
+            '<(libjpeg_gyp_path):libjpeg',
+          ],
         }, {  # OS=="ios"
           # iOS only uses a subset of UI.
           'sources/': [
             ['exclude', '\\.(cc|mm)$'],
             ['include', '_ios\\.(cc|mm)$'],
             ['include', '(^|/)ios/'],
+            ['include', '^gfx/'],
+            ['include', '^gfx/animation/'],
+            ['exclude', '^gfx/codec/jpeg_codec\\.cc$'],
+            ['include', '^gfx/range/'],
             ['include', '^base/l10n/'],
             ['include', '^base/layout'],
             ['include', '^base/resource/'],
@@ -414,8 +655,23 @@
             ],
           },
         }],
+        # TODO(asvitkine): Switch all platforms to use canvas_skia.cc.
+        #                  http://crbug.com/105550
+        ['use_canvas_skia==1', {
+          'sources!': [
+            'gfx/canvas_android.cc',
+          ],
+        }, {  # use_canvas_skia!=1
+          'sources!': [
+            'gfx/canvas_skia.cc',
+          ],
+        }],
         ['use_aura==1', {
           'sources/': [
+            ['exclude', 'gfx/gtk_'],
+            ['exclude', 'gfx/gtk_util.cc'],
+            ['exclude', 'gfx/gtk_util.h'],
+            ['exclude', 'gfx/screen_gtk.cc'],
             ['exclude', 'base/work_area_watcher_observer.h'],
             ['exclude', 'base/x/active_window_watcher_x.cc'],
             ['exclude', 'base/x/active_window_watcher_x.h'],
@@ -441,6 +697,12 @@
             'base/x/selection_utils.h',
           ]
         }],
+        ['use_pango==0', {
+          'sources/': [
+            ['exclude', '^gfx/pango_util\\.'],
+            ['exclude', '^gfx/platform_font_pango\\.'],
+          ],
+        }],
         ['use_aura==0 or OS!="linux"', {
           'sources!': [
             'base/resource/resource_bundle_auralinux.cc',
@@ -486,6 +748,24 @@
             }],
           ],
         }],
+        ['toolkit_uses_gtk == 1', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+          'sources': [
+            'gfx/gtk_native_view_id_manager.cc',
+            'gfx/gtk_native_view_id_manager.h',
+            'gfx/gtk_preserve_window.cc',
+            'gfx/gtk_preserve_window.h',
+            'gfx/gdk_compat.h',
+            'gfx/gtk_compat.h',
+            'gfx/gtk_util.cc',
+            'gfx/gtk_util.h',
+            'gfx/image/cairo_cached_surface.cc',
+            'gfx/image/cairo_cached_surface.h',
+            'gfx/scoped_gobject.h',
+          ],
+        }],
         ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
           'sources!': [
             'base/clipboard/clipboard_aurax11.cc',
@@ -501,6 +781,12 @@
           ],
         }],
         ['OS=="win"', {
+          'sources': [
+            'gfx/gdi_util.cc',
+            'gfx/gdi_util.h',
+            'gfx/icon_util.cc',
+            'gfx/icon_util.h',
+          ],
           'sources!': [
             'base/touch/touch_device.cc',
           ],
@@ -634,6 +920,10 @@
             'base/touch/touch_device.cc',
             'base/touch/touch_editing_controller.cc',
             'base/ui_base_types.cc',
+            'gfx/animation/throb_animation.cc',
+            'gfx/display_observer.cc',
+            'gfx/path.cc',
+            'gfx/selection_model.cc',
           ],
           'dependencies': [
             'ui_jni_headers',
@@ -652,6 +942,13 @@
             'ui_java',
           ],
         }],
+        ['OS=="android" or OS=="ios"', {
+          'sources!': [
+            'gfx/render_text.cc',
+            'gfx/render_text.h',
+            'gfx/text_utils_skia.cc',
+          ],
+        }],
         ['OS=="linux"', {
           'libraries': [
             '-ldl',
@@ -700,6 +997,8 @@
            },
            'sources': [
              'android/java/src/org/chromium/ui/Clipboard.java',
+             'android/java/src/org/chromium/ui/gfx/BitmapHelper.java',
+             'android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java',
              'android/java/src/org/chromium/ui/LocalizationUtils.java',
              'android/java/src/org/chromium/ui/SelectFileDialog.java',
              'android/java/src/org/chromium/ui/ViewAndroid.java',