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

Unified Diff: cc/layer_tree_host_impl.h

Issue 11552009: Add support for calculating the position of the top controls in the cc layer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove some unnecessary bits after addressing comments. Created 8 years 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
Index: cc/layer_tree_host_impl.h
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index c7e9c0b4c3ab90fec3f66678311091d26fb96285..a1e38c8c613eedd56d599153abf135827bb70b54 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -16,6 +16,7 @@
#include "cc/render_pass_sink.h"
#include "cc/renderer.h"
#include "cc/tile_manager.h"
+#include "cc/top_controls_manager.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/rect.h"
@@ -113,7 +114,8 @@ private:
class CC_EXPORT LayerTreeHostImpl : public InputHandlerClient,
public RendererClient,
public TileManagerClient,
- public OutputSurfaceClient {
+ public OutputSurfaceClient,
+ public TopControlsDelegate {
typedef std::vector<LayerImpl*> LayerList;
public:
@@ -205,7 +207,7 @@ public:
void readback(void* pixels, const gfx::Rect&);
- LayerTreeImpl* activeTree() { return m_activeTree.get(); }
+ virtual LayerTreeImpl* activeTree() OVERRIDE;
jamesr 2012/12/19 22:56:29 document what interface this is overriding, i.e. "
Ted C 2012/12/20 00:42:39 Done.
LayerTreeImpl* pendingTree() { return m_pendingTree.get(); }
// TODO(nduca): Remove these in favor of LayerTreeImpl.
@@ -253,9 +255,9 @@ public:
void setNeedsAnimateLayers() { m_needsAnimateLayers = true; }
bool needsUpdateDrawProperties() const { return m_needsUpdateDrawProperties; }
- void setNeedsUpdateDrawProperties() { m_needsUpdateDrawProperties = true; }
+ virtual void setNeedsUpdateDrawProperties() OVERRIDE;
- void setNeedsRedraw();
+ virtual void setNeedsRedraw() OVERRIDE;
void renderingStats(RenderingStats*) const;
@@ -375,6 +377,8 @@ private:
bool m_pinchGestureActive;
gfx::Point m_previousPinchAnchor;
+ scoped_ptr<TopControlsManager> m_topControlsManager;
+
scoped_ptr<PageScaleAnimation> m_pageScaleAnimation;
// This is used for ticking animations slowly when hidden.

Powered by Google App Engine
This is Rietveld 408576698