diff options
Diffstat (limited to 'content')
19 files changed, 34 insertions, 34 deletions
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc index a54740b..2b11d68 100644 --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc @@ -16,11 +16,11 @@ #include "base/logging.h" #include "base/synchronization/lock.h" #include "cc/base/thread_impl.h" -#include "cc/context_provider.h" #include "cc/input_handler.h" #include "cc/layer.h" #include "cc/layer_tree_host.h" -#include "cc/output_surface.h" +#include "cc/output/context_provider.h" +#include "cc/output/output_surface.h" #include "content/browser/gpu/browser_gpu_channel_host_factory.h" #include "content/browser/gpu/gpu_surface_tracker.h" #include "content/browser/renderer_host/image_transport_factory_android.h" diff --git a/content/browser/renderer_host/image_transport_factory.cc b/content/browser/renderer_host/image_transport_factory.cc index 83fde5a..8068df8 100644 --- a/content/browser/renderer_host/image_transport_factory.cc +++ b/content/browser/renderer_host/image_transport_factory.cc @@ -14,8 +14,8 @@ #include "base/observer_list.h" #include "base/strings/string_number_conversions.h" #include "base/threading/non_thread_safe.h" -#include "cc/output_surface.h" -#include "cc/output_surface_client.h" +#include "cc/output/output_surface.h" +#include "cc/output/output_surface_client.h" #include "content/browser/gpu/browser_gpu_channel_host_factory.h" #include "content/browser/gpu/gpu_data_manager_impl.h" #include "content/browser/gpu/gpu_process_host.h" diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 2c9d0d2..dd75bf5 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -17,8 +17,8 @@ #include "base/metrics/histogram.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" -#include "cc/compositor_frame.h" -#include "cc/compositor_frame_ack.h" +#include "cc/output/compositor_frame.h" +#include "cc/output/compositor_frame_ack.h" #include "content/browser/accessibility/browser_accessibility_state_impl.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/gpu/gpu_process_host_ui_shim.h" diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index ce70582..fd4740d 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -10,9 +10,9 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "cc/compositor_frame.h" -#include "cc/compositor_frame_ack.h" #include "cc/layer.h" +#include "cc/output/compositor_frame.h" +#include "cc/output/compositor_frame_ack.h" #include "cc/texture_layer.h" #include "content/browser/android/content_view_core_impl.h" #include "content/browser/gpu/gpu_surface_tracker.h" @@ -23,11 +23,11 @@ #include "content/common/gpu/client/gl_helper.h" #include "content/common/gpu/gpu_messages.h" #include "content/common/view_messages.h" -#include "third_party/khronos/GLES2/gl2.h" -#include "third_party/khronos/GLES2/gl2ext.h" #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayer.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" +#include "third_party/khronos/GLES2/gl2.h" +#include "third_party/khronos/GLES2/gl2ext.h" #include "ui/gfx/android/device_display_info.h" #include "ui/gfx/android/java_bitmap.h" #include "ui/gfx/display.h" diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index e7416cc..88cd26a 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -11,8 +11,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" -#include "cc/compositor_frame.h" -#include "cc/compositor_frame_ack.h" +#include "cc/output/compositor_frame.h" +#include "cc/output/compositor_frame_ack.h" #include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/accessibility/browser_accessibility_state_impl.h" #include "content/browser/renderer_host/backing_store_aura.h" diff --git a/content/browser/renderer_host/software_output_device_win.h b/content/browser/renderer_host/software_output_device_win.h index ab8f6bf..b98020e 100644 --- a/content/browser/renderer_host/software_output_device_win.h +++ b/content/browser/renderer_host/software_output_device_win.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_SOFTWARE_OUTPUT_DEVICE_WIN_H_ #define CONTENT_BROWSER_RENDERER_HOST_SOFTWARE_OUTPUT_DEVICE_WIN_H_ -#include "cc/software_output_device.h" +#include "cc/output/software_output_device.h" #include <windows.h> diff --git a/content/browser/renderer_host/software_output_device_x11.h b/content/browser/renderer_host/software_output_device_x11.h index acacd4d..3c3275c 100644 --- a/content/browser/renderer_host/software_output_device_x11.h +++ b/content/browser/renderer_host/software_output_device_x11.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_SOFTWARE_OUTPUT_DEVICE_X11_H_ #define CONTENT_BROWSER_RENDERER_HOST_SOFTWARE_OUTPUT_DEVICE_X11_H_ -#include "cc/software_output_device.h" +#include "cc/output/software_output_device.h" #include "ui/base/x/x11_util.h" namespace ui { diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc index b8818f0..5ec8ae8 100644 --- a/content/common/cc_messages.cc +++ b/content/common/cc_messages.cc @@ -4,7 +4,7 @@ #include "content/common/cc_messages.h" -#include "cc/compositor_frame.h" +#include "cc/output/compositor_frame.h" #include "content/public/common/common_param_traits.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h" diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h index b112e5d..bfb6796 100644 --- a/content/common/cc_messages.h +++ b/content/common/cc_messages.h @@ -5,11 +5,11 @@ // IPC Messages sent between compositor instances. #include "cc/checkerboard_draw_quad.h" -#include "cc/compositor_frame.h" -#include "cc/compositor_frame_ack.h" #include "cc/debug_border_draw_quad.h" #include "cc/draw_quad.h" #include "cc/io_surface_draw_quad.h" +#include "cc/output/compositor_frame.h" +#include "cc/output/compositor_frame_ack.h" #include "cc/render_pass.h" #include "cc/render_pass_draw_quad.h" #include "cc/shared_quad_state.h" diff --git a/content/common/cc_messages_unittest.cc b/content/common/cc_messages_unittest.cc index f75e8ed..d843e4b 100644 --- a/content/common/cc_messages_unittest.cc +++ b/content/common/cc_messages_unittest.cc @@ -6,7 +6,7 @@ #include <string.h> -#include "cc/compositor_frame.h" +#include "cc/output/compositor_frame.h" #include "ipc/ipc_message.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/common/gpu/client/context_provider_command_buffer.h b/content/common/gpu/client/context_provider_command_buffer.h index 8134ac9..acb9303 100644 --- a/content/common/gpu/client/context_provider_command_buffer.h +++ b/content/common/gpu/client/context_provider_command_buffer.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" -#include "cc/context_provider.h" +#include "cc/output/context_provider.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" namespace webkit { diff --git a/content/common/view_messages.h b/content/common/view_messages.h index c186f21..0b2a13a 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -8,8 +8,8 @@ #include "base/process.h" #include "base/shared_memory.h" #include "base/string16.h" -#include "cc/compositor_frame.h" -#include "cc/compositor_frame_ack.h" +#include "cc/output/compositor_frame.h" +#include "cc/output/compositor_frame_ack.h" #include "content/common/content_export.h" #include "content/common/content_param_traits.h" #include "content/common/edit_command.h" @@ -34,7 +34,6 @@ #include "media/audio/audio_parameters.h" #include "media/base/channel_layout.h" #include "media/base/media_log_event.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" @@ -45,6 +44,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/ime/text_input_type.h" #include "ui/base/range/range.h" #include "ui/gfx/point.h" diff --git a/content/port/browser/render_widget_host_view_port.h b/content/port/browser/render_widget_host_view_port.h index 9ab3224..9f617dd 100644 --- a/content/port/browser/render_widget_host_view_port.h +++ b/content/port/browser/render_widget_host_view_port.h @@ -8,7 +8,7 @@ #include "base/callback.h" #include "base/process_util.h" #include "base/string16.h" -#include "cc/compositor_frame.h" +#include "cc/output/compositor_frame.h" #include "content/common/content_export.h" #include "content/port/common/input_event_ack_state.h" #include "content/public/browser/render_widget_host_view.h" diff --git a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc index 06302af..1bc9a7b 100644 --- a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc +++ b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc @@ -4,16 +4,16 @@ #include "content/renderer/browser_plugin/browser_plugin_compositing_helper.h" -#include "cc/context_provider.h" +#include "cc/output/context_provider.h" #include "cc/solid_color_layer.h" #include "cc/texture_layer.h" #include "content/common/browser_plugin/browser_plugin_messages.h" #include "content/common/gpu/client/context_provider_command_buffer.h" #include "content/renderer/browser_plugin/browser_plugin_manager.h" #include "content/renderer/render_thread_impl.h" -#include "third_party/khronos/GLES2/gl2.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" +#include "third_party/khronos/GLES2/gl2.h" #include "ui/gfx/size_conversions.h" #include "webkit/compositor_bindings/web_layer_impl.h" diff --git a/content/renderer/gpu/compositor_output_surface.cc b/content/renderer/gpu/compositor_output_surface.cc index da0bd2a..cc55ffa 100644 --- a/content/renderer/gpu/compositor_output_surface.cc +++ b/content/renderer/gpu/compositor_output_surface.cc @@ -6,9 +6,9 @@ #include "base/command_line.h" #include "base/message_loop_proxy.h" -#include "cc/compositor_frame.h" -#include "cc/compositor_frame_ack.h" -#include "cc/output_surface_client.h" +#include "cc/output/compositor_frame.h" +#include "cc/output/compositor_frame_ack.h" +#include "cc/output/output_surface_client.h" #include "content/common/view_messages.h" #include "content/public/common/content_switches.h" #include "content/renderer/render_thread_impl.h" diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h index 896325c..255c618 100644 --- a/content/renderer/gpu/compositor_output_surface.h +++ b/content/renderer/gpu/compositor_output_surface.h @@ -12,7 +12,7 @@ #include "base/threading/non_thread_safe.h" #include "base/threading/platform_thread.h" #include "base/time.h" -#include "cc/output_surface.h" +#include "cc/output/output_surface.h" namespace base { class TaskRunner; diff --git a/content/renderer/gpu/compositor_software_output_device_gl_adapter.h b/content/renderer/gpu/compositor_software_output_device_gl_adapter.h index 85e7af4..7775893 100644 --- a/content/renderer/gpu/compositor_software_output_device_gl_adapter.h +++ b/content/renderer/gpu/compositor_software_output_device_gl_adapter.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" -#include "cc/software_output_device.h" +#include "cc/output/software_output_device.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" namespace content { diff --git a/content/renderer/gpu/mailbox_output_surface.cc b/content/renderer/gpu/mailbox_output_surface.cc index 8d713c8..072efba 100644 --- a/content/renderer/gpu/mailbox_output_surface.cc +++ b/content/renderer/gpu/mailbox_output_surface.cc @@ -5,9 +5,9 @@ #include "content/renderer/gpu/mailbox_output_surface.h" #include "base/logging.h" -#include "cc/compositor_frame.h" -#include "cc/compositor_frame_ack.h" -#include "cc/gl_frame_data.h" +#include "cc/output/compositor_frame.h" +#include "cc/output/compositor_frame_ack.h" +#include "cc/output/gl_frame_data.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index 64f0cc1..8b19258 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -18,7 +18,7 @@ #include "cc/base/thread.h" #include "cc/base/thread_impl.h" #include "cc/layer_tree_host.h" -#include "cc/output_surface.h" +#include "cc/output/output_surface.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" #include "content/common/swapped_out_messages.h" #include "content/common/view_messages.h" |