Merge from Chromium at DEPS revision r199464
This commit was generated by merge_to_master.py.
Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 3f2b355..d8a3595 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -48,18 +48,6 @@
'android/surface_texture_bridge.h',
'android/surface_texture_listener.cc',
'android/surface_texture_listener.h',
- 'async_pixel_transfer_delegate.cc',
- 'async_pixel_transfer_delegate.h',
- 'async_pixel_transfer_delegate_android.cc',
- 'async_pixel_transfer_delegate_idle.cc',
- 'async_pixel_transfer_delegate_idle.h',
- 'async_pixel_transfer_delegate_linux.cc',
- 'async_pixel_transfer_delegate_mac.cc',
- 'async_pixel_transfer_delegate_stub.cc',
- 'async_pixel_transfer_delegate_stub.h',
- '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',
@@ -114,12 +102,10 @@
'gl_switches.h',
'gpu_switching_manager.cc',
'gpu_switching_manager.h',
- 'safe_shared_memory_pool.h',
- 'safe_shared_memory_pool.cc',
+ 'scoped_binders.cc',
+ 'scoped_binders.h',
'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',
@@ -190,8 +176,6 @@
'conditions': [
['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', {
'sources': [
- 'async_pixel_transfer_delegate_egl.cc',
- 'async_pixel_transfer_delegate_egl.h',
'egl_util.cc',
'egl_util.h',
'gl_context_egl.cc',