diff options
Diffstat (limited to 'content/common')
21 files changed, 52 insertions, 52 deletions
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; |