diff options
Diffstat (limited to 'content')
47 files changed, 107 insertions, 106 deletions
diff --git a/content/DEPS b/content/DEPS index 79aa707..eec777d 100644 --- a/content/DEPS +++ b/content/DEPS @@ -54,6 +54,7 @@ include_rules = [ "+ui/base", "+ui/compositor", "+ui/gfx", + "+ui/gl", "+ui/surface", # Content knows about grd files, but the specifics of how to get a resource # given its id is left to the embedder. diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc index f43dd53..06201a8 100644 --- a/content/browser/gpu/gpu_data_manager_impl.cc +++ b/content/browser/gpu/gpu_data_manager_impl.cc @@ -19,8 +19,8 @@ #include "content/public/browser/gpu_data_manager_observer.h" #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_switches.h" #include "webkit/plugins/plugin_switches.h" using content::BrowserThread; diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index 0cdb387..2dab6a4 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -33,9 +33,9 @@ #include "gpu/command_buffer/service/gpu_switches.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_switches.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_switches.h" #if defined(TOOLKIT_GTK) #include "ui/gfx/gtk_native_view_id_manager.h" diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc index bf62796..e8cd609 100644 --- a/content/browser/gpu/gpu_process_host_ui_shim.cc +++ b/content/browser/gpu/gpu_process_host_ui_shim.cc @@ -21,7 +21,7 @@ #include "content/common/gpu/gpu_messages.h" #include "content/port/browser/render_widget_host_view_port.h" #include "content/public/browser/browser_thread.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" #if defined(TOOLKIT_GTK) // These two #includes need to come after gpu_messages.h. diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index f462a39..7a976e0 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -35,8 +35,8 @@ #include "content/public/common/process_type.h" #include "ipc/ipc_switches.h" #include "ui/base/ui_base_switches.h" -#include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gl/gl_switches.h" using content::BrowserThread; using content::ChildProcessData; diff --git a/content/browser/renderer_host/accelerated_plugin_view_mac.mm b/content/browser/renderer_host/accelerated_plugin_view_mac.mm index a0a1a4e..dfb9891 100644 --- a/content/browser/renderer_host/accelerated_plugin_view_mac.mm +++ b/content/browser/renderer_host/accelerated_plugin_view_mac.mm @@ -11,9 +11,9 @@ #include "content/browser/renderer_host/render_widget_host_view_mac.h" #include "content/public/browser/browser_thread.h" #import "ui/base/cocoa/underlay_opengl_hosting_window.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_switches.h" using content::BrowserThread; diff --git a/content/browser/renderer_host/compositing_iosurface_mac.mm b/content/browser/renderer_host/compositing_iosurface_mac.mm index 3c038f4..0424515 100644 --- a/content/browser/renderer_host/compositing_iosurface_mac.mm +++ b/content/browser/renderer_host/compositing_iosurface_mac.mm @@ -12,9 +12,9 @@ #include "content/browser/renderer_host/render_widget_host_view_mac.h" #include "content/public/browser/browser_thread.h" #include "gpu/command_buffer/service/gpu_switches.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_switches.h" #include "ui/surface/io_surface_support_mac.h" #ifdef NDEBUG diff --git a/content/browser/renderer_host/image_transport_client_linux.cc b/content/browser/renderer_host/image_transport_client_linux.cc index 779e1eb..a3425f2 100644 --- a/content/browser/renderer_host/image_transport_client_linux.cc +++ b/content/browser/renderer_host/image_transport_client_linux.cc @@ -14,12 +14,12 @@ #include "content/browser/renderer_host/image_transport_factory.h" #include "third_party/angle/include/EGL/egl.h" #include "third_party/angle/include/EGL/eglext.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_egl.h" -#include "ui/gfx/gl/gl_surface_glx.h" -#include "ui/gfx/gl/scoped_make_current.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" +#include "ui/gl/gl_surface_glx.h" +#include "ui/gl/scoped_make_current.h" namespace { diff --git a/content/browser/renderer_host/image_transport_factory.cc b/content/browser/renderer_host/image_transport_factory.cc index de8b039..98b81a6 100644 --- a/content/browser/renderer_host/image_transport_factory.cc +++ b/content/browser/renderer_host/image_transport_factory.cc @@ -23,9 +23,9 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" #include "ui/compositor/compositor.h" #include "ui/compositor/compositor_setup.h" -#include "ui/gfx/gl/scoped_make_current.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/scoped_make_current.h" using content::BrowserGpuChannelHostFactory; using content::GLHelper; diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index a93fa1d..5d54b17 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -105,7 +105,7 @@ #include "media/base/media_switches.h" #include "net/url_request/url_request_context_getter.h" #include "ui/base/ui_base_switches.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" #include "webkit/fileapi/sandbox_mount_point_provider.h" #include "webkit/glue/resource_type.h" #include "webkit/plugins/plugin_switches.h" diff --git a/content/common/gpu/client/gl_helper.cc b/content/common/gpu/client/gl_helper.cc index a8bcbbc25..5b2a37d 100644 --- a/content/common/gpu/client/gl_helper.cc +++ b/content/common/gpu/client/gl_helper.cc @@ -17,8 +17,8 @@ #include "base/threading/thread_restrictions.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" -#include "ui/gfx/gl/gl_bindings.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_bindings.h" using WebKit::WebGLId; using WebKit::WebGraphicsContext3D; diff --git a/content/common/gpu/client/gpu_channel_host.h b/content/common/gpu/client/gpu_channel_host.h index 179a780..2f9fe68 100644 --- a/content/common/gpu/client/gpu_channel_host.h +++ b/content/common/gpu/client/gpu_channel_host.h @@ -17,16 +17,16 @@ #include "base/process_util.h" #include "base/synchronization/lock.h" #include "content/common/content_export.h" +#include "content/common/gpu/client/gpu_video_decode_accelerator_host.h" #include "content/common/gpu/gpu_process_launch_causes.h" #include "content/common/message_router.h" #include "content/public/common/gpu_info.h" -#include "content/common/gpu/client/gpu_video_decode_accelerator_host.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_sync_channel.h" -#include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/gpu_preference.h" class CommandBufferProxy; class CommandBufferProxyImpl; diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h index 1a744c4..2cabdd3 100644 --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h @@ -17,7 +17,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" -#include "ui/gfx/gl/gpu_preference.h" +#include "ui/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #if defined(USE_SKIA) diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc index 4657972..a228305 100644 --- a/content/common/gpu/gpu_channel.cc +++ b/content/common/gpu/gpu_channel.cc @@ -19,8 +19,8 @@ #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "gpu/command_buffer/service/mailbox_manager.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface.h" #if defined(OS_POSIX) #include "ipc/ipc_channel_posix.h" diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h index 67d856e..6080e6b 100644 --- a/content/common/gpu/gpu_channel.h +++ b/content/common/gpu/gpu_channel.h @@ -19,10 +19,10 @@ #include "content/common/gpu/gpu_memory_manager.h" #include "content/common/message_router.h" #include "ipc/ipc_sync_channel.h" -#include "ui/gfx/gl/gl_share_group.h" -#include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_share_group.h" +#include "ui/gl/gpu_preference.h" class GpuChannelManager; struct GPUCreateCommandBufferConfig; diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc index e602d43..46b6d8c 100644 --- a/content/common/gpu/gpu_channel_manager.cc +++ b/content/common/gpu/gpu_channel_manager.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "content/common/child_thread.h" #include "content/common/gpu/gpu_channel.h" -#include "content/common/gpu/gpu_messages.h" #include "content/common/gpu/gpu_memory_manager.h" -#include "ui/gfx/gl/gl_share_group.h" +#include "content/common/gpu/gpu_messages.h" +#include "ui/gl/gl_share_group.h" GpuChannelManager::GpuChannelManager(ChildThread* gpu_child_thread, GpuWatchdog* watchdog, diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc index d25af66..d2f2849 100644 --- a/content/common/gpu/gpu_command_buffer_stub.cc +++ b/content/common/gpu/gpu_command_buffer_stub.cc @@ -20,8 +20,8 @@ #include "content/common/gpu/image_transport_surface.h" #include "gpu/command_buffer/common/constants.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_switches.h" #if defined(OS_WIN) #include "content/public/common/sandbox_init.h" diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h index abbd455..711c98c 100644 --- a/content/common/gpu/gpu_command_buffer_stub.h +++ b/content/common/gpu/gpu_command_buffer_stub.h @@ -24,11 +24,11 @@ #include "gpu/command_buffer/service/gpu_scheduler.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface.h" -#include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface.h" +#include "ui/gl/gpu_preference.h" #include "ui/surface/transport_dib.h" #if defined(OS_MACOSX) diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h index 90089dd..a264aab 100644 --- a/content/common/gpu/gpu_messages.h +++ b/content/common/gpu/gpu_messages.h @@ -20,9 +20,9 @@ #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" #include "media/video/video_decode_accelerator.h" -#include "ui/gfx/gl/gpu_preference.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" +#include "ui/gl/gpu_preference.h" #include "ui/surface/transport_dib.h" #define IPC_MESSAGE_START GpuMsgStart diff --git a/content/common/gpu/image_transport_surface.cc b/content/common/gpu/image_transport_surface.cc index d7640ba..419ed4a 100644 --- a/content/common/gpu/image_transport_surface.cc +++ b/content/common/gpu/image_transport_surface.cc @@ -15,7 +15,7 @@ #include "content/common/gpu/gpu_command_buffer_stub.h" #include "content/common/gpu/gpu_messages.h" #include "gpu/command_buffer/service/gpu_scheduler.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" ImageTransportSurface::ImageTransportSurface() {} diff --git a/content/common/gpu/image_transport_surface.h b/content/common/gpu/image_transport_surface.h index b437fcad..ce44081 100644 --- a/content/common/gpu/image_transport_surface.h +++ b/content/common/gpu/image_transport_surface.h @@ -17,10 +17,10 @@ #include "base/memory/weak_ptr.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message.h" -#include "ui/gfx/gl/gl_surface.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" +#include "ui/gl/gl_surface.h" #include "ui/surface/transport_dib.h" class GpuChannelManager; diff --git a/content/common/gpu/image_transport_surface_linux.cc b/content/common/gpu/image_transport_surface_linux.cc index 90341b5..9fe3d80 100644 --- a/content/common/gpu/image_transport_surface_linux.cc +++ b/content/common/gpu/image_transport_surface_linux.cc @@ -7,10 +7,10 @@ // This conflicts with the defines in Xlib.h and must come first. #include "content/common/gpu/gpu_messages.h" -#include <map> -#include <vector> #include <X11/Xlib.h> #include <X11/extensions/Xcomposite.h> +#include <map> +#include <vector> // Note: these must be included before anything that includes gl_bindings.h // They're effectively standard library headers. @@ -19,20 +19,20 @@ #include "third_party/mesa/MesaLib/include/GL/osmesa.h" #include "base/bind.h" -#include "base/memory/weak_ptr.h" #include "base/debug/trace_event.h" +#include "base/memory/weak_ptr.h" #include "content/common/gpu/gpu_channel.h" #include "content/common/gpu/gpu_channel_manager.h" #include "content/common/gpu/gpu_command_buffer_stub.h" #include "content/common/gpu/texture_image_transport_surface.h" #include "gpu/command_buffer/service/gpu_scheduler.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_egl.h" -#include "ui/gfx/gl/gl_surface_glx.h" -#include "ui/gfx/gl/gl_surface_osmesa.h" #include "ui/gfx/rect.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" +#include "ui/gl/gl_surface_glx.h" +#include "ui/gl/gl_surface_osmesa.h" namespace { diff --git a/content/common/gpu/image_transport_surface_mac.cc b/content/common/gpu/image_transport_surface_mac.cc index 5223ce1..6628098 100644 --- a/content/common/gpu/image_transport_surface_mac.cc +++ b/content/common/gpu/image_transport_surface_mac.cc @@ -9,11 +9,11 @@ #include "base/mac/scoped_cftyperef.h" #include "base/memory/scoped_ptr.h" #include "content/common/gpu/gpu_messages.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_cgl.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_cgl.h" #include "ui/surface/io_surface_support_mac.h" namespace { diff --git a/content/common/gpu/image_transport_surface_win.cc b/content/common/gpu/image_transport_surface_win.cc index 32e9d8a..1241009 100644 --- a/content/common/gpu/image_transport_surface_win.cc +++ b/content/common/gpu/image_transport_surface_win.cc @@ -15,11 +15,11 @@ #include "content/common/gpu/gpu_messages.h" #include "content/public/common/content_switches.h" #include "third_party/angle/include/EGL/egl.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_egl.h" #include "ui/gfx/native_widget_types.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" namespace { diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.cc b/content/common/gpu/media/dxva_video_decode_accelerator.cc index 05afbad..28f5f66 100644 --- a/content/common/gpu/media/dxva_video_decode_accelerator.cc +++ b/content/common/gpu/media/dxva_video_decode_accelerator.cc @@ -27,8 +27,8 @@ #include "media/video/video_decode_accelerator.h" #include "third_party/angle/include/EGL/egl.h" #include "third_party/angle/include/EGL/eglext.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_surface.h" // We only request 5 picture buffers from the client which are used to hold the // decoded samples. These buffers are then reused when the client tells us that diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc index 0ef9d87..6ad1329 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.cc +++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc @@ -14,12 +14,12 @@ #include "base/win/windows_version.h" #endif // OS_WIN -#include "gpu/command_buffer/common/command_buffer.h" -#include "ipc/ipc_message_macros.h" -#include "ipc/ipc_message_utils.h" #include "content/common/gpu/gpu_channel.h" #include "content/common/gpu/gpu_command_buffer_stub.h" #include "content/common/gpu/gpu_messages.h" +#include "gpu/command_buffer/common/command_buffer.h" +#include "ipc/ipc_message_macros.h" +#include "ipc/ipc_message_utils.h" #if (defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)) || defined(OS_WIN) #if defined(OS_WIN) @@ -27,8 +27,8 @@ #else // OS_WIN #include "content/common/gpu/media/omx_video_decode_accelerator.h" #endif // OS_WIN -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface_egl.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface_egl.h" #endif #include "gpu/command_buffer/service/texture_manager.h" diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc index 9dc6325..8e96c0d 100644 --- a/content/common/gpu/media/video_decode_accelerator_unittest.cc +++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc @@ -52,10 +52,10 @@ #include "third_party/angle/include/EGL/egl.h" #if defined(OS_WIN) -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" #else // OS_WIN #include "third_party/angle/include/GLES2/gl2.h" #endif // OS_WIN diff --git a/content/common/gpu/texture_image_transport_surface.cc b/content/common/gpu/texture_image_transport_surface.cc index de9d335..a19a743 100644 --- a/content/common/gpu/texture_image_transport_surface.cc +++ b/content/common/gpu/texture_image_transport_surface.cc @@ -10,7 +10,7 @@ #include "gpu/command_buffer/service/context_group.h" #include "gpu/command_buffer/service/gpu_scheduler.h" #include "gpu/command_buffer/service/texture_manager.h" -#include "ui/gfx/gl/scoped_make_current.h" +#include "ui/gl/scoped_make_current.h" using gpu::gles2::ContextGroup; using gpu::gles2::TextureManager; diff --git a/content/common/gpu/texture_image_transport_surface.h b/content/common/gpu/texture_image_transport_surface.h index 4d77725..913854c 100644 --- a/content/common/gpu/texture_image_transport_surface.h +++ b/content/common/gpu/texture_image_transport_surface.h @@ -10,7 +10,7 @@ #include "content/common/gpu/gpu_command_buffer_stub.h" #include "content/common/gpu/image_transport_surface.h" #include "gpu/command_buffer/service/texture_manager.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_surface.h" class GpuChannelManager; diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm index 7034bbc..679fddf 100644 --- a/content/common/sandbox_mac.mm +++ b/content/common/sandbox_mac.mm @@ -17,10 +17,10 @@ extern "C" { #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/mac/mac_util.h" -#include "base/rand_util_c.h" #include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/memory/scoped_nsobject.h" +#include "base/rand_util_c.h" #include "base/string16.h" #include "base/string_piece.h" #include "base/string_util.h" @@ -31,8 +31,8 @@ extern "C" { #include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "grit/content_resources.h" +#include "ui/gl/gl_surface.h" #include "unicode/uchar.h" -#include "ui/gfx/gl/gl_surface.h" namespace { diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc index bae313b..bdd50db 100644 --- a/content/common/sandbox_policy.cc +++ b/content/common/sandbox_policy.cc @@ -14,8 +14,8 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/win/iat_patch_function.h" #include "base/win/scoped_handle.h" #include "base/win/scoped_process_information.h" @@ -28,7 +28,7 @@ #include "sandbox/src/sandbox.h" #include "sandbox/src/sandbox_nt_util.h" #include "sandbox/src/win_utils.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_switches.h" static sandbox::BrokerServices* g_broker_services = NULL; static sandbox::TargetServices* g_target_services = NULL; diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 77488ba..74f19ab 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -917,7 +917,7 @@ }], ['ui_compositor_image_transport==1', { 'dependencies': [ - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', ], 'link_settings': { 'libraries': [ diff --git a/content/content_common.gypi b/content/content_common.gypi index a0ee418..b3aaaff 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -15,7 +15,7 @@ '../third_party/icu/icu.gyp:icuuc', '../third_party/npapi/npapi.gyp:npapi', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui', '../webkit/support/webkit_support.gyp:appcache', '../webkit/support/webkit_support.gyp:blob', @@ -392,7 +392,7 @@ ['OS=="win"', { 'dependencies': [ '../media/media.gyp:media', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', ], 'link_settings': { 'libraries': [ diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index c31b081..cda9ae0 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -6,7 +6,7 @@ 'dependencies': [ '../base/base.gyp:base', '../skia/skia.gyp:skia', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', ], 'sources': [ 'gpu/gpu_dx_diagnostics_win.cc', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 3ed669d..89ab73c 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -187,7 +187,7 @@ '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libvpx/libvpx.gyp:libvpx', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui', '../v8/tools/gyp/v8.gyp:v8', '../webkit/support/webkit_support.gyp:database', @@ -487,7 +487,7 @@ '../third_party/angle/src/build_angle.gyp:libEGL', '../third_party/angle/src/build_angle.gyp:libGLESv2', '../media/media.gyp:media', - '../ui/gfx/gl/gl.gyp:gl', + '../ui/gl/gl.gyp:gl', '../ui/ui.gyp:ui', ], 'conditions': [ diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index 9f482a9..7735275 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -13,12 +13,12 @@ #include "build/build_config.h" #include "content/common/child_process.h" #include "content/common/gpu/gpu_messages.h" -#include "content/public/common/content_switches.h" #include "content/gpu/gpu_info_collector.h" #include "content/gpu/gpu_watchdog_thread.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_sync_message_filter.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_implementation.h" const int kGpuTimeout = 10000; diff --git a/content/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc index ecdb189..86ae2f5 100644 --- a/content/gpu/gpu_info_collector.cc +++ b/content/gpu/gpu_info_collector.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -7,14 +7,14 @@ #include <string> #include <vector> -#include "base/memory/scoped_ptr.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_split.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_surface.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_surface.h" namespace { diff --git a/content/gpu/gpu_info_collector_linux.cc b/content/gpu/gpu_info_collector_linux.cc index 0fc224b..6608bb3 100644 --- a/content/gpu/gpu_info_collector_linux.cc +++ b/content/gpu/gpu_info_collector_linux.cc @@ -15,11 +15,11 @@ #include "base/string_split.h" #include "base/string_tokenizer.h" #include "base/string_util.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface.h" +#include "ui/gl/gl_switches.h" namespace { diff --git a/content/gpu/gpu_info_collector_mac.mm b/content/gpu/gpu_info_collector_mac.mm index bf284f6..8853bcd 100644 --- a/content/gpu/gpu_info_collector_mac.mm +++ b/content/gpu/gpu_info_collector_mac.mm @@ -11,10 +11,10 @@ #include "base/memory/scoped_ptr.h" #include "base/string_piece.h" #include "base/sys_string_conversions.h" -#include "ui/gfx/gl/gl_bindings.h" -#include "ui/gfx/gl/gl_context.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_interface.h" +#include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_context.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_interface.h" #import <Cocoa/Cocoa.h> #import <Foundation/Foundation.h> diff --git a/content/gpu/gpu_info_collector_unittest.cc b/content/gpu/gpu_info_collector_unittest.cc index 0d2b710..b21c514 100644 --- a/content/gpu/gpu_info_collector_unittest.cc +++ b/content/gpu/gpu_info_collector_unittest.cc @@ -8,7 +8,7 @@ #include "gpu/command_buffer/common/gl_mock.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/gl/gl_implementation.h" +#include "ui/gl/gl_implementation.h" using ::gfx::MockGLInterface; using ::testing::Return; diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc index 2ea0915..d17e0ef 100644 --- a/content/gpu/gpu_info_collector_win.cc +++ b/content/gpu/gpu_info_collector_win.cc @@ -17,8 +17,8 @@ #include "base/string_util.h" #include "base/win/scoped_com_initializer.h" #include "base/win/scoped_comptr.h" -#include "ui/gfx/gl/gl_implementation.h" -#include "ui/gfx/gl/gl_surface_egl.h" +#include "ui/gl/gl_implementation.h" +#include "ui/gl/gl_surface_egl.h" // ANGLE seems to require that main.h be included before any other ANGLE header. #include "libEGL/Display.h" diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 2694e76..c3882e1 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -16,15 +16,15 @@ #include "base/win/scoped_com_initializer.h" #include "build/build_config.h" #include "content/common/gpu/gpu_config.h" -#include "content/public/common/content_client.h" -#include "content/public/common/content_switches.h" -#include "content/public/common/main_function_params.h" #include "content/gpu/gpu_child_thread.h" #include "content/gpu/gpu_info_collector.h" #include "content/gpu/gpu_process.h" +#include "content/public/common/content_client.h" +#include "content/public/common/content_switches.h" +#include "content/public/common/main_function_params.h" #include "crypto/hmac.h" -#include "ui/gfx/gl/gl_surface.h" -#include "ui/gfx/gl/gl_switches.h" +#include "ui/gl/gl_surface.h" +#include "ui/gl/gl_switches.h" #if defined(OS_WIN) #include "content/common/gpu/media/dxva_video_decode_accelerator.h" diff --git a/content/plugin/webplugin_accelerated_surface_proxy_mac.h b/content/plugin/webplugin_accelerated_surface_proxy_mac.h index 6abf39f..c23082d 100644 --- a/content/plugin/webplugin_accelerated_surface_proxy_mac.h +++ b/content/plugin/webplugin_accelerated_surface_proxy_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "ui/gfx/gl/gpu_preference.h" +#include "ui/gl/gpu_preference.h" #include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h" class WebPluginProxy; diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h index b3d98fa..a4915f9 100644 --- a/content/plugin/webplugin_proxy.h +++ b/content/plugin/webplugin_proxy.h @@ -23,7 +23,7 @@ #if defined(USE_X11) #include "ui/base/x/x11_util.h" #endif -#include "ui/gfx/gl/gpu_preference.h" +#include "ui/gl/gpu_preference.h" #include "ui/surface/transport_dib.h" #include "webkit/plugins/npapi/webplugin.h" diff --git a/content/renderer/pepper/pepper_platform_context_3d_impl.cc b/content/renderer/pepper/pepper_platform_context_3d_impl.cc index d0cc174..8e2f96a 100644 --- a/content/renderer/pepper/pepper_platform_context_3d_impl.cc +++ b/content/renderer/pepper/pepper_platform_context_3d_impl.cc @@ -14,7 +14,7 @@ #include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/ipc/command_buffer_proxy.h" #include "ppapi/c/pp_graphics_3d.h" -#include "ui/gfx/gl/gpu_preference.h" +#include "ui/gl/gpu_preference.h" #ifdef ENABLE_GPU diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index c439a52..7d38cb2 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -34,10 +34,10 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/skia/include/core/SkShader.h" #include "third_party/skia/include/effects/SkTableColorFilter.h" -#include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/point.h" #include "ui/gfx/size.h" #include "ui/gfx/skia_util.h" +#include "ui/gl/gl_switches.h" #include "ui/surface/transport_dib.h" #include "webkit/glue/webkit_glue.h" #include "webkit/plugins/npapi/webplugin.h" diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc index 48280745..27293e1 100644 --- a/content/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.cc @@ -15,7 +15,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" -#include "ui/gfx/gl/gpu_preference.h" +#include "ui/gl/gpu_preference.h" #include "webkit/plugins/ppapi/plugin_delegate.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" |