Add support for calculating the position of the top controls in the cc layer.

cc/layer_tree_host_impl.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYER_TREE_HOST_IMPL_H_
 #define CC_LAYER_TREE_HOST_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/animation_events.h"
 #include "cc/animation_registrar.h"
 #include "cc/cc_export.h"
 #include "cc/input_handler.h"
 #include "cc/output_surface_client.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_sink.h"
 #include "cc/renderer.h"
 #include "cc/tile_manager.h"
+#include "cc/top_controls_manager_client.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
 
 class CompletionEvent;
 class CompositorFrameMetadata;
 class DebugRectHistory;
 class FrameRateCounter;
 class LayerImpl;
 class LayerTreeHostImplTimeSourceAdapter;
 class LayerTreeImpl;
 class PageScaleAnimation;
 class RenderPassDrawQuad;
 class ResourceProvider;
+class TopControlsManager;
 struct RendererCapabilities;
 struct RenderingStats;
 
 // LayerTreeHost->Proxy callback interface.
 class LayerTreeHostImplClient {
 public:
     virtual void didLoseOutputSurfaceOnImplThread() = 0;
     virtual void onSwapBuffersCompleteOnImplThread() = 0;
     virtual void onVSyncParametersChanged(base::TimeTicks timebase, base::TimeDelta interval) = 0;
     virtual void onCanDrawStateChanged(bool canDraw) = 0;
@@ skipping 63 matching lines @@
     float m_deviceScaleFactor;
 
     gfx::Vector2dF m_zoomedViewportOffset;
     gfx::SizeF m_layoutViewportSize;
 };
 
 // LayerTreeHostImpl owns the LayerImpl tree as well as associated rendering state
 class CC_EXPORT LayerTreeHostImpl : public InputHandlerClient,
                                     public RendererClient,
                                     public TileManagerClient,
-                                    public OutputSurfaceClient {
+                                    public OutputSurfaceClient,
+                                    public TopControlsManagerClient {
     typedef std::vector<LayerImpl*> LayerList;
 
 public:
     static scoped_ptr<LayerTreeHostImpl> create(const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*);
     virtual ~LayerTreeHostImpl();
 
     // InputHandlerClient implementation
     virtual InputHandlerClient::ScrollStatus scrollBegin(gfx::Point, InputHandlerClient::ScrollInputType) OVERRIDE;
     virtual bool scrollBy(const gfx::Point&, const gfx::Vector2d&) OVERRIDE;
     virtual void scrollEnd() OVERRIDE;
@@ skipping 71 matching lines @@
     bool initializeRenderer(scoped_ptr<OutputSurface>);
     bool isContextLost();
     TileManager* tileManager() { return m_tileManager.get(); }
     Renderer* renderer() { return m_renderer.get(); }
     const RendererCapabilities& rendererCapabilities() const;
 
     bool swapBuffers();
 
     void readback(void* pixels, const gfx::Rect&);
 
-    LayerTreeImpl* activeTree() { return m_activeTree.get(); }
+    virtual LayerTreeImpl* activeTree() OVERRIDE;  // TopControlsManagerClient implementation.

[jamesr, 2013/01/08 02:26:48]

put this comment on the previous line

[Ted C, 2013/01/08 18:17:33]

Done.  (moved them all up as suggested below)

     const LayerTreeImpl* activeTree() const { return m_activeTree.get(); }
     LayerTreeImpl* pendingTree() { return m_pendingTree.get(); }
     const LayerTreeImpl* pendingTree() const { return m_pendingTree.get(); }
     void createPendingTree();
     virtual void activatePendingTreeIfNeeded();
 
     // Shortcuts to layers on the active tree.
     LayerImpl* rootLayer() const;
     LayerImpl* rootScrollLayer() const;
     LayerImpl* currentlyScrollingLayer() const;
@@ skipping 16 matching lines @@
     void setPageScaleFactorAndLimits(float pageScaleFactor, float minPageScaleFactor, float maxPageScaleFactor);
 
     scoped_ptr<ScrollAndScaleSet> processScrollDeltas();
     gfx::Transform implTransform() const;
 
     void startPageScaleAnimation(gfx::Vector2d targetOffset, bool useAnchor, float scale, base::TimeDelta duration);
 
     bool needsAnimateLayers() const { return !m_animationRegistrar->active_animation_controllers().empty(); }
 
     bool needsUpdateDrawProperties() const { return m_needsUpdateDrawProperties; }
-    void setNeedsUpdateDrawProperties() { m_needsUpdateDrawProperties = true; }
+    virtual void setNeedsUpdateDrawProperties() OVERRIDE;  // TopControlsManagerClient implementation.

[jamesr, 2013/01/08 02:26:48]

put the comment on the previous line and just have one comment and no blank line
between this and the next line

[enne (OOO), 2013/01/08 06:23:05]

You should also group all these functions, like InputHandlerClient does above.

[Ted C, 2013/01/08 18:17:33]

Done.

 
-    void setNeedsRedraw();
+    virtual void setNeedsRedraw() OVERRIDE;  // TopControlsManagerClient implementation.
 
     void renderingStats(RenderingStats*) const;
 
     void sendManagedMemoryStats(
        size_t memoryVisibleBytes,
        size_t memoryVisibleAndNearbyBytes,
        size_t memoryUseBytes);
 
     FrameRateCounter* fpsCounter() const { return m_fpsCounter.get(); }
     DebugRectHistory* debugRectHistory() const { return m_debugRectHistory.get(); }
@@ skipping 101 matching lines @@
     gfx::Size m_deviceViewportSize;
     float m_deviceScaleFactor;
     bool m_visible;
     bool m_contentsTexturesPurged;
     ManagedMemoryPolicy m_managedMemoryPolicy;
 
     bool m_needsUpdateDrawProperties;
     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.
     scoped_ptr<LayerTreeHostImplTimeSourceAdapter> m_timeSourceClientAdapter;
 
     PinchZoomViewport m_pinchZoomViewport;
 
     scoped_ptr<FrameRateCounter> m_fpsCounter;
     scoped_ptr<DebugRectHistory> m_debugRectHistory;
 
     int64 m_numImplThreadScrolls;
     int64 m_numMainThreadScrolls;
 
     int64 m_cumulativeNumLayersDrawn;
 
     int64 m_cumulativeNumMissingTiles;
 
     size_t m_lastSentMemoryVisibleBytes;
     size_t m_lastSentMemoryVisibleAndNearbyBytes;
     size_t m_lastSentMemoryUseBytes;
 
     scoped_ptr<AnimationRegistrar> m_animationRegistrar;
 
     DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYER_TREE_HOST_IMPL_H_