Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3459)

Unified Diff: build/common.gypi

Issue 7219009: Add Skia on Chrome for Mac gyp rules (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | printing/printing.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 89827)
+++ build/common.gypi (working copy)
@@ -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"', {
« no previous file with comments | « no previous file | printing/printing.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698