diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 09:05:52 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 09:05:52 +0000 |
| commit | cc3cfaa706818aee30e0a766f3d4ffe90301ae33 (patch) | |
| tree | 88d184f795b3790c45c2806306fd5d22d91f6b04 /content/browser | |
| parent | 97ebdbacab06587dd1c8fbdd5cc52f58db5042ab (diff) | |
| download | chromium_src-cc3cfaa706818aee30e0a766f3d4ffe90301ae33.zip chromium_src-cc3cfaa706818aee30e0a766f3d4ffe90301ae33.tar.gz chromium_src-cc3cfaa706818aee30e0a766f3d4ffe90301ae33.tar.bz2 | |
Part 10 of cc/ directory shuffles: layers
Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681
BUG=190824
TBR=enne@chromium.org, piman@chromium.org, jschuh@chromium.org, joth@chromium.org
Review URL: https://codereview.chromium.org/12916002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
6 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index 9ddadf3..39ba1cca 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -13,13 +13,13 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "cc/layer.h" +#include "cc/layers/layer.h" #include "content/browser/android/interstitial_page_delegate_android.h" #include "content/browser/android/load_url_params.h" #include "content/browser/android/touch_point.h" +#include "content/browser/renderer_host/compositor_impl_android.h" #include "content/browser/renderer_host/java/java_bound_object.h" #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h" -#include "content/browser/renderer_host/compositor_impl_android.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_view_android.h" diff --git a/content/browser/android/content_view_render_view.cc b/content/browser/android/content_view_render_view.cc index 5a55cf7..8e38e08 100644 --- a/content/browser/android/content_view_render_view.cc +++ b/content/browser/android/content_view_render_view.cc @@ -11,7 +11,7 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "cc/layer.h" +#include "cc/layers/layer.h" #include "content/browser/android/content_view_core_impl.h" #include "content/public/browser/android/compositor.h" #include "content/public/browser/android/content_view_layer_renderer.h" diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc index 4a55e68..ee4e0f4 100644 --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc @@ -17,7 +17,7 @@ #include "base/synchronization/lock.h" #include "cc/base/thread_impl.h" #include "cc/input/input_handler.h" -#include "cc/layer.h" +#include "cc/layers/layer.h" #include "cc/output/context_provider.h" #include "cc/output/output_surface.h" #include "cc/trees/layer_tree_host.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 fd4740d..46b1f52 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -10,10 +10,10 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "cc/layer.h" +#include "cc/layers/layer.h" +#include "cc/layers/texture_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" #include "content/browser/renderer_host/compositor_impl_android.h" diff --git a/content/browser/renderer_host/surface_texture_transport_client_android.cc b/content/browser/renderer_host/surface_texture_transport_client_android.cc index 72601bc..8e2f136 100644 --- a/content/browser/renderer_host/surface_texture_transport_client_android.cc +++ b/content/browser/renderer_host/surface_texture_transport_client_android.cc @@ -7,7 +7,7 @@ #include <android/native_window_jni.h> #include "base/bind.h" -#include "cc/video_layer.h" +#include "cc/layers/video_layer.h" #include "content/browser/gpu/gpu_surface_tracker.h" #include "content/browser/renderer_host/compositor_impl_android.h" #include "content/browser/renderer_host/image_transport_factory_android.h" diff --git a/content/browser/renderer_host/surface_texture_transport_client_android.h b/content/browser/renderer_host/surface_texture_transport_client_android.h index 08a18d0..d2540e1 100644 --- a/content/browser/renderer_host/surface_texture_transport_client_android.h +++ b/content/browser/renderer_host/surface_texture_transport_client_android.h @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "cc/video_frame_provider.h" +#include "cc/layers/video_frame_provider.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" |