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

Unified Diff: ui/gfx/compositor/layer.h

Issue 8510076: Fix stale compositor references from ui::Layer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux_touch build Created 9 years, 1 month 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 | « ui/gfx/compositor/compositor_cc.cc ('k') | ui/gfx/compositor/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/layer.h
diff --git a/ui/gfx/compositor/layer.h b/ui/gfx/compositor/layer.h
index d8cb66cda744febc786d69821ee63cc8ed7fa553..76fef3e99cc4d9af65fb1d4f31f73608b02ef9c2 100644
--- a/ui/gfx/compositor/layer.h
+++ b/ui/gfx/compositor/layer.h
@@ -48,10 +48,8 @@ class COMPOSITOR_EXPORT Layer :
LAYER_HAS_TEXTURE = 1
};
- // |compositor| can be NULL, and will be set later when the Layer is added to
- // a Compositor.
- explicit Layer(Compositor* compositor);
- Layer(Compositor* compositor, LayerType type);
+ Layer();
+ explicit Layer(LayerType type);
virtual ~Layer();
// Retrieves the Layer's compositor. The Layer will walk up its parent chain
@@ -152,10 +150,6 @@ class COMPOSITOR_EXPORT Layer :
const gfx::Rect& hole_rect() const { return hole_rect_; }
- // The compositor.
- const Compositor* compositor() const { return compositor_; }
- Compositor* compositor() { return compositor_; }
-
const ui::Texture* texture() const { return texture_.get(); }
// |texture| cannot be NULL, and this function cannot be called more than
« no previous file with comments | « ui/gfx/compositor/compositor_cc.cc ('k') | ui/gfx/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698