Skip to content

Commit

Permalink
gfx: Create a separate gfx component out of ui.
Browse files Browse the repository at this point in the history
BUG=103304
R=ben@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225857 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
sadrul@chromium.org committed Sep 28, 2013
1 parent 55bbd5c commit 8906372
Show file tree
Hide file tree
Showing 59 changed files with 532 additions and 317 deletions.
1 change: 1 addition & 0 deletions android_webview/native/webview_native.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
'../../cc/cc.gyp:cc',
'../../net/net.gyp:net',
'../../skia/skia.gyp:skia',
'../../ui/gfx/gfx.gyp:gfx',
'../../ui/ui.gyp:ui',
'../../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
'../../webkit/common/webkit_common.gyp:webkit_common',
Expand Down
3 changes: 3 additions & 0 deletions ash/ash.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
'../ui/aura/aura.gyp:aura',
'../ui/base/strings/ui_strings.gyp:ui_strings',
'../ui/compositor/compositor.gyp:compositor',
'../ui/gfx/gfx.gyp:gfx',
'../ui/keyboard/keyboard.gyp:keyboard',
'../ui/message_center/message_center.gyp:message_center',
'../ui/oak/oak.gyp:oak',
Expand Down Expand Up @@ -665,6 +666,7 @@
'../ui/aura/aura.gyp:aura',
'../ui/aura/aura.gyp:aura_test_support',
'../ui/compositor/compositor.gyp:compositor',
'../ui/gfx/gfx.gyp:gfx',
'../ui/keyboard/keyboard.gyp:keyboard',
'../ui/message_center/message_center.gyp:message_center',
'../ui/message_center/message_center.gyp:message_center_test_support',
Expand Down Expand Up @@ -850,6 +852,7 @@
'../ui/app_list/app_list.gyp:app_list',
'../ui/aura/aura.gyp:aura',
'../ui/compositor/compositor.gyp:compositor',
'../ui/gfx/gfx.gyp:gfx',
'../ui/keyboard/keyboard.gyp:keyboard',
'../ui/message_center/message_center.gyp:message_center',
'../ui/ui.gyp:ui',
Expand Down
1 change: 1 addition & 0 deletions cc/cc.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
'<(DEPTH)/ui/gl/gl.gyp:gl',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/ui.gyp:ui',
],
'defines': [
Expand Down
3 changes: 2 additions & 1 deletion cc/cc_tests.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@
'../third_party/WebKit/public/blink.gyp:blink_minimal',
'../third_party/mesa/mesa.gyp:osmesa',
'../ui/gl/gl.gyp:gl',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'sources': [
Expand All @@ -314,7 +315,7 @@
],
'dependencies': [
'../skia/skia.gyp:skia',
'../ui/ui.gyp:ui', # for png_codec
'../ui/gfx/gfx.gyp:gfx',
],
},
],
Expand Down
1 change: 1 addition & 0 deletions chrome/chrome.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,7 @@
'dependencies': [
'chrome_resources.gyp:chrome_strings',
'../base/base.gyp:base',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'include_dirs': [
Expand Down
1 change: 1 addition & 0 deletions chrome/chrome_browser.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
'../third_party/zlib/zlib.gyp:minizip',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/base/strings/ui_strings.gyp:ui_strings',
'../ui/gfx/gfx.gyp:gfx',
'../ui/message_center/message_center.gyp:message_center',
'../ui/ui.gyp:shell_dialogs',
'../ui/ui.gyp:ui',
Expand Down
1 change: 1 addition & 0 deletions chrome/chrome_browser_extensions.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
'../third_party/re2/re2.gyp:re2',
'../third_party/webrtc/modules/modules.gyp:desktop_capture',
'../ui/base/strings/ui_strings.gyp:ui_strings',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',
'../url/url.gyp:url_lib',
Expand Down
1 change: 1 addition & 0 deletions chrome/chrome_browser_ui.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/base/strings/ui_strings.gyp:ui_strings',
'../ui/gfx/gfx.gyp:gfx',
'../ui/message_center/message_center.gyp:message_center',
'../ui/native_theme/native_theme.gyp:native_theme',
'../ui/snapshot/snapshot.gyp:snapshot',
Expand Down
1 change: 1 addition & 0 deletions chrome/chrome_browser_ui_views.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
'dependencies': [
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
],
Expand Down
4 changes: 4 additions & 0 deletions chrome/chrome_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,7 @@
'../net/net.gyp:net',
'../third_party/zlib/zlib.gyp:minizip',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
],
Expand Down Expand Up @@ -675,6 +676,7 @@
'../crypto/crypto.gyp:crypto',
'../net/net.gyp:http_server',
'../net/net.gyp:net',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'include_dirs': [
Expand Down Expand Up @@ -775,6 +777,7 @@
'../net/net.gyp:http_server',
'../net/net.gyp:net',
'../testing/gtest.gyp:gtest',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'include_dirs': [
Expand All @@ -797,6 +800,7 @@
'../net/net.gyp:http_server',
'../net/net.gyp:net',
'../testing/gtest.gyp:gtest',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'include_dirs': [
Expand Down
3 changes: 3 additions & 0 deletions components/autofill.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
'../content/content.gyp:content_common',
'../ipc/ipc.gyp:ipc',
'../third_party/WebKit/public/blink.gyp:blink_minimal',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
],
Expand Down Expand Up @@ -110,6 +111,7 @@
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
'../webkit/webkit_resources.gyp:webkit_resources',
Expand Down Expand Up @@ -297,6 +299,7 @@
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
'../webkit/webkit_resources.gyp:webkit_resources',
Expand Down
1 change: 1 addition & 0 deletions components/json_schema.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'include_dirs': [
Expand Down
1 change: 1 addition & 0 deletions components/user_prefs.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
'../base/base.gyp:base_prefs',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../content/content.gyp:content_browser',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'include_dirs': [
Expand Down
1 change: 1 addition & 0 deletions components/web_contents_delegate_android.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
'../content/content.gyp:content_common',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../webkit/glue/webkit_glue.gyp:glue',
'web_contents_delegate_android_jni_headers',
Expand Down
1 change: 1 addition & 0 deletions content/content_app.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../crypto/crypto.gyp:crypto',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'sources': [
Expand Down
1 change: 1 addition & 0 deletions content/content_browser.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
'../third_party/re2/re2.gyp:re2',
'../third_party/zlib/google/zip.gyp:zip',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/gfx/gfx.gyp:gfx',
'../ui/snapshot/snapshot.gyp:snapshot',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',
Expand Down
1 change: 1 addition & 0 deletions content/content_child.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
'../base/base.gyp:base',
'../components/tracing.gyp:tracing',
'../skia/skia.gyp:skia',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
],
Expand Down
1 change: 1 addition & 0 deletions content/content_common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icuuc',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:shell_dialogs',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
Expand Down
1 change: 1 addition & 0 deletions content/content_ppapi_plugin.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
'dependencies': [
'../base/base.gyp:base',
'../ppapi/ppapi_internal.gyp:ppapi_ipc',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'sources': [
Expand Down
1 change: 1 addition & 0 deletions content/content_shell.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
'../net/net.gyp:net_resources',
'../skia/skia.gyp:skia',
'../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gl/gl.gyp:gl',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
Expand Down
11 changes: 9 additions & 2 deletions content/content_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:keycode_converter',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',
Expand Down Expand Up @@ -308,6 +309,7 @@
'../sql/sql.gyp:test_support_sql',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
],
Expand Down Expand Up @@ -831,6 +833,7 @@
'../testing/gtest.gyp:gtest',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../third_party/mesa/mesa.gyp:osmesa',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gl/gl.gyp:gl',
'../ui/snapshot/snapshot.gyp:snapshot',
'../ui/ui.gyp:shell_dialogs',
Expand Down Expand Up @@ -1064,8 +1067,9 @@
'../base/base.gyp:test_support_base',
'../gpu/gpu.gyp:command_buffer_common',
'../testing/gtest.gyp:gtest',
'../ui/ui.gyp:ui',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gl/gl.gyp:gl',
'../ui/ui.gyp:ui',
'../third_party/WebKit/public/blink.gyp:blink',
# The following two dependencies provide the missing
# symbol HeapProfilerStart in Linux component builds.
Expand Down Expand Up @@ -1096,8 +1100,9 @@
'test_support_content',
'../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
'../ui/ui.gyp:ui',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gl/gl.gyp:gl',
'../ui/ui.gyp:ui',
'../third_party/WebKit/public/blink.gyp:blink',
# The following two dependencies provide the missing
# symbol HeapProfilerStart in Linux component builds.
Expand Down Expand Up @@ -1138,6 +1143,7 @@
'../testing/gtest.gyp:gtest',
'../media/media.gyp:media',
'../ui/gl/gl.gyp:gl',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'include_dirs': [
Expand Down Expand Up @@ -1203,6 +1209,7 @@
'../testing/gtest.gyp:gtest',
'../media/media.gyp:media',
'../ui/gl/gl.gyp:gl',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'sources': [
Expand Down
1 change: 1 addition & 0 deletions device/bluetooth/bluetooth.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../../net/net.gyp:net',
'../../third_party/libxml/libxml.gyp:libxml',
'../../ui/gfx/gfx.gyp:gfx',
'../../ui/ui.gyp:ui',
'bluetooth_strings.gyp:device_bluetooth_strings',
],
Expand Down
1 change: 1 addition & 0 deletions gpu/command_buffer_service.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../crypto/crypto.gyp:crypto',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gl/gl.gyp:gl',
'../ui/ui.gyp:ui',
'../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
Expand Down
1 change: 1 addition & 0 deletions gpu/gles2_conform_support/gles2_conform_support.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
'../../gpu/gpu.gyp:gles2_implementation_client_side_arrays_no_check',
'../../gpu/gpu.gyp:command_buffer_service',
'../../third_party/khronos/khronos.gyp:khronos_headers',
'../../ui/gfx/gfx.gyp:gfx',
'../../ui/gl/gl.gyp:gl',
'../../ui/ui.gyp:ui',
],
Expand Down
6 changes: 3 additions & 3 deletions gpu/gpu.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../third_party/khronos/khronos.gyp:khronos_headers',
'../ui/gl/gl.gyp:gl',
'../ui/ui.gyp:ui',
'../ui/gfx/gfx.gyp:gfx',
'command_buffer/command_buffer.gyp:gles2_utils',
'gles2_cmd_helper',
],
Expand Down Expand Up @@ -127,7 +127,7 @@
'../testing/gtest.gyp:gtest',
'../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
'../ui/gl/gl.gyp:gl',
'../ui/ui.gyp:ui',
'../ui/gfx/gfx.gyp:gfx',
'command_buffer/command_buffer.gyp:gles2_utils',
'command_buffer_client',
'command_buffer_common',
Expand Down Expand Up @@ -253,7 +253,7 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
'../ui/ui.gyp:ui',
'../ui/gfx/gfx.gyp:gfx',
'command_buffer/command_buffer.gyp:gles2_utils',
'command_buffer_client',
'command_buffer_common',
Expand Down
3 changes: 3 additions & 0 deletions media/media.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
'../gpu/gpu.gyp:command_buffer_common',
'../skia/skia.gyp:skia',
'../third_party/opus/opus.gyp:opus',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
'shared_memory_support',
Expand Down Expand Up @@ -858,6 +859,7 @@
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'sources': [
Expand Down Expand Up @@ -1325,6 +1327,7 @@
'media',
'../base/base.gyp:base',
'../ui/gl/gl.gyp:gl',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'link_settings': {
Expand Down
2 changes: 2 additions & 0 deletions printing/printing.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../url/url.gyp:url_lib',
],
Expand Down Expand Up @@ -244,6 +245,7 @@
'../testing/gtest.gyp:gtest',
'../base/base.gyp:run_all_unittests',
'../base/base.gyp:test_support_base',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
],
'sources': [
Expand Down
2 changes: 2 additions & 0 deletions remoting/remoting.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -2433,6 +2433,7 @@
'dependencies': [
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
Expand Down Expand Up @@ -2736,6 +2737,7 @@
'../ppapi/ppapi.gyp:ppapi_cpp',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../ui/gfx/gfx.gyp:gfx',
'../ui/ui.gyp:ui',
'remoting_base',
'remoting_breakpad',
Expand Down
Loading

0 comments on commit 8906372

Please sign in to comment.