Let AreVisibleResourcesReady return correct value for PictureImageLayerImpl

cc/layers/picture_layer_impl.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYERS_PICTURE_LAYER_IMPL_H_
 #define CC_LAYERS_PICTURE_LAYER_IMPL_H_
 
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/resources/picture_layer_tiling.h"
@@ skipping 57 matching lines @@
   virtual bool AreVisibleResourcesReady() const OVERRIDE;
 
   virtual scoped_ptr<base::Value> AsValue() const OVERRIDE;
 
  protected:
   PictureLayerImpl(LayerTreeImpl* tree_impl, int id);
   PictureLayerTiling* AddTiling(float contents_scale);
   void RemoveTiling(float contents_scale);
   void SyncFromActiveLayer(const PictureLayerImpl* other);
   void ManageTilings(bool animating_transform_to_screen);
-  virtual void CalculateRasterContentsScale(
-      bool animating_transform_to_screen,
-      float* raster_contents_scale,
-      float* low_res_raster_contents_scale);
+  virtual bool ShouldAdjustRasterSourceScale() const;
+  virtual void CalculateRasterContentsScale(bool animating_transform_to_screen);
   void CleanUpTilingsOnActiveLayer(
       std::vector<PictureLayerTiling*> used_tilings);
   PictureLayerImpl* PendingTwin() const;
   PictureLayerImpl* ActiveTwin() const;
   float MinimumContentsScale() const;
 
   virtual void GetDebugBorderProperties(
       SkColor* color, float* width) const OVERRIDE;
 
   scoped_ptr<PictureLayerTilingSet> tilings_;
   scoped_refptr<PicturePileImpl> pile_;
   Region invalidation_;
 
   gfx::Transform last_screen_space_transform_;
   gfx::Size last_bounds_;
   float last_content_scale_;
   float ideal_contents_scale_;
   bool is_mask_;
 
   float ideal_page_scale_;
   float ideal_device_scale_;
-  float ideal_source_scale_;
 
   float raster_page_scale_;
   float raster_device_scale_;
-  float raster_source_scale_;
+  float raster_contents_scale_;
+  float low_res_raster_contents_scale_;
   bool raster_source_scale_was_animating_;
 
   friend class PictureLayer;
   DISALLOW_COPY_AND_ASSIGN(PictureLayerImpl);
 };
 
 }
 
 #endif  // CC_LAYERS_PICTURE_LAYER_IMPL_H_