Initial iOS bring up of ui.

ui/ui.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'ui_resources.gypi',
   ],
   'targets': [
     {
       'target_name': 'ui',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'includes': [
         'base/ime/ime.gypi',
       ],
       'dependencies': [
         '../base/base.gyp:base',
-        '../base/base.gyp:base_i18n',
-        '../base/base.gyp:base_static',

[stuartmorgan, 2012/08/01 13:26:18]

Why do we have to remove these?

         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        '../third_party/libpng/libpng.gyp:libpng',
-        '../third_party/zlib/zlib.gyp:zlib',

[stuartmorgan, 2012/08/01 13:26:18]

And this?

-        'base/strings/ui_strings.gyp:ui_strings',
-        'ui_resources',

[stuartmorgan, 2012/08/01 13:26:18]

Can't we use dependencies! for some of these?

[noyau (Ping after 24h), 2012/08/01 13:53:45]

I restored them all except for libjpeg, which cannot be excluded with
dependencies! as it is not present.

-        '<(libjpeg_gyp_path):libjpeg',
       ],
       'defines': [
         'UI_IMPLEMENTATION',
       ],
       # Export these dependencies since text_elider.h includes ICU headers.
       'export_dependent_settings': [
         '../net/net.gyp:net',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
       ],
@@ skipping 355 matching lines @@
         'gfx/platform_font_pango.cc',
         'gfx/platform_font_mac.h',
         'gfx/platform_font_mac.mm',
         'gfx/platform_font_win.h',
         'gfx/platform_font_win.cc',
         'gfx/point.cc',
         'gfx/point.h',
         'gfx/point_base.h',
         'gfx/point_f.cc',
         'gfx/point_f.h',
+        'gfx/point3.h',
         'gfx/rect.cc',
         'gfx/rect.h',
         'gfx/rect_base.h',
         'gfx/rect_base_impl.h',
         'gfx/rect_f.cc',
         'gfx/rect_f.h',
         'gfx/render_text.cc',
         'gfx/render_text.h',
         'gfx/render_text_mac.cc',
         'gfx/render_text_mac.h',
@@ skipping 39 matching lines @@
         'gfx/video_decode_acceleration_support_mac.mm',
         'ui_controls/ui_controls.h',
         'ui_controls/ui_controls_aura.cc',
         'ui_controls/ui_controls_internal_win.h',
         'ui_controls/ui_controls_internal_win.cc',
         'ui_controls/ui_controls_gtk.cc',
         'ui_controls/ui_controls_mac.mm',
         'ui_controls/ui_controls_win.cc',
       ],
       'conditions': [
+        ['OS != "ios"', {
+            'dependencies': [

[stuartmorgan, 2012/08/01 13:26:18]

Indentation is wrong here.

[noyau (Ping after 24h), 2012/08/01 13:53:45]

Done.

+              '../base/base.gyp:base_i18n',
+              '../base/base.gyp:base_static',
+              '../third_party/libpng/libpng.gyp:libpng',
+              '../third_party/zlib/zlib.gyp:zlib',
+              'base/strings/ui_strings.gyp:ui_strings',
+              'ui_resources',
+              '<(libjpeg_gyp_path):libjpeg',
+            ],
+          },
+        ],

[stuartmorgan, 2012/08/01 13:26:18]

And this should be on the previous line, with the comma from the previous line
removed.

[noyau (Ping after 24h), 2012/08/01 13:53:45]

Done.

         # TODO(asvitkine): Switch all platforms to use canvas_skia.cc.
         #                  http://crbug.com/105550
         ['use_canvas_skia==1', {
           'sources!': [
             'gfx/canvas_android.cc',
             'gfx/canvas_linux.cc',
             'gfx/canvas_mac.mm',
           ],
         }, {  # use_canvas_skia!=1
           'sources!': [
@@ skipping 62 matching lines @@
             # font_gtk.cc uses fontconfig.
             '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:glib',
             '../build/linux/system.gyp:pangocairo',
             '../build/linux/system.gyp:x11',
             '../build/linux/system.gyp:xext',
             '../build/linux/system.gyp:xfixes',
           ],
           'link_settings': {
             'libraries': [
-              '-lXcursor',  # For XCursor* function calls in x11_util.cc. 
+              '-lXcursor',  # For XCursor* function calls in x11_util.cc.
               '-lXrender',  # For XRender* function calls in x11_util.cc.
             ],
           },
           'conditions': [
             ['toolkit_views==0', {
               # Note: because of gyp predence rules this has to be defined as
               # 'sources/' rather than 'sources!'.
               'sources/': [
                 ['exclude', '^base/dragdrop/drag_drop_types_gtk.cc'],
                 ['exclude', '^base/dragdrop/drag_utils_gtk.cc'],
@@ skipping 108 matching lines @@
             'gfx/platform_font_pango.cc',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
               '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
             ],
           },
         }],
-        ['use_x11==1', {
+        ['OS == "ios"', {

[stuartmorgan, 2012/08/01 13:26:18]

Everything else in this block has the no-spaces style, so let's match that.

[noyau (Ping after 24h), 2012/08/01 13:53:45]

Done.

+          'sources/': [
+            # iOS uses so little of ui that it is is easier to simply exclude
+            # everything and then just select the parts needed.

[stuartmorgan, 2012/08/01 13:26:18]

Will this always be true? If not, change to a TODO; if so, add a TODO after it
to add files here as they are made iOS-ready, so it's clear this isn't a final
list.

[noyau (Ping after 24h), 2012/08/01 13:53:45]

Done.

+            ['exclude', '^base/'],
+            ['exclude', '^ui_controls/'],
+            ['exclude', '^gfx/'],
+            ['include', '^gfx/point\\.'],
+            ['include', '^gfx/point_base\\.h'],
+            ['include', '^gfx/point3\\.h'],
+            ['include', '^gfx/rect\\.'],
+            ['include', '^gfx/rect_base\\.h'],
+            ['include', '^gfx/rect_base_impl\\.h'],
+            ['include', '^gfx/size\\.'],
+            ['include', '^gfx/size_base\\.h'],
+            ['include', '^gfx/size_base_impl\\.h'],
+          ],
+          'link_settings': {
+            'libraries': [
+            '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',

[stuartmorgan, 2012/08/01 13:26:18]

Indent more.

[noyau (Ping after 24h), 2012/08/01 13:53:45]

Done.

+            ],
+          },
+        }],
+        ['use_x11 == 1', {

[stuartmorgan, 2012/08/01 13:26:18]

Don't change the spacing here.

[noyau (Ping after 24h), 2012/08/01 13:53:45]

Done.

           'all_dependent_settings': {
             'ldflags': [
               '-L<(PRODUCT_DIR)',
             ],
             'link_settings': {
               'libraries': [
                 '-lX11 -lXcursor',
               ],
             },
           },
@@ skipping 31 matching lines @@
         }],
         ['inside_chromium_build==0', {
           'dependencies': [
             '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
           ],
         }],
       ],
     },
   ],
   'conditions': [
-    ['inside_chromium_build==1', {
+    [ 'OS == "ios"', {
+      'targets': [
+        {
+          # TODO(ios): Adding a fake target so the bots have something to invoke
+          # while the tests are disabled. See b/4935009.
+          'target_name': 'gfx_unittests',
+          'type': 'none',
+        }
+      ],
+    }],

[stuartmorgan, 2012/08/01 13:26:18]

This block shouldn't be necessary upstream; nothing runs unit tests yet.

[noyau (Ping after 24h), 2012/08/01 13:53:45]

Done.

+    ['inside_chromium_build == 1 and OS != "ios"', {
+      # TODO(ios): The ui tests do not compile yet on iOS. See b/4935009.

[stuartmorgan, 2012/08/01 13:26:18]

That bug has nothing to do with compiling AFAICT. Just remove the bug reference;
this early in the ui/ upstreaming the TODO speaks for itself.

[noyau (Ping after 24h), 2012/08/01 13:53:45]

Done.

       'includes': [
         'ui_unittests.gypi',
       ],
       'targets': [
         {
           # TODO(rsesek): Remove this target once ui_unittests is run on the
           # waterfall instead of gfx_unittests.
           'target_name': 'gfx_unittests',
           'type': 'none',
           'dependencies': [
@@ skipping 15 matching lines @@
                 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
                 'os.chmod(\'<(ui_copy_dest)\', 0700)'
               ]
             }
           ],
         },
       ],
     }],
   ],
 }