cc: Move tiling management out of draw properties calculation.

cc/layers/layer_impl.cc

 // 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.
 
 #include "cc/layers/layer_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "cc/animation/animation_registrar.h"
@@ skipping 1046 matching lines @@
 }
 
 void LayerImpl::CalculateContentsScale(float ideal_contents_scale,
                                        float device_scale_factor,
                                        float page_scale_factor,
                                        float maximum_animation_contents_scale,
                                        bool animating_transform_to_screen,
                                        float* contents_scale_x,
                                        float* contents_scale_y,
                                        gfx::Size* content_bounds) {
-  // Base LayerImpl has all of its content scales and content bounds pushed
-  // from its Layer during commit and just reuses those values as-is.
-  *contents_scale_x = this->contents_scale_x();
-  *contents_scale_y = this->contents_scale_y();
-  *content_bounds = this->content_bounds();
+  if (layer_tree_impl()->settings().impl_side_painting) {

[danakj, 2014/05/15 15:15:31]

Why did you need this? The bounds == content_bounds for picture layer now, no?
And the scales given from the main thread should be 1?

+    *contents_scale_x = 1.f;
+    *contents_scale_y = 1.f;
+    *content_bounds = bounds();
+  } else {
+    // Base LayerImpl has all of its content scales and content bounds pushed
+    // from its Layer during commit and just reuses those values as-is.
+    *contents_scale_x = this->contents_scale_x();
+    *contents_scale_y = this->contents_scale_y();
+    *content_bounds = this->content_bounds();
+  }
 }
-
 void LayerImpl::SetScrollOffsetDelegate(
     LayerScrollOffsetDelegate* scroll_offset_delegate) {
   // Having both a scroll parent and a scroll offset delegate is unsupported.
   DCHECK(!scroll_parent_);
   if (!scroll_offset_delegate && scroll_offset_delegate_) {
     scroll_delta_ =
         scroll_offset_delegate_->GetTotalScrollOffset() - scroll_offset_;
   }
   gfx::Vector2dF total_offset = TotalScrollOffset();
   scroll_offset_delegate_ = scroll_offset_delegate;
@@ skipping 426 matching lines @@
 scoped_ptr<base::Value> LayerImpl::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   AsValueInto(state.get());
   return state.PassAs<base::Value>();
 }
 
 void LayerImpl::RunMicroBenchmark(MicroBenchmarkImpl* benchmark) {
   benchmark->RunOnLayer(this);
 }
 }  // namespace cc