ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes.

ui/ozone/ozone.gyp

 # Copyright 2013 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,
     # Normally, the external_ozone_platform* variables below can be
     # overridden by supplement.gypi which must exist exactly one level
     # below the top-level src directory. They can now also be set in
@@ skipping 22 matching lines @@
       'sources': [
         'public/cursor_factory_ozone.cc',
         'public/cursor_factory_ozone.h',
         'public/gpu_platform_support.cc',
         'public/gpu_platform_support.h',
         'public/gpu_platform_support_host.cc',
         'public/gpu_platform_support_host.h',
         'public/native_pixmap.h',
         'public/overlay_candidates_ozone.cc',
         'public/overlay_candidates_ozone.h',
+        'public/surface_client_factory_ozone.cc',
+        'public/surface_client_factory_ozone.h',
         'public/surface_factory_ozone.cc',
         'public/surface_factory_ozone.h',
         'public/surface_ozone_canvas.h',
         'public/surface_ozone_egl.cc',
         'public/surface_ozone_egl.h',
         'public/system_input_injector.h',
       ],
     },
     {
       # GN version: //ui/ozone
@@ skipping 15 matching lines @@
         'ozone_base',
       ],
       'defines': [
         'OZONE_IMPLEMENTATION',
       ],
       'variables': {
         'platform_list_cc_file': '<(INTERMEDIATE_DIR)/ui/ozone/platform_list.cc',
         'platform_list_h_file': '<(SHARED_INTERMEDIATE_DIR)/ui/ozone/platform_list.h',
         'platform_list_txt_file': '<(SHARED_INTERMEDIATE_DIR)/ui/ozone/platform_list.txt',
         'constructor_list_cc_file': '<(INTERMEDIATE_DIR)/ui/ozone/constructor_list.cc',
+        'constructor_client_list_cc_file': '<(INTERMEDIATE_DIR)/ui/ozone/constructor_client_list.cc',
         'ozone_platforms': [
           '<@(external_ozone_platforms)',
           '<@(internal_ozone_platforms)',
         ],
       },
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
         '<(platform_list_cc_file)',
         '<(platform_list_h_file)',
         '<(constructor_list_cc_file)',
+        '<(constructor_client_list_cc_file)',
 
         'common/display_mode_proxy.cc',
         'common/display_mode_proxy.h',
         'common/display_snapshot_proxy.cc',
         'common/display_snapshot_proxy.h',
         'common/display_util.cc',
         'common/display_util.h',
         'common/egl_util.cc',
         'common/egl_util.h',
         'common/gpu/ozone_gpu_message_generator.cc',
         'common/gpu/ozone_gpu_message_generator.h',
         'common/gpu/ozone_gpu_message_params.cc',
         'common/gpu/ozone_gpu_message_params.h',
         'common/gpu/ozone_gpu_messages.h',
         'common/native_display_delegate_ozone.cc',
         'common/native_display_delegate_ozone.h',
         'platform_selection.cc',
         'platform_selection.h',
         'public/input_controller.cc',
         'public/input_controller.h',
+        'public/ozone_client.cc',
+        'public/ozone_client.h',
         'public/ozone_gpu_test_helper.cc',
         'public/ozone_gpu_test_helper.h',
         'public/ozone_platform.cc',
         'public/ozone_platform.h',
         'public/ozone_switches.cc',
         'public/ozone_switches.h',
         '<@(external_ozone_platform_files)',
       ],
       'actions': [
         {
@@ skipping 36 matching lines @@
           'action': [
             'python',
             '<(generator_path)',
             '--platform_list=<(platform_list_txt_file)',
             '--output_cc=<(constructor_list_cc_file)',
             '--namespace=ui',
             '--typename=OzonePlatform',
             '--include="ui/ozone/public/ozone_platform.h"'
           ],
         },
+        {
+          'action_name': 'generate_constructor_client_list',
+          'variables': {
+            'generator_path': 'generate_constructor_list.py',
+          },
+          'inputs': [
+            '<(generator_path)',
+            '<(platform_list_txt_file)',
+          ],
+          'outputs': [
+            '<(constructor_client_list_cc_file)',
+          ],
+          'action': [
+            'python',
+            '<(generator_path)',
+            '--platform_list=<(platform_list_txt_file)',
+            '--output_cc=<(constructor_client_list_cc_file)',
+            '--namespace=ui',
+            '--typename=OzoneClient',

[spang, 2015/06/01 22:46:41]

No need to add another invocation of the script.

You can pass multiple typenames & includes to the other one.

[dshwang, 2015/06/03 14:11:51]

Done.

+            '--include="ui/ozone/public/ozone_client.h"'
+          ],
+        },
       ],
       'conditions': [
         ['use_udev == 0', {
           'sources/': [
             ['exclude', '_udev\\.(h|cc)$'],
           ],
         }],
       ],
     },
     {
@@ skipping 39 matching lines @@
         'platform/drm/gbm.gypi',
       ],
     }],
     ['<(ozone_platform_test) == 1', {
       'includes': [
         'platform/test/test.gypi',
       ],
     }],
   ],
 }