diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 07:24:30 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 07:24:30 +0000 |
| commit | 7f0d825f49dde66a6e9137a4e35460765bc5f0d8 (patch) | |
| tree | 6944603cf2a97934afad6e599500ff45091316ed /ui | |
| parent | 95e4e1a0fda6929b47702e69e4ddfe384b5d014b (diff) | |
| download | chromium_src-7f0d825f49dde66a6e9137a4e35460765bc5f0d8.zip chromium_src-7f0d825f49dde66a6e9137a4e35460765bc5f0d8.tar.gz chromium_src-7f0d825f49dde66a6e9137a4e35460765bc5f0d8.tar.bz2 | |
Part 4 of cc/ directory shuffles: output
Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681
BUG=190824
TBR=piman@chromium.org, jschuh@chromium.org
Review URL: https://codereview.chromium.org/12912006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/compositor/compositor.cc | 4 | ||||
| -rw-r--r-- | ui/compositor/layer.cc | 2 | ||||
| -rw-r--r-- | ui/compositor/layer_unittest.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc index eb76dcd..8abbb2b 100644 --- a/ui/compositor/compositor.cc +++ b/ui/compositor/compositor.cc @@ -15,11 +15,11 @@ #include "base/threading/thread.h" #include "base/threading/thread_restrictions.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 "third_party/skia/include/core/SkBitmap.h" #include "ui/compositor/compositor_observer.h" #include "ui/compositor/compositor_switches.h" diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc index 870b357..dafb35c 100644 --- a/ui/compositor/layer.cc +++ b/ui/compositor/layer.cc @@ -12,8 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "cc/base/scoped_ptr_algorithm.h" #include "cc/content_layer.h" -#include "cc/delegated_frame_data.h" #include "cc/delegated_renderer_layer.h" +#include "cc/output/delegated_frame_data.h" #include "cc/solid_color_layer.h" #include "cc/texture_layer.h" #include "cc/transferable_resource.h" diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index e6ad58a..d09d684 100644 --- a/ui/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc @@ -10,8 +10,8 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "cc/delegated_frame_data.h" #include "cc/layer.h" +#include "cc/output/delegated_frame_data.h" #include "cc/test/pixel_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/compositor/compositor_observer.h" |