Add a factory and defines for native Linux surfaces.

ui/gl/gl.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,
   },
 
   'targets': [
@@ skipping 49 matching lines @@
         'async_pixel_transfer_delegate_sync.cc',
         'async_pixel_transfer_delegate_sync.h',
         'async_pixel_transfer_delegate_win.cc',
         'gl_bindings.h',
         'gl_bindings_skia_in_process.cc',
         'gl_bindings_skia_in_process.h',
         'gl_context.cc',
         'gl_context.h',
         'gl_context_android.cc',
         'gl_context_mac.mm',
-        'gl_context_osmesa.cc',
+        'gl_context_nsl.mm',

[jonathan.backer, 2013/04/30 12:41:20]

.mm? nix this?

[rjkroege, 2013/05/06 18:46:24]

bad merge. fixed.

+       'gl_context_osmesa.cc',

[jonathan.backer, 2013/04/30 12:41:20]

nit: whitespace.

[rjkroege, 2013/05/06 18:46:24]

Done.

         'gl_context_osmesa.h',
         'gl_context_stub.cc',
         'gl_context_stub.h',
         'gl_context_win.cc',
         'gl_context_x11.cc',
         'gl_export.h',
         'gl_fence.cc',
         'gl_fence.h',
         'gl_gl_api_implementation.cc',
         'gl_gl_api_implementation.h',
         'gl_image.cc',
         'gl_image.h',
         'gl_image_android.cc',
         'gl_image_mac.cc',
+        'gl_image_nsl.cc',
         'gl_image_stub.cc',
         'gl_image_stub.h',
         'gl_image_win.cc',
         'gl_image_x11.cc',
         'gl_implementation.cc',
         'gl_implementation.h',
         'gl_implementation_android.cc',
         'gl_implementation_mac.cc',
+        'gl_implementation_nsl.cc',
         'gl_implementation_win.cc',
         'gl_implementation_x11.cc',
         'gl_interface.cc',
         'gl_interface.h',
         'gl_osmesa_api_implementation.cc',
         'gl_osmesa_api_implementation.h',
         'gl_share_group.cc',
         'gl_share_group.h',
         'gl_state_restorer.cc',
         'gl_state_restorer.h',
         'gl_surface.cc',
         'gl_surface.h',
         'gl_surface_android.cc',
         'gl_surface_mac.cc',
+        'gl_surface_nsl.cc',
         'gl_surface_stub.cc',
         'gl_surface_stub.h',
         'gl_surface_win.cc',
         'gl_surface_x11.cc',
         'gl_surface_osmesa.cc',
         'gl_surface_osmesa.h',
         'gl_switches.cc',
         'gl_switches.h',
         'gpu_switching_manager.cc',
         'gpu_switching_manager.h',
         'safe_shared_memory_pool.h',
         'safe_shared_memory_pool.cc',
         'scoped_make_current.cc',
         'scoped_make_current.h',
         'gl_state_restorer.cc',
         'gl_state_restorer.h',
         'vsync_provider.cc',
         'vsync_provider.h',
         '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc',
         '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h',
         '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc',
         '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc',
         '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h',
         '<(gl_binding_output_dir)/gl_interface_autogen_gl.h',
       ],
+      'target_conditions': [
+        ['<(use_native_surface_linux) == 1', {
+          'sources!': [
+            'gl_context_linux.cc',
+            'gl_image_linux.cc',
+            'gl_implementation_linux.cc',
+            'gl_surface_linux.cc',
+          ],
+        },
+        { # use_native_surface_linux == 0
+          'sources!': [
+            'gl_context_nsl.cc',
+            'gl_implementation_nsl.cc',
+            'gl_surface_nsl.cc',
+            'gl_image_nsl.cc',
+        ],
+        }],
+      ],
       # hard_dependency is necessary for this target because it has actions
       # that generate header files included by dependent targets. The header
       # files must be generated before the dependents are compiled. The usual
       # semantics are to allow the two targets to build concurrently.
       'hard_dependency': 1,
       'actions': [
         {
           'action_name': 'generate_gl_bindings',
           'variables': {
             'generator_path': 'generate_bindings.py',
@@ skipping 214 matching lines @@
           ],
           'variables': {
             'jni_gen_package': 'ui/gl',
           },
           'includes': [ '../../build/jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }