gfx: Create a separate gfx component out of ui.

Landed previously in r225857, which was reverted in r225859 because it broke android tests.

BUG=103304
R=ben@chromium.org

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

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

android_webview/native/webview_native.gyp

@@ -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',

ash/ash.gyp

@@ -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',
@@ -668,6 +669,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',
@@ -853,6 +855,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',

cc/cc.gyp

@@ -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': [

cc/cc_tests.gyp

@@ -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': [
@@ -314,7 +315,7 @@
       ],
       'dependencies': [
         '../skia/skia.gyp:skia',
-        '../ui/ui.gyp:ui',  # for png_codec
+        '../ui/gfx/gfx.gyp:gfx',
       ],
     },
   ],

chrome/chrome.gyp

@@ -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': [

chrome/chrome_browser.gypi

@@ -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',

chrome/chrome_browser_extensions.gypi

@@ -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',

chrome/chrome_browser_ui.gypi

@@ -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',

chrome/chrome_browser_ui_views.gyp

@@ -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',
       ],

chrome/chrome_tests.gypi

@@ -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',
       ],
@@ -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': [
@@ -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': [
@@ -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': [

chrome/test/base/chrome_test_suite.cc

@@ -36,6 +36,7 @@
 #include "chrome/browser/android/chrome_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 #include "ui/android/ui_jni_registrar.h"
+#include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #endif
 
@@ -149,6 +150,7 @@ void ChromeTestSuite::Initialize() {
 
 #if defined(OS_ANDROID)
   // Register JNI bindings for android.
+  gfx::android::RegisterJni(base::android::AttachCurrentThread());
   net::android::RegisterJni(base::android::AttachCurrentThread());
   ui::android::RegisterJni(base::android::AttachCurrentThread());
   ui::gl::android::RegisterJni(base::android::AttachCurrentThread());

components/autofill.gypi

@@ -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',
           ],
@@ -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',
@@ -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',

components/json_schema.gypi

@@ -9,6 +9,7 @@
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
+        '../ui/gfx/gfx.gyp:gfx',
         '../ui/ui.gyp:ui',
       ],
       'include_dirs': [

components/user_prefs.gypi

@@ -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': [

components/web_contents_delegate_android.gypi

@@ -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',

content/app/android/library_loader_hooks.cc

@@ -27,6 +27,7 @@
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 #include "ui/android/ui_jni_registrar.h"
+#include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
 
@@ -73,6 +74,9 @@ static jint LibraryLoaded(JNIEnv* env, jclass clazz,
   if (!base::android::RegisterJni(env))
     return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 
+  if (!gfx::android::RegisterJni(env))
+    return RESULT_CODE_FAILED_TO_REGISTER_JNI;
+
   if (!net::android::RegisterJni(env))
     return RESULT_CODE_FAILED_TO_REGISTER_JNI;
 

content/content_app.gypi

@@ -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': [

content/content_browser.gypi

@@ -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',

content/content_child.gypi

@@ -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',
   ],

content/content_common.gypi

@@ -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',

content/content_ppapi_plugin.gypi

@@ -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': [

content/content_shell.gypi

@@ -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',

content/content_tests.gypi

@@ -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',
@@ -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',
       ],
@@ -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',
@@ -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.
@@ -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.
@@ -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': [
@@ -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': [

content/public/test/content_test_suite_base.cc

@@ -29,6 +29,7 @@
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
 #include "ui/android/ui_jni_registrar.h"
+#include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
 #endif
@@ -63,6 +64,7 @@ void ContentTestSuiteBase::Initialize() {
   JNIEnv* env = base::android::AttachCurrentThread();
   content::android::RegisterCommonJni(env);
   content::android::RegisterBrowserJni(env);
+  gfx::android::RegisterJni(env);
   media::RegisterJni(env);
   net::android::RegisterJni(env);
   ui::android::RegisterJni(env);

device/bluetooth/bluetooth.gyp

@@ -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',
       ],

gpu/command_buffer_service.gypi

@@ -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',

gpu/gles2_conform_support/gles2_conform_support.gyp

@@ -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',
       ],

gpu/gpu.gyp

@@ -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',
       ],
@@ -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',
@@ -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',