Fix SurfaceLayerImpl scale under impl-side painting

cc/layers/surface_layer_impl.cc

Index: cc/layers/surface_layer_impl.cc
diff --git a/cc/layers/surface_layer_impl.cc b/cc/layers/surface_layer_impl.cc
index 966112d7f546c1147471fdaf4f68d93fe395cc80..a6c8bb9f6d5551de1b41b4cb274713cdd881a5f7 100644
--- a/cc/layers/surface_layer_impl.cc
+++ b/cc/layers/surface_layer_impl.cc
@@ -12,7 +12,7 @@
 namespace cc {
 
 SurfaceLayerImpl::SurfaceLayerImpl(LayerTreeImpl* tree_impl, int id)
-    : LayerImpl(tree_impl, id) {
+    : LayerImpl(tree_impl, id), surface_id_(-1), surface_scale_(0.f) {

[danakj, 2015/06/05 00:42:36]

surface_id is unsigned, but it defaults to 0, you don't need to init it here.

 }
 
 SurfaceLayerImpl::~SurfaceLayerImpl() {}
@@ -30,26 +30,44 @@ void SurfaceLayerImpl::SetSurfaceId(SurfaceId surface_id) {
   NoteLayerPropertyChanged();
 }
 
+void SurfaceLayerImpl::SetSurfaceScale(float scale) {
+  if (surface_scale_ == scale)
+    return;
+
+  surface_scale_ = scale;
+  NoteLayerPropertyChanged();
+}
+
+void SurfaceLayerImpl::SetSurfaceSize(const gfx::Size& size) {
+  if (surface_size_ == size)
+    return;
+
+  surface_size_ = size;
+  NoteLayerPropertyChanged();
+}
+
 void SurfaceLayerImpl::PushPropertiesTo(LayerImpl* layer) {
   LayerImpl::PushPropertiesTo(layer);
   SurfaceLayerImpl* layer_impl = static_cast<SurfaceLayerImpl*>(layer);
 
   layer_impl->SetSurfaceId(surface_id_);
+  layer_impl->SetSurfaceSize(surface_size_);
+  layer_impl->SetSurfaceScale(surface_scale_);
 }
 
 void SurfaceLayerImpl::AppendQuads(RenderPass* render_pass,
                                    AppendQuadsData* append_quads_data) {
   SharedQuadState* shared_quad_state =
       render_pass->CreateAndAppendSharedQuadState();
-  PopulateSharedQuadState(shared_quad_state);
+  PopulateScaledSharedQuadState(shared_quad_state, surface_scale_);
 
-  AppendDebugBorderQuad(
-      render_pass, content_bounds(), shared_quad_state, append_quads_data);
+  AppendDebugBorderQuad(render_pass, surface_size_, shared_quad_state,
+                        append_quads_data);
 
   if (surface_id_.is_null())
     return;
 
-  gfx::Rect quad_rect(content_bounds());
+  gfx::Rect quad_rect(surface_size_);
   gfx::Rect visible_quad_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
           quad_rect);