diff options
Diffstat (limited to 'chrome/browser/renderer_host')
21 files changed, 26 insertions, 26 deletions
diff --git a/chrome/browser/renderer_host/accelerated_surface_container_mac.cc b/chrome/browser/renderer_host/accelerated_surface_container_mac.cc index 66e8b4c..8d3827c 100644 --- a/chrome/browser/renderer_host/accelerated_surface_container_mac.cc +++ b/chrome/browser/renderer_host/accelerated_surface_container_mac.cc @@ -4,10 +4,10 @@ #include "chrome/browser/renderer_host/accelerated_surface_container_mac.h" +#include "app/surface/io_surface_support_mac.h" #include "base/logging.h" #include "webkit/glue/webplugin.h" #include "chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h" -#include "chrome/common/io_surface_support_mac.h" AcceleratedSurfaceContainerMac::AcceleratedSurfaceContainerMac() : x_(0), diff --git a/chrome/browser/renderer_host/accelerated_surface_container_mac.h b/chrome/browser/renderer_host/accelerated_surface_container_mac.h index 393487f..5f2d12e 100644 --- a/chrome/browser/renderer_host/accelerated_surface_container_mac.h +++ b/chrome/browser/renderer_host/accelerated_surface_container_mac.h @@ -28,9 +28,9 @@ #include <CoreFoundation/CoreFoundation.h> #include <OpenGL/OpenGL.h> +#include "app/surface/transport_dib.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "chrome/common/transport_dib.h" #include "gfx/native_widget_types.h" #include "gfx/rect.h" diff --git a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h index 8bc44b5..2456186 100644 --- a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h +++ b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h @@ -9,8 +9,8 @@ #include <map> #include <vector> +#include "app/surface/transport_dib.h" #include "base/basictypes.h" -#include "chrome/common/transport_dib.h" #include "gfx/native_widget_types.h" namespace webkit_glue { diff --git a/chrome/browser/renderer_host/backing_store.h b/chrome/browser/renderer_host/backing_store.h index d405025..34739c8 100644 --- a/chrome/browser/renderer_host/backing_store.h +++ b/chrome/browser/renderer_host/backing_store.h @@ -7,9 +7,9 @@ #include <vector> +#include "app/surface/transport_dib.h" #include "base/basictypes.h" #include "base/process.h" -#include "chrome/common/transport_dib.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/chrome/browser/renderer_host/backing_store_mac.mm b/chrome/browser/renderer_host/backing_store_mac.mm index 1324593..d5cc992 100644 --- a/chrome/browser/renderer_host/backing_store_mac.mm +++ b/chrome/browser/renderer_host/backing_store_mac.mm @@ -6,12 +6,12 @@ #include "chrome/browser/renderer_host/backing_store_mac.h" +#include "app/surface/transport_dib.h" #include "base/logging.h" #include "base/mac_util.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" -#include "chrome/common/transport_dib.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/chrome/browser/renderer_host/backing_store_manager.h b/chrome/browser/renderer_host/backing_store_manager.h index ca187ab..660b08a 100644 --- a/chrome/browser/renderer_host/backing_store_manager.h +++ b/chrome/browser/renderer_host/backing_store_manager.h @@ -7,9 +7,9 @@ #include <vector> +#include "app/surface/transport_dib.h" #include "base/basictypes.h" #include "base/process.h" -#include "chrome/common/transport_dib.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/chrome/browser/renderer_host/backing_store_win.cc b/chrome/browser/renderer_host/backing_store_win.cc index c1e77f0..e41ad43 100644 --- a/chrome/browser/renderer_host/backing_store_win.cc +++ b/chrome/browser/renderer_host/backing_store_win.cc @@ -4,11 +4,11 @@ #include "chrome/browser/renderer_host/backing_store_win.h" +#include "app/surface/transport_dib.h" #include "base/command_line.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/transport_dib.h" #include "gfx/gdi_util.h" #include "skia/ext/platform_canvas.h" diff --git a/chrome/browser/renderer_host/backing_store_x.cc b/chrome/browser/renderer_host/backing_store_x.cc index 788e351..d88dca7 100644 --- a/chrome/browser/renderer_host/backing_store_x.cc +++ b/chrome/browser/renderer_host/backing_store_x.cc @@ -17,14 +17,14 @@ #include <algorithm> #include <utility> +#include "app/surface/transport_dib.h" +#include "app/x11_util.h" +#include "app/x11_util_internal.h" #include "base/compiler_specific.h" #include "base/histogram.h" #include "base/logging.h" #include "base/time.h" #include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/common/transport_dib.h" -#include "chrome/common/x11_util.h" -#include "chrome/common/x11_util_internal.h" #include "gfx/rect.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/renderer_host/backing_store_x.h b/chrome/browser/renderer_host/backing_store_x.h index e5b3281..0570789 100644 --- a/chrome/browser/renderer_host/backing_store_x.h +++ b/chrome/browser/renderer_host/backing_store_x.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_BACKING_STORE_X_H_ #define CHROME_BROWSER_RENDERER_HOST_BACKING_STORE_X_H_ +#include "app/x11_util.h" #include "base/basictypes.h" #include "build/build_config.h" #include "chrome/browser/renderer_host/backing_store.h" -#include "chrome/common/x11_util.h" typedef struct _GdkDrawable GdkDrawable; class SkBitmap; diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h index d9acccb..277a53e 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.h +++ b/chrome/browser/renderer_host/browser_render_process_host.h @@ -11,10 +11,10 @@ #include <queue> #include <string> +#include "app/surface/transport_dib.h" #include "base/process.h" #include "base/scoped_ptr.h" #include "base/timer.h" -#include "chrome/common/transport_dib.h" #include "chrome/browser/child_process_launcher.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/renderer_host/render_process_host.h b/chrome/browser/renderer_host/render_process_host.h index 9835776..1ceeb42 100644 --- a/chrome/browser/renderer_host/render_process_host.h +++ b/chrome/browser/renderer_host/render_process_host.h @@ -8,11 +8,11 @@ #include <set> #include <string> +#include "app/surface/transport_dib.h" #include "base/id_map.h" #include "base/process.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "chrome/common/transport_dib.h" #include "chrome/common/visitedlink_common.h" #include "ipc/ipc_sync_channel.h" diff --git a/chrome/browser/renderer_host/render_widget_helper.h b/chrome/browser/renderer_host/render_widget_helper.h index d7e863e..1fa5973 100644 --- a/chrome/browser/renderer_host/render_widget_helper.h +++ b/chrome/browser/renderer_host/render_widget_helper.h @@ -7,13 +7,13 @@ #include <map> +#include "app/surface/transport_dib.h" #include "base/atomic_sequence_num.h" #include "base/hash_tables.h" #include "base/process.h" #include "base/ref_counted.h" #include "base/lock.h" #include "base/waitable_event.h" -#include "chrome/common/transport_dib.h" namespace IPC { class Message; diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h index 3309fbb..5c95535 100644 --- a/chrome/browser/renderer_host/render_widget_host.h +++ b/chrome/browser/renderer_host/render_widget_host.h @@ -7,6 +7,7 @@ #include <deque> +#include "app/surface/transport_dib.h" #include "base/process.h" #include "base/scoped_ptr.h" #include "base/string16.h" @@ -14,7 +15,6 @@ #include "chrome/common/edit_command.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/property_bag.h" -#include "chrome/common/transport_dib.h" #include "gfx/native_widget_types.h" #include "gfx/size.h" #include "ipc/ipc_channel.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view.h b/chrome/browser/renderer_host/render_widget_host_view.h index ad8a341..ee2fb78 100644 --- a/chrome/browser/renderer_host/render_widget_host_view.h +++ b/chrome/browser/renderer_host/render_widget_host_view.h @@ -9,8 +9,8 @@ #include <OpenGL/OpenGL.h> #endif +#include "app/surface/transport_dib.h" #include "base/shared_memory.h" -#include "chrome/common/transport_dib.h" #include "gfx/native_widget_types.h" #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/webplugin.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc index 0c10ef3..e6c476e9 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc @@ -19,6 +19,7 @@ #include <string> #include "app/l10n_util.h" +#include "app/x11_util.h" #include "base/command_line.h" #include "base/logging.h" #include "base/message_loop.h" @@ -34,7 +35,6 @@ #include "chrome/browser/renderer_host/video_layer_x.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/native_web_keyboard_event.h" -#include "chrome/common/x11_util.h" #include "gfx/gtk_util.h" #include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h" #include "webkit/glue/webcursor_gtk_data.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index 1c04b36..c671881 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -6,6 +6,7 @@ #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" +#include "app/surface/io_surface_support_mac.h" #import "base/chrome_application_mac.h" #include "base/histogram.h" #import "base/scoped_nsobject.h" @@ -23,7 +24,6 @@ #include "chrome/common/edit_command.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" -#include "chrome/common/io_surface_support_mac.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h" #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h index 419a1ab..c903f6e 100644 --- a/chrome/browser/renderer_host/resource_message_filter.h +++ b/chrome/browser/renderer_host/resource_message_filter.h @@ -13,6 +13,7 @@ #include <vector> #include "app/clipboard/clipboard.h" +#include "app/surface/transport_dib.h" #include "base/callback.h" #include "base/file_path.h" #include "base/process.h" @@ -27,7 +28,6 @@ #include "chrome/common/nacl_types.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/render_messages.h" -#include "chrome/common/transport_dib.h" #include "gfx/native_widget_types.h" #include "gfx/rect.h" #include "ipc/ipc_channel_proxy.h" diff --git a/chrome/browser/renderer_host/resource_message_filter_gtk.cc b/chrome/browser/renderer_host/resource_message_filter_gtk.cc index 93b5f47..3a64462 100644 --- a/chrome/browser/renderer_host/resource_message_filter_gtk.cc +++ b/chrome/browser/renderer_host/resource_message_filter_gtk.cc @@ -9,6 +9,7 @@ #include "app/clipboard/clipboard.h" #include "app/l10n_util.h" +#include "app/x11_util.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/singleton.h" @@ -18,7 +19,6 @@ #endif #include "chrome/common/chrome_paths.h" #include "chrome/common/render_messages.h" -#include "chrome/common/x11_util.h" #include "gfx/gtk_native_view_id_manager.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/renderer_host/video_layer.h b/chrome/browser/renderer_host/video_layer.h index 66618cf..69f0702 100644 --- a/chrome/browser/renderer_host/video_layer.h +++ b/chrome/browser/renderer_host/video_layer.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_H_ #define CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_H_ +#include "app/surface/transport_dib.h" #include "base/scoped_ptr.h" -#include "chrome/common/transport_dib.h" #include "gfx/size.h" class RenderProcessHost; diff --git a/chrome/browser/renderer_host/video_layer_x.cc b/chrome/browser/renderer_host/video_layer_x.cc index ddd2c21..c204b95 100644 --- a/chrome/browser/renderer_host/video_layer_x.cc +++ b/chrome/browser/renderer_host/video_layer_x.cc @@ -4,8 +4,8 @@ #include "chrome/browser/renderer_host/video_layer_x.h" +#include "app/x11_util_internal.h" #include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/common/x11_util_internal.h" #include "media/base/yuv_convert.h" VideoLayerX::VideoLayerX(RenderWidgetHost* widget, diff --git a/chrome/browser/renderer_host/video_layer_x.h b/chrome/browser/renderer_host/video_layer_x.h index ef97f30..a3c51b3 100644 --- a/chrome/browser/renderer_host/video_layer_x.h +++ b/chrome/browser/renderer_host/video_layer_x.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_X_ -#define CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_X_ +#ifndef CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_X_H_ +#define CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_X_H_ +#include "app/x11_util.h" #include "chrome/browser/renderer_host/video_layer.h" -#include "chrome/common/x11_util.h" // Implements a YUV data layer using X to hold the RGB data. class VideoLayerX : public VideoLayer { @@ -48,4 +48,4 @@ class VideoLayerX : public VideoLayer { DISALLOW_COPY_AND_ASSIGN(VideoLayerX); }; -#endif // CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_X_ +#endif // CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_X_H_ |