Fix SurfaceLayerImpl scale under impl-side painting

cc/layers/surface_layer.cc

 // Copyright 2014 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.
 
 #include "cc/layers/surface_layer.h"
 
 #include "cc/layers/surface_layer_impl.h"
 #include "cc/output/swap_promise.h"
 #include "cc/trees/layer_tree_host.h"
 
@@ skipping 76 matching lines @@
   SatisfyDestroySequence();
   Layer::SetLayerTreeHost(host);
   CreateNewDestroySequence();
 }
 
 void SurfaceLayer::PushPropertiesTo(LayerImpl* layer) {
   Layer::PushPropertiesTo(layer);
   SurfaceLayerImpl* layer_impl = static_cast<SurfaceLayerImpl*>(layer);
 
   layer_impl->SetSurfaceId(surface_id_);
-}
-
-void SurfaceLayer::CalculateContentsScale(float ideal_contents_scale,
-                                          float* contents_scale_x,
-                                          float* contents_scale_y,
-                                          gfx::Size* content_bounds) {
-  *content_bounds = surface_size_;
-  *contents_scale_x = surface_scale_;
-  *contents_scale_y = surface_scale_;
+  layer_impl->SetSurfaceSize(surface_size_);
+  layer_impl->SetSurfaceScale(surface_scale_);
 }
 
 void SurfaceLayer::CreateNewDestroySequence() {
   DCHECK(destroy_sequence_.is_null());
   if (layer_tree_host()) {
     destroy_sequence_ = layer_tree_host()->CreateSurfaceSequence();
     require_callback_.Run(surface_id_, destroy_sequence_);
   }
 }
 
 void SurfaceLayer::SatisfyDestroySequence() {
   if (!layer_tree_host())
     return;
   DCHECK(!destroy_sequence_.is_null());
   scoped_ptr<SatisfySwapPromise> satisfy(
       new SatisfySwapPromise(destroy_sequence_, satisfy_callback_));
   layer_tree_host()->QueueSwapPromise(satisfy.Pass());
   destroy_sequence_ = SurfaceSequence();
 }
 
 }  // namespace cc