Revert 225751 "BitmapContentLayerUpdater shouldn't reallocate bi..."

trunk/src/cc/resources/bitmap_content_layer_updater.cc

Index: trunk/src/cc/resources/bitmap_content_layer_updater.cc
===================================================================
--- trunk/src/cc/resources/bitmap_content_layer_updater.cc	(revision 238277)
+++ trunk/src/cc/resources/bitmap_content_layer_updater.cc	(working copy)
@@ -61,8 +61,7 @@
     gfx::Rect* resulting_opaque_rect) {
   devtools_instrumentation::ScopedLayerTask paint_layer(
       devtools_instrumentation::kPaintLayer, layer_id_);
-  if (canvas_size_.width() < content_rect.size().width() ||
-      canvas_size_.height() < content_rect.size().height()) {
+  if (canvas_size_ != content_rect.size()) {
     devtools_instrumentation::ScopedLayerTask paint_setup(
         devtools_instrumentation::kPaintSetup, layer_id_);
     canvas_size_ = content_rect.size();
@@ -77,7 +76,7 @@
   base::TimeTicks start_time =
       rendering_stats_instrumentation_->StartRecording();
   PaintContents(canvas_.get(),
-                content_rect,
+                content_rect.origin(),
                 contents_width_scale,
                 contents_height_scale,
                 resulting_opaque_rect);
@@ -94,10 +93,12 @@
                                               gfx::Vector2d dest_offset,
                                               bool partial_update) {
   CHECK(canvas_);
-  gfx::Rect canvas_rect = content_rect();
-  canvas_rect.set_size(canvas_size_);
-  ResourceUpdate upload = ResourceUpdate::CreateFromCanvas(
-      texture, canvas_, canvas_rect, source_rect, dest_offset);
+  ResourceUpdate upload =
+      ResourceUpdate::CreateFromCanvas(texture,
+                                       canvas_,
+                                       content_rect(),
+                                       source_rect,
+                                       dest_offset);
   if (partial_update)
     queue->AppendPartialUpload(upload);
   else