cc: Fix ideal_content_scale check in PictureImageLayerImpl

PictureImageLayerImpl ignores PictureLayerImpl::ideal_content_scale_ and
conditionally sets tile scale to 1.f. This makes the comparison in
PictureLayerImpl::AppendQuads to check for incomplete tiles incorrect.

Fix by overriding PictureImageLayerImpl::CalculateContentsScale to
always set ideal_content_scale_ to 1.f.

Fix for internal bug b/9103603.

TEST=PictureImageLayerImplTest.IgnoreIdealContentScale
BUG=

Review URL: https://codereview.chromium.org/26353002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227614 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 0 deletions

diff --git a/cc/layers/picture_image_layer_impl.h b/cc/layers/picture_image_layer_impl.h
index 4a2db50..c475e53 100644
--- a/cc/layers/picture_image_layer_impl.h
+++ b/cc/layers/picture_image_layer_impl.h
@@ -17,9 +17,17 @@ class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl {
   }
   virtual ~PictureImageLayerImpl();
 
+  // LayerImpl overrides.
   virtual const char* LayerTypeAsString() const OVERRIDE;
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(
       LayerTreeImpl* tree_impl) OVERRIDE;
+  virtual void CalculateContentsScale(float ideal_contents_scale,
+                                      float device_scale_factor,
+                                      float page_scale_factor,
+                                      bool animating_transform_to_screen,
+                                      float* contents_scale_x,
+                                      float* contents_scale_y,
+                                      gfx::Size* content_bounds) OVERRIDE;
 
  protected:
   PictureImageLayerImpl(LayerTreeImpl* tree_impl, int id);
@@ -33,6 +41,7 @@ class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl {
   virtual void GetDebugBorderProperties(
       SkColor* color, float* width) const OVERRIDE;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(PictureImageLayerImpl);
 };