diff options
Diffstat (limited to 'content/common')
31 files changed, 33 insertions, 33 deletions
diff --git a/content/common/browser_plugin/browser_plugin_messages.h b/content/common/browser_plugin/browser_plugin_messages.h index f514018..5fe5402 100644 --- a/content/common/browser_plugin/browser_plugin_messages.h +++ b/content/common/browser_plugin/browser_plugin_messages.h @@ -24,8 +24,8 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/ipc/gfx_param_traits.h" -#include "ui/gfx/size.h" #include "url/gurl.h" #undef IPC_MESSAGE_EXPORT diff --git a/content/common/cursors/webcursor.h b/content/common/cursors/webcursor.h index 6c73337..cd78c58 100644 --- a/content/common/cursors/webcursor.h +++ b/content/common/cursors/webcursor.h @@ -12,8 +12,8 @@ #include "third_party/WebKit/public/platform/WebCursorInfo.h" #include "ui/gfx/display.h" #include "ui/gfx/geometry/point.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #if defined(USE_AURA) #include "ui/base/cursor/cursor.h" diff --git a/content/common/cursors/webcursor_mac.mm b/content/common/cursors/webcursor_mac.mm index 3a52d83..3f40610 100644 --- a/content/common/cursors/webcursor_mac.mm +++ b/content/common/cursors/webcursor_mac.mm @@ -16,8 +16,8 @@ #include "third_party/WebKit/public/platform/WebCursorInfo.h" #include "third_party/WebKit/public/platform/WebSize.h" #include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" #include "ui/gfx/image/image.h" -#include "ui/gfx/size_conversions.h" using blink::WebCursorInfo; using blink::WebSize; diff --git a/content/common/drag_messages.h b/content/common/drag_messages.h index 2be7a3b..3db2428 100644 --- a/content/common/drag_messages.h +++ b/content/common/drag_messages.h @@ -12,7 +12,7 @@ #include "third_party/WebKit/public/web/WebDragOperation.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" #define IPC_MESSAGE_START DragMsgStart diff --git a/content/common/gpu/client/command_buffer_proxy_impl.cc b/content/common/gpu/client/command_buffer_proxy_impl.cc index 3364883..a3cd9dd 100644 --- a/content/common/gpu/client/command_buffer_proxy_impl.cc +++ b/content/common/gpu/client/command_buffer_proxy_impl.cc @@ -20,7 +20,7 @@ #include "gpu/command_buffer/common/command_buffer_shared.h" #include "gpu/command_buffer/common/gpu_memory_allocation.h" #include "gpu/command_buffer/service/image_factory.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_bindings.h" namespace content { diff --git a/content/common/gpu/client/gl_helper.cc b/content/common/gpu/client/gl_helper.cc index 8e98df4..7178acc 100644 --- a/content/common/gpu/client/gl_helper.cc +++ b/content/common/gpu/client/gl_helper.cc @@ -25,7 +25,7 @@ #include "media/base/video_util.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using gpu::gles2::GLES2Interface; diff --git a/content/common/gpu/client/gl_helper_scaling.cc b/content/common/gpu/client/gl_helper_scaling.cc index 82b0203..d21a7d6 100644 --- a/content/common/gpu/client/gl_helper_scaling.cc +++ b/content/common/gpu/client/gl_helper_scaling.cc @@ -18,7 +18,7 @@ #include "gpu/command_buffer/client/gles2_interface.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" using gpu::gles2::GLES2Interface; diff --git a/content/common/gpu/client/gl_helper_scaling.h b/content/common/gpu/client/gl_helper_scaling.h index dba58e8..af7b7fc 100644 --- a/content/common/gpu/client/gl_helper_scaling.h +++ b/content/common/gpu/client/gl_helper_scaling.h @@ -11,7 +11,7 @@ #include "content/common/gpu/client/gl_helper.h" #include "ui/gfx/geometry/rect.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/gpu/client/gpu_channel_host.h b/content/common/gpu/client/gpu_channel_host.h index 9a73476..877baa0 100644 --- a/content/common/gpu/client/gpu_channel_host.h +++ b/content/common/gpu/client/gpu_channel_host.h @@ -23,9 +23,9 @@ #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_sync_channel.h" #include "ipc/message_filter.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/gl/gpu_preference.h" class GURL; diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.h b/content/common/gpu/client/gpu_memory_buffer_impl.h index dc792246..e5dea69 100644 --- a/content/common/gpu/client/gpu_memory_buffer_impl.h +++ b/content/common/gpu/client/gpu_memory_buffer_impl.h @@ -8,8 +8,8 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" -#include "ui/gfx/size.h" namespace content { diff --git a/content/common/gpu/client/gpu_video_decode_accelerator_host.h b/content/common/gpu/client/gpu_video_decode_accelerator_host.h index 4cbeeb1..e70053d 100644 --- a/content/common/gpu/client/gpu_video_decode_accelerator_host.h +++ b/content/common/gpu/client/gpu_video_decode_accelerator_host.h @@ -12,7 +12,7 @@ #include "content/common/gpu/client/command_buffer_proxy_impl.h" #include "ipc/ipc_listener.h" #include "media/video/video_decode_accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { class GpuChannelHost; diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h index 0db58ef..2054b18 100644 --- a/content/common/gpu/gpu_channel.h +++ b/content/common/gpu/gpu_channel.h @@ -21,8 +21,8 @@ #include "content/common/message_router.h" #include "gpu/command_buffer/service/valuebuffer_manager.h" #include "ipc/ipc_sync_channel.h" +#include "ui/gfx/geometry/size.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" diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h index 34701b7..2fad94a 100644 --- a/content/common/gpu/gpu_command_buffer_stub.h +++ b/content/common/gpu/gpu_command_buffer_stub.h @@ -24,9 +24,9 @@ #include "ipc/ipc_sender.h" #include "media/base/video_decoder_config.h" #include "ui/events/latency_info.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/gl/gl_surface.h" #include "ui/gl/gpu_preference.h" #include "url/gurl.h" diff --git a/content/common/gpu/gpu_memory_manager_client.h b/content/common/gpu/gpu_memory_manager_client.h index 2058e46..0c6c7d0 100644 --- a/content/common/gpu/gpu_memory_manager_client.h +++ b/content/common/gpu/gpu_memory_manager_client.h @@ -11,7 +11,7 @@ #include "content/common/content_export.h" #include "gpu/command_buffer/common/gpu_memory_allocation.h" #include "gpu/command_buffer/service/memory_tracking.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/gpu/gpu_memory_manager_unittest.cc b/content/common/gpu/gpu_memory_manager_unittest.cc index 18ebce2..d0237fb 100644 --- a/content/common/gpu/gpu_memory_manager_unittest.cc +++ b/content/common/gpu/gpu_memory_manager_unittest.cc @@ -3,12 +3,12 @@ // found in the LICENSE file. #include "content/common/gpu/gpu_memory_manager.h" + #include "content/common/gpu/gpu_memory_manager_client.h" #include "content/common/gpu/gpu_memory_tracking.h" #include "gpu/command_buffer/common/gpu_memory_allocation.h" -#include "ui/gfx/size_conversions.h" - #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/geometry/size_conversions.h" using gpu::MemoryAllocation; diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h index 07510b1..6e32684 100644 --- a/content/common/gpu/gpu_messages.h +++ b/content/common/gpu/gpu_messages.h @@ -30,9 +30,9 @@ #include "media/video/video_decode_accelerator.h" #include "media/video/video_encode_accelerator.h" #include "ui/events/latency_info.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/gl/gpu_preference.h" #if defined(OS_ANDROID) diff --git a/content/common/gpu/image_transport_surface.h b/content/common/gpu/image_transport_surface.h index 6038f5d..f87d9d8 100644 --- a/content/common/gpu/image_transport_surface.h +++ b/content/common/gpu/image_transport_surface.h @@ -17,8 +17,8 @@ #include "ipc/ipc_message.h" #include "ui/events/latency_info.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" #include "ui/gl/gl_surface.h" struct AcceleratedSurfaceMsg_BufferPresented_Params; diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc index 3d3a437..34f996e 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.cc +++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc @@ -40,7 +40,7 @@ #include "content/common/gpu/media/android_video_decode_accelerator.h" #endif -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h index e59a76f..3496e2f 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.h +++ b/content/common/gpu/media/gpu_video_decode_accelerator.h @@ -17,7 +17,7 @@ #include "ipc/ipc_listener.h" #include "ipc/ipc_sender.h" #include "media/video/video_decode_accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { class MessageLoopProxy; diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.h b/content/common/gpu/media/gpu_video_encode_accelerator.h index ca60f6f..582333a 100644 --- a/content/common/gpu/media/gpu_video_encode_accelerator.h +++ b/content/common/gpu/media/gpu_video_encode_accelerator.h @@ -13,7 +13,7 @@ #include "gpu/config/gpu_info.h" #include "ipc/ipc_listener.h" #include "media/video/video_encode_accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { diff --git a/content/common/gpu/media/v4l2_video_decode_accelerator.h b/content/common/gpu/media/v4l2_video_decode_accelerator.h index 9b97310..0171479 100644 --- a/content/common/gpu/media/v4l2_video_decode_accelerator.h +++ b/content/common/gpu/media/v4l2_video_decode_accelerator.h @@ -23,7 +23,7 @@ #include "media/base/video_decoder_config.h" #include "media/video/picture.h" #include "media/video/video_decode_accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_bindings.h" namespace base { diff --git a/content/common/gpu/media/v4l2_video_device.h b/content/common/gpu/media/v4l2_video_device.h index f4b368f..346dff1 100644 --- a/content/common/gpu/media/v4l2_video_device.h +++ b/content/common/gpu/media/v4l2_video_device.h @@ -11,7 +11,7 @@ #include "media/base/video_decoder_config.h" #include "media/base/video_frame.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_bindings.h" namespace content { diff --git a/content/common/gpu/media/v4l2_video_encode_accelerator.h b/content/common/gpu/media/v4l2_video_encode_accelerator.h index 267d0d0..b77f936 100644 --- a/content/common/gpu/media/v4l2_video_encode_accelerator.h +++ b/content/common/gpu/media/v4l2_video_encode_accelerator.h @@ -5,8 +5,8 @@ #ifndef CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_ENCODE_ACCELERATOR_H_ #define CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_ENCODE_ACCELERATOR_H_ -#include <list> #include <linux/videodev2.h> +#include <list> #include <vector> #include "base/memory/linked_ptr.h" @@ -16,7 +16,7 @@ #include "content/common/gpu/media/v4l2_image_processor.h" #include "content/common/gpu/media/v4l2_video_device.h" #include "media/video/video_encode_accelerator.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace base { diff --git a/content/common/gpu/media/va_surface.h b/content/common/gpu/media/va_surface.h index 5934bc5..c76c11f 100644 --- a/content/common/gpu/media/va_surface.h +++ b/content/common/gpu/media/va_surface.h @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "third_party/libva/va/va.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/gpu/media/vaapi_picture.h b/content/common/gpu/media/vaapi_picture.h index fbb41bf..44d9db7 100644 --- a/content/common/gpu/media/vaapi_picture.h +++ b/content/common/gpu/media/vaapi_picture.h @@ -14,7 +14,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/threading/non_thread_safe.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/gpu/media/vaapi_tfp_picture.h b/content/common/gpu/media/vaapi_tfp_picture.h index c6deba4..02a1a23 100644 --- a/content/common/gpu/media/vaapi_tfp_picture.h +++ b/content/common/gpu/media/vaapi_tfp_picture.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "content/common/gpu/media/vaapi_picture.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/gl_bindings.h" namespace gfx { diff --git a/content/common/gpu/media/vaapi_wrapper.h b/content/common/gpu/media/vaapi_wrapper.h index c4e72a4..fe53552 100644 --- a/content/common/gpu/media/vaapi_wrapper.h +++ b/content/common/gpu/media/vaapi_wrapper.h @@ -21,7 +21,7 @@ #include "media/base/video_frame.h" #include "third_party/libva/va/va.h" #include "third_party/libva/va/va_vpp.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #if defined(USE_X11) #include "third_party/libva/va/va_x11.h" #endif // USE_X11 diff --git a/content/common/gpu/stream_texture_android.cc b/content/common/gpu/stream_texture_android.cc index eb7f3bb..5985821 100644 --- a/content/common/gpu/stream_texture_android.cc +++ b/content/common/gpu/stream_texture_android.cc @@ -12,7 +12,7 @@ #include "gpu/command_buffer/service/context_state.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" #include "gpu/command_buffer/service/texture_manager.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #include "ui/gl/scoped_make_current.h" namespace content { diff --git a/content/common/host_shared_bitmap_manager.cc b/content/common/host_shared_bitmap_manager.cc index 8182e0b..778260b 100644 --- a/content/common/host_shared_bitmap_manager.cc +++ b/content/common/host_shared_bitmap_manager.cc @@ -7,7 +7,7 @@ #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "content/common/view_messages.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace content { diff --git a/content/common/image_messages.h b/content/common/image_messages.h index f2f734d..b886908 100644 --- a/content/common/image_messages.h +++ b/content/common/image_messages.h @@ -9,7 +9,7 @@ #include "ipc/ipc_message_macros.h" #include "ipc/ipc_param_traits.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" #define IPC_MESSAGE_START ImageMsgStart diff --git a/content/common/input/synthetic_smooth_scroll_gesture_params.h b/content/common/input/synthetic_smooth_scroll_gesture_params.h index 813d06d..1fd0b30 100644 --- a/content/common/input/synthetic_smooth_scroll_gesture_params.h +++ b/content/common/input/synthetic_smooth_scroll_gesture_params.h @@ -10,7 +10,7 @@ #include "content/common/content_export.h" #include "content/common/input/synthetic_gesture_params.h" #include "ui/gfx/geometry/point.h" -#include "ui/gfx/vector2d.h" +#include "ui/gfx/geometry/vector2d.h" namespace content { |