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

Unified Diff: cc/layers/layer.h

Issue 13285002: cc: Consolidate LayerList types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.h ('k') | cc/layers/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 9827f9b1c6268815284376b0e31d4734d8ae5352..c1285314afaeabc2e188764f2f165bdcce2c4bea 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -16,6 +16,7 @@
#include "cc/base/cc_export.h"
#include "cc/base/region.h"
#include "cc/layers/draw_properties.h"
+#include "cc/layers/layer_lists.h"
#include "cc/layers/render_surface.h"
#include "cc/trees/occlusion_tracker.h"
#include "skia/ext/refptr.h"
@@ -51,7 +52,6 @@ struct RenderingStats;
class CC_EXPORT Layer : public base::RefCounted<Layer>,
public LayerAnimationValueObserver {
public:
- typedef std::vector<scoped_refptr<Layer> > LayerList;
enum LayerIdLabels {
PINCH_ZOOM_ROOT_SCROLL_LAYER_ID = -2,
INVALID_ID = -1,
@@ -277,8 +277,8 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
virtual void PushPropertiesTo(LayerImpl* layer);
- void ClearRenderSurface() { draw_properties_.render_surface.reset(); }
void CreateRenderSurface();
+ void ClearRenderSurface();
// The contents scale converts from logical, non-page-scaled pixels to target
// pixels. The contents scale is 1 for the root layer as it is already in
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.h ('k') | cc/layers/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698