cc/layers/painted_scrollbar_layer.h - Issue 23983047: Pinch/Zoom Infrastructure & Plumbing CL

Unified Diff: cc/layers/painted_scrollbar_layer.h

Issue 23983047: Pinch/Zoom Infrastructure & Plumbing CL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add fix for empty scroll-layer bounds. Created 6 years, 11 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

Index: cc/layers/painted_scrollbar_layer.h

diff --git a/cc/layers/painted_scrollbar_layer.h b/cc/layers/painted_scrollbar_layer.h

index c24c0aa70e329fd3892ac466ee3771f424a0b5b1..0b844513666f22966db2a1eeb11e0f417ebf0fa4 100644

--- a/cc/layers/painted_scrollbar_layer.h

+++ b/cc/layers/painted_scrollbar_layer.h

@@ -24,14 +24,15 @@ class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerInterface,

static scoped_refptr<PaintedScrollbarLayer> Create(

scoped_ptr<Scrollbar> scrollbar,

- int scroll_layer_id);

+ Layer* scroll_layer);

virtual bool OpacityCanAnimateOnImplThread() const OVERRIDE;

virtual ScrollbarLayerInterface* ToScrollbarLayer() OVERRIDE;

// ScrollbarLayerInterface

virtual int ScrollLayerId() const OVERRIDE;

- virtual void SetScrollLayerId(int id) OVERRIDE;

+ virtual void SetScrollLayer(scoped_refptr<Layer> layer) OVERRIDE;

+ virtual void SetClipLayer(scoped_refptr<Layer> layer) OVERRIDE;

virtual ScrollbarOrientation orientation() const OVERRIDE;

@@ -40,6 +41,7 @@ class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerInterface,

const OcclusionTracker* occlusion) OVERRIDE;

virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE;

virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;

+ virtual void PushScrollClipPropertiesTo(LayerImpl* layer) OVERRIDE;

virtual void CalculateContentsScale(float ideal_contents_scale,

float device_scale_factor,

float page_scale_factor,

@@ -49,7 +51,7 @@ class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerInterface,

gfx::Size* content_bounds) OVERRIDE;

protected:

- PaintedScrollbarLayer(scoped_ptr<Scrollbar> scrollbar, int scroll_layer_id);

+ PaintedScrollbarLayer(scoped_ptr<Scrollbar> scrollbar, Layer* scroll_layer);

virtual ~PaintedScrollbarLayer();

// For unit tests

@@ -79,7 +81,8 @@ class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerInterface,

ScrollbarPart part);

scoped_ptr<Scrollbar> scrollbar_;

- int scroll_layer_id_;

+ scoped_refptr<Layer> scroll_layer_;

aelias_OOO_until_Jul13 2014/01/16 03:44:04 Can this be a weak pointer instead? Refptrs risk

wjmaclean 2014/01/16 15:07:32 I will investigate, and re-use the one in Scrollba

+ scoped_refptr<Layer> clip_layer_;

// Snapshot of properties taken in UpdateThumbAndTrackGeometry and used in

// PushPropertiesTo.

« cc/layers/layer_impl.cc ('K') | « cc/layers/layer_unittest.cc ('k') | cc/layers/painted_scrollbar_layer.cc » ('j') | cc/layers/scrollbar_layer_impl_base.cc » ('J')