From 5b793d9598583df434e42c5db97c668c28f741cd Mon Sep 17 00:00:00 2001 From: "caryclark@chromium.org" Date: Tue, 21 Jun 2011 19:20:22 +0000 Subject: [PATCH] Add Skia on Chrome for Mac gyp rules In addition to these rules, to build the USE_SKIA_ON_MAC_CHROME variation, define: gyp_defines='use_skia=1' As is, this does not change any existing platform, and has no new tests. BUG=79463 TEST=none Review URL: http://codereview.chromium.org/7219009 git-svn-id: http://src.chromium.org/svn/trunk/src/build@89877 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- common.gypi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/common.gypi b/common.gypi index f6daab8a0..006548370 100644 --- a/common.gypi +++ b/common.gypi @@ -146,6 +146,13 @@ 'clang_use_chrome_plugins%': 0, 'conditions': [ + # Use Skia as WebKit renderer on Mac + ['OS=="mac"', { + 'use_skia%': 0, + }, { + 'use_skia%': 1, + }], + # A flag for POSIX platforms ['OS=="win"', { 'os_posix%': 0, @@ -220,6 +227,7 @@ 'views_compositor%': '<(views_compositor)', 'os_posix%': '<(os_posix)', 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', + 'use_skia%': '<(use_skia)', 'use_x11%': '<(use_x11)', 'use_gnome_keyring%': '<(use_gnome_keyring)', 'linux_fpic%': '<(linux_fpic)', @@ -731,6 +739,11 @@ 'ENABLE_EGLIMAGE=1', ], }], + ['use_skia==1', { + 'defines': [ + 'USE_SKIA=1', + ], + }], ['coverage!=0', { 'conditions': [ ['OS=="mac"', {