Move the Pepper implementation from webkit/glue/plugins/pepper_* to...

webkit/glue/webkit_glue.gypi

 # Copyright (c) 2010 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': {
     'conditions': [
       ['inside_chromium_build==0', {
         'webkit_src_dir': '../../../..',
       },{
@@ skipping 150 matching lines @@
       'actions': [
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)/webkit',
       ],
       'sources': [
         # This list contains all .h, .cc, and .mm files in glue except for
         # those in the test subdirectory and those with unittest in in their
         # names.
+        '../plugins/plugin_switches.cc',

[jam, 2010/12/15 22:45:48]

hmm, having "../" in a gyp file seems like a signal that another gyp file is
needed for that directory

+        '../plugins/plugin_switches.h',
+

[jam, 2010/12/15 22:45:48]

nit: why the blank line?

+        '../plugins/ppapi/common.h',
+        '../plugins/ppapi/dir_contents.h',
+        '../plugins/ppapi/error_util.cc',
+        '../plugins/ppapi/error_util.h',
+        '../plugins/ppapi/event_conversion.cc',
+        '../plugins/ppapi/event_conversion.h',
+        '../plugins/ppapi/file_callbacks.cc',
+        '../plugins/ppapi/file_callbacks.h',
+        '../plugins/ppapi/fullscreen_container.h',
+        '../plugins/ppapi/npapi_glue.cc',
+        '../plugins/ppapi/npapi_glue.h',
+        '../plugins/ppapi/plugin_delegate.h',
+        '../plugins/ppapi/plugin_instance.cc',
+        '../plugins/ppapi/plugin_instance.h',
+        '../plugins/ppapi/plugin_module.cc',
+        '../plugins/ppapi/plugin_module.h',
+        '../plugins/ppapi/plugin_object.cc',
+        '../plugins/ppapi/plugin_object.h',
+        '../plugins/ppapi/ppb_audio_impl.cc',
+        '../plugins/ppapi/ppb_audio_impl.h',
+        '../plugins/ppapi/ppb_buffer_impl.cc',
+        '../plugins/ppapi/ppb_buffer_impl.h',
+        '../plugins/ppapi/ppb_char_set_impl.cc',
+        '../plugins/ppapi/ppb_char_set_impl.h',
+        '../plugins/ppapi/ppb_cursor_control_impl.cc',
+        '../plugins/ppapi/ppb_cursor_control_impl.h',
+        '../plugins/ppapi/ppb_directory_reader_impl.cc',
+        '../plugins/ppapi/ppb_directory_reader_impl.h',
+        '../plugins/ppapi/ppb_file_chooser_impl.cc',
+        '../plugins/ppapi/ppb_file_chooser_impl.h',
+        '../plugins/ppapi/ppb_file_io_impl.cc',
+        '../plugins/ppapi/ppb_file_io_impl.h',
+        '../plugins/ppapi/ppb_file_ref_impl.cc',
+        '../plugins/ppapi/ppb_file_ref_impl.h',
+        '../plugins/ppapi/ppb_file_system_impl.cc',
+        '../plugins/ppapi/ppb_file_system_impl.h',
+        '../plugins/ppapi/ppb_flash.h',
+        '../plugins/ppapi/ppb_flash_impl.cc',
+        '../plugins/ppapi/ppb_flash_impl.h',
+        '../plugins/ppapi/ppb_flash_impl_linux.cc',
+        '../plugins/ppapi/ppb_font_impl.cc',
+        '../plugins/ppapi/ppb_font_impl.h',
+        '../plugins/ppapi/ppb_graphics_2d_impl.cc',
+        '../plugins/ppapi/ppb_graphics_2d_impl.h',
+        '../plugins/ppapi/ppb_graphics_3d_impl.cc',
+        '../plugins/ppapi/ppb_graphics_3d_impl.h',
+        '../plugins/ppapi/ppb_image_data_impl.cc',
+        '../plugins/ppapi/ppb_image_data_impl.h',
+        '../plugins/ppapi/ppb_open_gl_es_impl.cc',
+        '../plugins/ppapi/ppb_pdf.h',
+        '../plugins/ppapi/ppb_pdf_impl.cc',
+        '../plugins/ppapi/ppb_pdf_impl.h',
+        '../plugins/ppapi/ppb_scrollbar_impl.cc',
+        '../plugins/ppapi/ppb_scrollbar_impl.h',
+        '../plugins/ppapi/ppb_transport_impl.cc',
+        '../plugins/ppapi/ppb_transport_impl.h',
+        '../plugins/ppapi/ppb_url_loader_impl.cc',
+        '../plugins/ppapi/ppb_url_loader_impl.h',
+        '../plugins/ppapi/ppb_url_request_info_impl.cc',
+        '../plugins/ppapi/ppb_url_request_info_impl.h',
+        '../plugins/ppapi/ppb_url_response_info_impl.cc',
+        '../plugins/ppapi/ppb_url_response_info_impl.h',
+        '../plugins/ppapi/ppb_url_util_impl.cc',
+        '../plugins/ppapi/ppb_url_util_impl.h',
+        '../plugins/ppapi/ppb_video_decoder_impl.cc',
+        '../plugins/ppapi/ppb_video_decoder_impl.h',
+        '../plugins/ppapi/ppb_widget_impl.cc',
+        '../plugins/ppapi/ppb_widget_impl.h',
+        '../plugins/ppapi/resource.cc',
+        '../plugins/ppapi/resource.h',
+        '../plugins/ppapi/resource_tracker.cc',
+        '../plugins/ppapi/resource_tracker.h',
+        '../plugins/ppapi/string.cc',
+        '../plugins/ppapi/string.h',
+        '../plugins/ppapi/var.cc',
+        '../plugins/ppapi/var.h',
+        '../plugins/ppapi/var_object_class.cc',
+        '../plugins/ppapi/var_object_class.h',
+        '../plugins/ppapi/webplugin_impl.cc',
+        '../plugins/ppapi/webplugin_impl.h',
+

[jam, 2010/12/15 22:45:48]

nit: ditto

         'media/buffered_data_source.cc',
         'media/buffered_data_source.h',
         'media/media_resource_loader_bridge_factory.cc',
         'media/media_resource_loader_bridge_factory.h',
         'media/simple_data_source.cc',
         'media/simple_data_source.h',
         'media/video_renderer_impl.cc',
         'media/video_renderer_impl.h',
         'media/web_data_source.cc',
         'media/web_data_source.h',
         'media/web_video_renderer.h',
         'plugins/carbon_plugin_window_tracker_mac.h',
         'plugins/carbon_plugin_window_tracker_mac.cc',
         'plugins/coregraphics_private_symbols_mac.h',
         'plugins/default_plugin_shared.h',
         'plugins/nphostapi.h',
         'plugins/gtk_plugin_container.h',
         'plugins/gtk_plugin_container.cc',
         'plugins/gtk_plugin_container_manager.h',
         'plugins/gtk_plugin_container_manager.cc',
         'plugins/npapi_extension_thunk.cc',
         'plugins/npapi_extension_thunk.h',
-        'plugins/pepper_audio.cc',
-        'plugins/pepper_audio.h',
-        'plugins/pepper_buffer.cc',
-        'plugins/pepper_buffer.h',
-        'plugins/pepper_char_set.cc',
-        'plugins/pepper_char_set.h',
-        'plugins/pepper_class.h',
-        'plugins/pepper_cursor_control.cc',
-        'plugins/pepper_cursor_control.h',
-        'plugins/pepper_directory_reader.cc',
-        'plugins/pepper_directory_reader.h',
-        'plugins/pepper_error_util.cc',
-        'plugins/pepper_error_util.h',
-        'plugins/pepper_event_conversion.cc',
-        'plugins/pepper_event_conversion.h',
-        'plugins/pepper_file_callbacks.cc',
-        'plugins/pepper_file_callbacks.h',
-        'plugins/pepper_file_chooser.cc',
-        'plugins/pepper_file_chooser.h',
-        'plugins/pepper_file_io.cc',
-        'plugins/pepper_file_io.h',
-        'plugins/pepper_file_ref.cc',
-        'plugins/pepper_file_ref.h',
-        'plugins/pepper_file_system.cc',
-        'plugins/pepper_file_system.h',
-        'plugins/pepper_font.cc',
-        'plugins/pepper_font.h',
-        'plugins/pepper_graphics_2d.cc',
-        'plugins/pepper_graphics_2d.h',
-        'plugins/pepper_image_data.cc',
-        'plugins/pepper_image_data.h',
-        'plugins/pepper_plugin_delegate.h',
-        'plugins/pepper_plugin_instance.cc',
-        'plugins/pepper_plugin_instance.h',
-        'plugins/pepper_plugin_module.cc',
-        'plugins/pepper_plugin_module.h',
-        'plugins/pepper_plugin_object.cc',
-        'plugins/pepper_plugin_object.h',
-        'plugins/pepper_private.cc',
-        'plugins/pepper_private.h',
-        'plugins/pepper_private2.cc',
-        'plugins/pepper_private2.h',
-        'plugins/pepper_private2_linux.cc',
-        'plugins/pepper_resource_tracker.cc',
-        'plugins/pepper_resource_tracker.h',
-        'plugins/pepper_resource.cc',
-        'plugins/pepper_resource.h',
-        'plugins/pepper_scrollbar.cc',
-        'plugins/pepper_scrollbar.h',
-        'plugins/pepper_string.cc',
-        'plugins/pepper_string.h',
-        'plugins/pepper_transport.cc',
-        'plugins/pepper_transport.h',
-        'plugins/pepper_url_loader.cc',
-        'plugins/pepper_url_loader.h',
-        'plugins/pepper_url_request_info.cc',
-        'plugins/pepper_url_request_info.h',
-        'plugins/pepper_url_response_info.cc',
-        'plugins/pepper_url_response_info.h',
-        'plugins/pepper_url_util.cc',
-        'plugins/pepper_url_util.h',
-        'plugins/pepper_var.cc',
-        'plugins/pepper_var.h',
-        'plugins/pepper_video_decoder.cc',
-        'plugins/pepper_video_decoder.h',
-        'plugins/pepper_webplugin_impl.cc',
-        'plugins/pepper_webplugin_impl.h',
-        'plugins/pepper_widget.cc',
-        'plugins/pepper_widget.h',
+
         'plugins/plugin_constants_win.h',
         'plugins/plugin_group.cc',
         'plugins/plugin_group.h',
         'plugins/plugin_host.cc',
         'plugins/plugin_host.h',
         'plugins/plugin_instance.cc',
         'plugins/plugin_instance.h',
         'plugins/plugin_instance_mac.mm',
         'plugins/plugin_lib.cc',
         'plugins/plugin_lib.h',
         'plugins/plugin_lib_mac.mm',
         'plugins/plugin_lib_posix.cc',
         'plugins/plugin_lib_win.cc',
         'plugins/plugin_list.cc',
         'plugins/plugin_list.h',
         'plugins/plugin_list_mac.mm',
         'plugins/plugin_list_posix.cc',
         'plugins/plugin_list_win.cc',
         'plugins/plugin_stream.cc',
         'plugins/plugin_stream.h',
         'plugins/plugin_stream_posix.cc',
         'plugins/plugin_stream_url.cc',
         'plugins/plugin_stream_url.h',
         'plugins/plugin_stream_win.cc',
         'plugins/plugin_string_stream.cc',
         'plugins/plugin_string_stream.h',
         'plugins/plugin_stubs.cc',
-        'plugins/plugin_switches.cc',
-        'plugins/plugin_switches.h',
         'plugins/plugin_web_event_converter_mac.h',
         'plugins/plugin_web_event_converter_mac.mm',
         'plugins/ppb_private.h',
         'plugins/quickdraw_drawing_manager_mac.h',
         'plugins/quickdraw_drawing_manager_mac.cc',
         'plugins/webview_plugin.cc',
         'plugins/webview_plugin.h',
         'plugins/webplugin.cc',
         'plugins/webplugin.h',
         'plugins/webplugin_audio_device_delegate.cc',
@@ skipping 141 matching lines @@
         ['OS!="mac"', {
           'sources/': [['exclude', '_mac\\.(cc|mm)$']],
         }, {  # else: OS=="mac"
           'sources/': [['exclude', 'plugin_(lib|list)_posix\\.cc$']],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
             ],
           },
         }],
-        ['enable_gpu==1', {
-          'sources': [
-            'plugins/pepper_graphics_3d_gl.cc',
-            'plugins/pepper_graphics_3d.cc',
-            'plugins/pepper_graphics_3d.h',
+        ['enable_gpu!=1', {
+          'sources!': [
+            '../plugins/ppapi/ppb_graphics_3d_impl.cc',
+            '../plugins/ppapi/ppb_graphics_3d_impl.h',
+            '../plugins/ppapi/ppb_open_gl_es_impl.cc',
           ],
           'dependencies': [
             '<(DEPTH)/gpu/gpu.gyp:gpu_plugin',
           ],
         }],
         ['OS!="win"', {
           'sources/': [['exclude', '_win\\.cc$']],
           'sources!': [
             'webthemeengine_impl_win.cc',
           ],
@@ skipping 23 matching lines @@
         }],
         ['inside_chromium_build==0', {
           'dependencies': [
             '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
           ],
         }],
       ],
     },
   ],
 }