Introducing TOOLKIT_USES_PURE_VIEWS

build/common.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
   'variables': {
     # Putting a variables dict inside another variables dict looks kind of
     # weird.  This is done so that 'host_arch', 'chromeos', etc are defined as
     # variables within the outer variables dict here.  This is necessary
     # to get these variables defined for the conditions within this variables
     # dict that operate on these variables (e.g., for setting 'toolkit_views',
     # we need to have 'chromeos' already set).
     'variables': {
       'variables': {
         'variables': {
           # Whether we're building a ChromeOS build.
           'chromeos%': 0,
 
+          # Whether the Views toolkit is Pure or GTK

[oshima, 2011/06/30 00:06:32]

Please add comment that this is an intermediate solution and will be removed
once migration is completed.

[Emmanuel Saint-loubert-Bié, 2011/06/30 00:23:29]

Done.

+          'toolkit_pure_views%': 0,

[oshima, 2011/06/30 00:06:32]

toolkit_uses_pure_views would be better.

[Emmanuel Saint-loubert-Bié, 2011/06/30 00:23:29]

Done.

+
           # Disable touch support by default.
           'touchui%': 0,
 
           # Whether the compositor is enabled on views.
           'views_compositor%': 0,
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
+        'toolkit_pure_views%': '<(toolkit_pure_views)',
         'touchui%': '<(touchui)',
         'views_compositor%': '<(views_compositor)',
 
         # Compute the architecture that we're building on.
         'conditions': [
           [ 'OS=="win" or OS=="mac"', {
             'host_arch%': 'ia32',
           }, {
             # This handles the Unix platforms for which there is some support.
             # Anything else gets passed through, which probably won't work very
             # well; such hosts should pass an explicit target_arch to gyp.
             'host_arch%':
               '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
           }],
 
           # Set default value of toolkit_views on for Windows, Chrome OS
-          # and the touch UI.
-          ['OS=="win" or chromeos==1 or touchui==1', {
+          # and the touch UI. Also toolkit_pure_views implies toolkit_views.
+          ['OS=="win" or chromeos==1 or touchui==1 or toolkit_pure_views==1', {
             'toolkit_views%': 1,
           }, {
             'toolkit_views%': 0,
           }],
+          
+          # Views are always Pure in Touch case
+          ['touchui==1', {
+            'toolkit_pure_views%': 1,
+          }, {
+            'toolkit_pure_views%': 0,
+          }],
         ],
       },
 
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
       'touchui%': '<(touchui)',
       'host_arch%': '<(host_arch)',
       'toolkit_views%': '<(toolkit_views)',
+      'toolkit_pure_views%': '<(toolkit_pure_views)',
       'views_compositor%': '<(views_compositor)',
 
       # We used to provide a variable for changing how libraries were built.
       # This variable remains until we can clean up all the users.
       # This needs to be one nested variables dict in so that dependent
       # gyp files can make use of it in their outer variables.  (Yikes!)
       # http://code.google.com/p/chromium/issues/detail?id=83308
       'library%': 'static_library',
 
       # Override branding to select the desired branding flavor.
@@ skipping 141 matching lines @@
       ],
     },
 
     # Copy conditionally-set variables out one scope.
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
     'target_arch%': '<(target_arch)',
     'host_arch%': '<(host_arch)',
     'library%': 'static_library',
     'toolkit_views%': '<(toolkit_views)',
+    'toolkit_pure_views%': '<(toolkit_pure_views)',
     '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)',
     'enable_flapper_hacks%': '<(enable_flapper_hacks)',
     'chromeos%': '<(chromeos)',
     'touchui%': '<(touchui)',
@@ skipping 329 matching lines @@
       }, {
         'grit_defines': ['-D', '_chromium',
                          '-E', 'CHROMIUM_BUILD=chromium'],
       }],
       ['chromeos==1', {
         'grit_defines': ['-D', 'chromeos'],
       }],
       ['toolkit_views==1', {
         'grit_defines': ['-D', 'toolkit_views'],
       }],
+      ['toolkit_pure_views==1', {
+        'grit_defines': ['-D', 'toolkit_pure_views'],
+      }],
       ['touchui==1', {
         'grit_defines': ['-D', 'touchui'],
       }],
       ['file_manager_extension==1', {
         'grit_defines': ['-D', 'file_manager_extension'],
       }],
       ['remoting==1', {
         'grit_defines': ['-D', 'remoting'],
       }],
       ['use_titlecase_in_grd_files==1', {
@@ skipping 73 matching lines @@
     },
     'conditions': [
       ['branding=="Chrome"', {
         'defines': ['GOOGLE_CHROME_BUILD'],
       }, {  # else: branding!="Chrome"
         'defines': ['CHROMIUM_BUILD'],
       }],
       ['toolkit_views==1', {
         'defines': ['TOOLKIT_VIEWS=1'],
       }],
+      ['toolkit_pure_views==1', {
+        'defines': ['TOOLKIT_USES_PURE_VIEWS=1'],
+      }],
       ['views_compositor==1', {
         'defines': ['VIEWS_COMPOSITOR=1'],
       }],
       ['chromeos==1', {
         'defines': ['OS_CHROMEOS=1'],
       }],
       ['touchui==1', {
         'defines': ['TOUCH_UI=1'],
       }],
       ['file_manager_extension==1', {
@@ skipping 1103 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: