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..f814f964ed7e112c5e797deba6d6c46ca91f8203 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. |
@@ -138,6 +130,13 @@ class CC_EXPORT PictureLayerImpl |
bool IsOnActiveOrPendingTree() const; |
bool AllTilesRequiredForActivationAreReadyToDraw() const; |
+ virtual void UpdateIdealScales(); |
+ float MaximumTilingContentScale() const; |
+ |
+ bool CanHaveTilings() const; |
+ void ManageTilings(bool animating_transform_to_screen, |
+ float maximum_animation_contents_scale); |
+ |
protected: |
friend class LayerRasterTileIterator; |
@@ -146,8 +145,6 @@ class CC_EXPORT PictureLayerImpl |
void RemoveTiling(float contents_scale); |
void RemoveAllTilings(); |
void SyncFromActiveLayer(const PictureLayerImpl* other); |
- void ManageTilings(bool animating_transform_to_screen, |
- float maximum_animation_contents_scale); |
virtual bool ShouldAdjustRasterScale( |
bool animating_transform_to_screen) const; |
virtual void RecalculateRasterScales(bool animating_transform_to_screen, |
@@ -172,7 +169,6 @@ class CC_EXPORT PictureLayerImpl |
} |
void DoPostCommitInitialization(); |
- bool CanHaveTilings() const; |
bool CanHaveTilingWithScale(float contents_scale) const; |
void SanityCheckTilingState() const; |