Chromium Code Reviews| Index: cc/layers/picture_layer_impl.h |
| diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h |
| index bbf5030ba2a0b7ce4d6ee6f8f7a5e37600f91bac..8eed0bafa451d5d15ee0735766c928137419487c 100644 |
| --- a/cc/layers/picture_layer_impl.h |
| +++ b/cc/layers/picture_layer_impl.h |
| @@ -97,14 +97,6 @@ class CC_EXPORT PictureLayerImpl |
| virtual void DidBecomeActive() OVERRIDE; |
| virtual void DidBeginTracing() OVERRIDE; |
| virtual void ReleaseResources() OVERRIDE; |
| - virtual void CalculateContentsScale(float ideal_contents_scale, |
| - float device_scale_factor, |
| - float page_scale_factor, |
| - float maximum_animation_contents_scale, |
| - bool animating_transform_to_screen, |
| - float* contents_scale_x, |
| - float* contents_scale_y, |
| - gfx::Size* content_bounds) OVERRIDE; |
| virtual skia::RefPtr<SkPicture> GetPicture() OVERRIDE; |
| // PictureLayerTilingClient overrides. |
| @@ -138,6 +130,13 @@ class CC_EXPORT PictureLayerImpl |
| WhichTree GetTree() const; |
| bool IsOnActiveOrPendingTree() const; |
| + float MaximumTilingContentScale() const; |
| + void PopulateSharedQuadStateWithOverrides( |
|
danakj
2014/05/23 17:07:34
Can this be not public?
|
| + SharedQuadState* state, |
| + gfx::Transform target_space_transform, |
| + gfx::Size content_bounds, |
| + gfx::Rect visible_content_rect) const; |
| + |
| protected: |
| friend class LayerRasterTileIterator; |
| @@ -180,6 +179,8 @@ class CC_EXPORT PictureLayerImpl |
| bool CanHaveTilingWithScale(float contents_scale) const; |
| void SanityCheckTilingState() const; |
| + void UpdateIdealScales(); |
|
danakj
2014/05/23 17:07:34
this should be virtual, right?
|
| + |
| virtual void GetDebugBorderProperties( |
| SkColor* color, float* width) const OVERRIDE; |
| virtual void AsValueInto(base::DictionaryValue* dict) const OVERRIDE; |