Add support for Radial Gradient Brush and Bitmap Brush to gfx::Canvas.

BUG=none
TEST=see unittest

Review URL: http://codereview.chromium.org/3058012

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

1 files changed, 48 insertions, 1 deletions

diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp
index e3eeb66..5947c4a 100644
--- a/gfx/gfx.gyp
+++ b/gfx/gfx.gyp
@@ -5,6 +5,9 @@
 {
   'variables': {
     'chromium_code': 1,
+    'grit_info_cmd': ['python', '../tools/grit/grit_info.py'],
+    'grit_cmd': ['python', '../tools/grit/grit.py'],    
+    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/gfx',
   },
   'targets': [
     {
@@ -13,6 +16,7 @@
       'msvs_guid': 'C8BD2821-EAE5-4AC6-A0E4-F82CAC2956CC',
       'dependencies': [
         'gfx',
+        'gfx_resources',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
@@ -27,6 +31,7 @@
         'run_all_unittests.cc',
         'skbitmap_operations_unittest.cc',
         'test_suite.h',
+        '<(SHARED_INTERMEDIATE_DIR)/gfx/gfx_resources.rc',
       ],
       'include_dirs': [
         '..',
@@ -155,7 +160,49 @@
           ],
         }],
       ],
-    },    
+    },
+    {
+      # theme_resources also generates a .cc file, so it can't use the rules above.
+      'target_name': 'gfx_resources',
+      'type': 'none',
+      'msvs_guid' : '5738AE53-E919-4987-A2EF-15FDBD8F90F6',
+      'actions': [
+        {
+          'action_name': 'gfx_resources',
+          'variables': {
+            'input_path': 'gfx_resources.grd',
+          },
+          'inputs': [
+            '<!@(<(grit_info_cmd) --inputs <(input_path))',
+          ],
+          'outputs': [
+            '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
+          ],
+          'action': [
+            '<@(grit_cmd)',
+            '-i', '<(input_path)', 'build',
+            '-o', '<(grit_out_dir)',
+          ],
+          'conditions': [
+            ['use_titlecase_in_grd_files==1', {
+              'action': ['-D', 'use_titlecase'],
+            }],
+          ],
+          'message': 'Generating resources from <(input_path)',
+        },
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(grit_out_dir)',
+        ],
+      },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
+    },
+    
   ],
 }