Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: ui/compositor/layer.h

Issue 10365007: ui: Move compositor/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix DEPS Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/compositor/debug_utils.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_COMPOSITOR_LAYER_H_ 5 #ifndef UI_COMPOSITOR_LAYER_H_
6 #define UI_GFX_COMPOSITOR_LAYER_H_ 6 #define UI_COMPOSITOR_LAYER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.h"
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayerClie nt.h"
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
16 #include "third_party/skia/include/core/SkColor.h" 18 #include "third_party/skia/include/core/SkColor.h"
17 #include "third_party/skia/include/core/SkRegion.h" 19 #include "third_party/skia/include/core/SkRegion.h"
18 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayerClie nt.h" 20 #include "ui/compositor/compositor.h"
19 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" 21 #include "ui/compositor/layer_animation_delegate.h"
22 #include "ui/compositor/layer_delegate.h"
23 #include "ui/compositor/layer_type.h"
20 #include "ui/gfx/rect.h" 24 #include "ui/gfx/rect.h"
21 #include "ui/gfx/transform.h" 25 #include "ui/gfx/transform.h"
22 #include "ui/gfx/compositor/compositor.h"
23 #include "ui/gfx/compositor/layer_animation_delegate.h"
24 #include "ui/gfx/compositor/layer_delegate.h"
25 #include "ui/gfx/compositor/layer_type.h"
26 26
27 class SkCanvas; 27 class SkCanvas;
28 28
29 namespace ui { 29 namespace ui {
30 30
31 class Compositor; 31 class Compositor;
32 class LayerAnimator; 32 class LayerAnimator;
33 class Texture; 33 class Texture;
34 34
35 // Layer manages a texture, transform and a set of child Layers. Any View that 35 // Layer manages a texture, transform and a set of child Layers. Any View that
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 WebKit::WebLayer web_layer_; 292 WebKit::WebLayer web_layer_;
293 bool web_layer_is_accelerated_; 293 bool web_layer_is_accelerated_;
294 bool show_debug_borders_; 294 bool show_debug_borders_;
295 295
296 DISALLOW_COPY_AND_ASSIGN(Layer); 296 DISALLOW_COPY_AND_ASSIGN(Layer);
297 }; 297 };
298 298
299 } // namespace ui 299 } // namespace ui
300 300
301 #endif // UI_GFX_COMPOSITOR_LAYER_H_ 301 #endif // UI_COMPOSITOR_LAYER_H_
OLDNEW
« no previous file with comments | « ui/compositor/debug_utils.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698