cc: Merge LayerTree into the LayerTreeHost.

cc/layers/painted_scrollbar_layer.cc

 // Copyright 2013 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/painted_scrollbar_layer.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "cc/base/math_util.h"
@@ skipping 152 matching lines @@
   if (has_thumb_) {
     UpdateProperty(scrollbar_->ThumbThickness(), &thumb_thickness_);
     UpdateProperty(scrollbar_->ThumbLength(), &thumb_length_);
   } else {
     UpdateProperty(0, &thumb_thickness_);
     UpdateProperty(0, &thumb_length_);
   }
 }
 
 void PaintedScrollbarLayer::UpdateInternalContentScale() {
-  float scale = GetLayerTree()->device_scale_factor();
+  float scale = layer_tree_host()->device_scale_factor();
   if (layer_tree_host()
           ->GetSettings()
           .layer_transforms_should_scale_layer_contents) {
     gfx::Transform transform;
     transform = draw_property_utils::ScreenSpaceTransform(
-        this, GetLayerTree()->property_trees()->transform_tree);
+        this, layer_tree_host()->property_trees()->transform_tree);
 
     gfx::Vector2dF transform_scales =
         MathUtil::ComputeTransform2dScaleComponents(transform, scale);
     scale = std::max(transform_scales.x(), transform_scales.y());
   }
   bool changed = false;
   changed |= UpdateProperty(scale, &internal_contents_scale_);
   changed |=
       UpdateProperty(gfx::ScaleToCeiledSize(bounds(), internal_contents_scale_),
                      &internal_content_bounds_);
@@ skipping 94 matching lines @@
 
   scrollbar_->PaintPart(&skcanvas, part, layer_rect);
   // Make sure that the pixels are no longer mutable to unavoid unnecessary
   // allocation and copying.
   skbitmap.setImmutable();
 
   return UIResourceBitmap(skbitmap);
 }
 
 }  // namespace cc