Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 75f1e5f5b39e2e0c22b655f5eb9c4a55cefb3288..b2bd0c67848b7ca87c7ebe78e06c373d7a4d48c8 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -21,6 +21,14 @@ |
# Whether we're building a ChromeOS build. |
'chromeos%': 0, |
+ # Whether the Views toolkit can use its Pure form when available |
+ # or if it must only use GTK (the default at the moment). |
+ # This is an intermediate step until all of Views is 'Pure', |
+ # at which point we plan to remove those switches. Until GTK is |
+ # completely gone the Pure form (when enabled) will coexist with |
+ # the remaining GTK code (which will diminish over time). |
oshima
2011/06/30 17:46:51
Can you incorporate something like below?
TOOLKIT
|
+ 'toolkit_uses_pure_views%': 0, |
+ |
# Disable touch support by default. |
'touchui%': 0, |
@@ -29,6 +37,7 @@ |
}, |
# Copy conditionally-set variables out one scope. |
'chromeos%': '<(chromeos)', |
+ 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', |
'touchui%': '<(touchui)', |
'views_compositor%': '<(views_compositor)', |
@@ -46,11 +55,18 @@ |
# Set default value of toolkit_views on for Windows, Chrome OS |
# and the touch UI. |
- ['OS=="win" or chromeos==1 or touchui==1', { |
+ ['OS=="win" or chromeos==1 or touchui==1 or toolkit_uses_pure_views==1', { |
'toolkit_views%': 1, |
}, { |
'toolkit_views%': 0, |
}], |
+ |
+ # Views are always Pure in Touch case |
+ ['touchui==1', { |
+ 'toolkit_uses_pure_views%': 1, |
+ }, { |
+ 'toolkit_uses_pure_views%': 0, |
+ }], |
], |
}, |
@@ -59,6 +75,7 @@ |
'touchui%': '<(touchui)', |
'host_arch%': '<(host_arch)', |
'toolkit_views%': '<(toolkit_views)', |
+ 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', |
'views_compositor%': '<(views_compositor)', |
# We used to provide a variable for changing how libraries were built. |
@@ -220,6 +237,7 @@ |
'host_arch%': '<(host_arch)', |
'library%': 'static_library', |
'toolkit_views%': '<(toolkit_views)', |
+ 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', |
'views_compositor%': '<(views_compositor)', |
'os_posix%': '<(os_posix)', |
'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', |
@@ -569,6 +587,9 @@ |
['toolkit_views==1', { |
'grit_defines': ['-D', 'toolkit_views'], |
}], |
+ ['toolkit_uses_pure_views==1', { |
+ 'grit_defines': ['-D', 'toolkit_uses_pure_views'], |
+ }], |
['touchui==1', { |
'grit_defines': ['-D', 'touchui'], |
}], |
@@ -662,6 +683,9 @@ |
['toolkit_views==1', { |
'defines': ['TOOLKIT_VIEWS=1'], |
}], |
+ ['toolkit_uses_pure_views==1', { |
+ 'defines': ['TOOLKIT_USES_PURE_VIEWS=1'], |
+ }], |
['views_compositor==1', { |
'defines': ['VIEWS_COMPOSITOR=1'], |
}], |