Refactor: Move app/gfx/gl ==> ui/gfx/gl

app/app_base.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.
 
 {
   'target_defaults': {
     'variables': {
       'app_base_target': 0,
     },
     'target_conditions': [
@@ skipping 38 matching lines @@
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'app_base',
       'type': '<(library)',
       'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE',
       'variables': {
         'app_base_target': 1,
-        'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/app',
       },
       'dependencies': [
         # app resources and ui_strings should be shared with the 64-bit
         # target, but it doesn't work due to a bug in gyp
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../ui/ui.gyp:ui_gfx',
         '../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/sqlite/sqlite.gyp:sqlite',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '<(libjpeg_gyp_path):libjpeg',
       ],
-      'include_dirs': [
-        '../third_party/mesa/MesaLib/include',
-        '<(gl_binding_output_dir)',
-      ],
       # TODO(gregoryd): The direct_dependent_settings should be shared with
       # the 64-bit target, but it doesn't work due to a bug in gyp
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
-          '../third_party/mesa/MesaLib/include',
-          '<(gl_binding_output_dir)',
         ],
       },
       'sources': [
         # Files that are not required for Win64 Native Client loader
         '../ui/base/animation/animation.cc',
         '../ui/base/animation/animation.h',
         '../ui/base/animation/animation_container.cc',
         '../ui/base/animation/animation_container.h',
         '../ui/base/animation/animation_container_element.h',
         '../ui/base/animation/animation_container_observer.h',
@@ skipping 95 matching lines @@
         '../ui/base/view_prop.h',
         '../ui/base/win/hwnd_util.cc',
         '../ui/base/win/hwnd_util.h',
         '../ui/base/win/window_impl.cc',
         '../ui/base/win/window_impl.h',
         '../ui/base/x/active_window_watcher_x.cc',
         '../ui/base/x/active_window_watcher_x.h',
         '../ui/base/x/x11_util.cc',
         '../ui/base/x/x11_util.h',
         '../ui/base/x/x11_util_internal.h',
-        'gfx/gl/gl_bindings.h',
-        'gfx/gl/gl_bindings_skia.cc',
-        'gfx/gl/gl_bindings_skia.h',
-        'gfx/gl/gl_context.cc',
-        'gfx/gl/gl_context.h',
-        'gfx/gl/gl_context_linux.cc',
-        'gfx/gl/gl_context_mac.cc',
-        'gfx/gl/gl_context_osmesa.cc',
-        'gfx/gl/gl_context_osmesa.h',
-        'gfx/gl/gl_context_stub.cc',
-        'gfx/gl/gl_context_stub.h',
-        'gfx/gl/gl_context_win.cc',
-        'gfx/gl/gl_implementation.cc',
-        'gfx/gl/gl_implementation.h',
-        'gfx/gl/gl_implementation_linux.cc',
-        'gfx/gl/gl_implementation_mac.cc',
-        'gfx/gl/gl_implementation_win.cc',
-        'gfx/gl/gl_interface.h',
-        'gfx/gl/gl_interface.cc',
         'mac/nsimage_cache.h',
         'mac/nsimage_cache.mm',
         'mac/scoped_nsdisable_screen_updates.h',
         'sql/connection.cc',
         'sql/connection.h',
         'sql/diagnostic_error_delegate.h',
         'sql/init_status.h',
         'sql/meta_table.cc',
         'sql/meta_table.h',
         'sql/statement.cc',
         'sql/statement.h',
         'sql/transaction.cc',
         'sql/transaction.h',
         'win/iat_patch_function.cc',
         'win/iat_patch_function.h',
         'win/scoped_co_mem.h',
         'win/scoped_com_initializer.h',
         'win/scoped_prop.cc',
         'win/scoped_prop.h',
         'win/shell.cc',
         'win/shell.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',
-      ],
-      # hard_dependency is necessary for this target because it has actions
-      # that generate header files included by dependent targtets. 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',
-          'inputs': [
-            'gfx/gl/generate_bindings.py',
-          ],
-          'outputs': [
-            '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
-            '<(gl_binding_output_dir)/gl_bindings_autogen_egl.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_glx.cc',
-            '<(gl_binding_output_dir)/gl_bindings_autogen_glx.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_bindings_autogen_wgl.cc',
-            '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h',
-          ],
-          'action': [
-            'python',
-            'gfx/gl/generate_bindings.py',
-            '<(gl_binding_output_dir)',
-          ],
-        },
       ],
       'conditions': [
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             # font_gtk.cc uses fontconfig.
             # TODO(evanm): I think this is wrong; it should just use GTK.
             '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:x11',
             '../build/linux/system.gyp:xext',
@@ skipping 35 matching lines @@
             '../ui/base/view_prop.cc',
             '../ui/base/view_prop.h',
             'win/iat_patch_function.cc',
             'win/iat_patch_function.h',
           ],
           'sources/': [
             ['exclude', '^win/*'],
           ],
         }],
         ['OS=="linux"', {
-          'sources': [
-            'gfx/gl/gl_context_egl.cc',
-            'gfx/gl/gl_context_egl.h',
-            '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
-            '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h',
-            '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc',
-            '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h',
-          ],
           'sources!': [
             '../ui/base/keycodes/keyboard_code_conversion_mac.mm',
             '../ui/base/keycodes/keyboard_code_conversion_mac.h',
             '../ui/base/keycodes/keyboard_codes_win.h',
           ],
-          'include_dirs': [
-            # We don't use angle, but pull the EGL/GLES headers from there.
-            '../third_party/angle/include',
-          ],
           'all_dependent_settings': {
-            'defines': [
-              'GL_GLEXT_PROTOTYPES',
-            ],
             'ldflags': [
               '-L<(PRODUCT_DIR)',
             ],
             'link_settings': {
               'libraries': [
                 '-lX11',
                 '-ldl',
               ],
             },
           },
         }],
         ['OS=="mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
               '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
-              '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
             ],
           },
           'sources!': [
             '../ui/base/keycodes/keyboard_code_conversion_gtk.cc',
             '../ui/base/keycodes/keyboard_code_conversion_gtk.h',
             '../ui/base/keycodes/keyboard_code_conversion_x.cc',
             '../ui/base/keycodes/keyboard_code_conversion_x.h',
             '../ui/base/keycodes/keyboard_codes_win.h',
             '../ui/base/gtk/event_synthesis_gtk.cc',
             '../ui/base/gtk/event_synthesis_gtk.h',
           ],
         }],
         ['OS=="win"', {
-          'include_dirs': [
-            '../third_party/angle/include',
-          ],
-          'sources': [
-            'gfx/gl/gl_context_egl.cc',
-            'gfx/gl/gl_context_egl.h',
-            '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
-            '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h',
-            '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc',
-            '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h',
-          ],
           'sources!': [
             '../ui/base/keycodes/keyboard_code_conversion_gtk.cc',
             '../ui/base/keycodes/keyboard_code_conversion_gtk.h',
             '../ui/base/keycodes/keyboard_code_conversion_mac.mm',
             '../ui/base/keycodes/keyboard_code_conversion_mac.h',
             '../ui/base/keycodes/keyboard_code_conversion_x.cc',
             '../ui/base/keycodes/keyboard_code_conversion_x.h',
             '../ui/base/keycodes/keyboard_codes_posix.h',
             '../ui/base/gtk/event_synthesis_gtk.cc',
             '../ui/base/gtk/event_synthesis_gtk.h',
@@ skipping 43 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }