Index: cc/layers/picture_layer_impl.h |
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h |
index 9609ccf3e449f282ec504f6e35a1001d5a4a93cc..82e3beea79dfeefdb0efd374de52b9a89a7e47ac 100644 |
--- a/cc/layers/picture_layer_impl.h |
+++ b/cc/layers/picture_layer_impl.h |
@@ -96,14 +96,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. |
@@ -180,6 +172,9 @@ class CC_EXPORT PictureLayerImpl |
SkColor* color, float* width) const OVERRIDE; |
virtual void AsValueInto(base::DictionaryValue* dict) const OVERRIDE; |
+ virtual void UpdateIdealScales(); |
+ float MaximumTilingContentScale() const; |
enne (OOO)
2014/06/03 19:14:47
ContentScale => ContentsScale for consistency?
sohanjg
2014/06/04 10:32:41
Done.
|
+ |
PictureLayerImpl* twin_layer_; |
scoped_ptr<PictureLayerTilingSet> tilings_; |