cc: Merge LayerTree into the LayerTreeHost.

cc/layers/ui_resource_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/ui_resource_layer.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/ui_resource_layer_impl.h"
 #include "cc/resources/scoped_ui_resource.h"
@@ skipping 58 matching lines @@
   Layer::SetLayerTreeHost(host);
 
   // Recreate the resource held against the new LTH.
   RecreateUIResourceIdFromBitmap();
 
   UpdateDrawsContent(HasDrawableContent());
 }
 
 void UIResourceLayer::SetBitmap(const SkBitmap& bitmap) {
   bitmap_ = bitmap;
-  if (!GetLayerTree())
+  if (!layer_tree_host())
     return;
   SetUIResourceIdInternal(
       layer_tree_host()->GetUIResourceManager()->GetOrCreateUIResource(bitmap));
 }
 
 void UIResourceLayer::SetUIResourceId(UIResourceId resource_id) {
   // Even if the ID is not changing we should drop the bitmap. The ID is 0 when
   // there's no layer tree. When setting an id (even if to 0), we should no
   // longer keep the bitmap.
   bitmap_.reset();
   if (resource_id_ == resource_id)
     return;
   SetUIResourceIdInternal(resource_id);
 }
 
 bool UIResourceLayer::HasDrawableContent() const {
   return resource_id_ && Layer::HasDrawableContent();
 }
 
 void UIResourceLayer::PushPropertiesTo(LayerImpl* layer) {
   Layer::PushPropertiesTo(layer);
   TRACE_EVENT0("cc", "UIResourceLayer::PushPropertiesTo");
   UIResourceLayerImpl* layer_impl = static_cast<UIResourceLayerImpl*>(layer);
 
   layer_impl->SetUIResourceId(resource_id_);
   if (resource_id_) {
-    DCHECK(GetLayerTree());
+    DCHECK(layer_tree_host());
 
     gfx::Size image_size =
         layer_tree_host()->GetUIResourceManager()->GetUIResourceSize(
             resource_id_);
     layer_impl->SetImageBounds(image_size);
     layer_impl->SetUV(uv_top_left_, uv_bottom_right_);
     layer_impl->SetVertexOpacity(vertex_opacity_);
   }
 }
 
 void UIResourceLayer::RecreateUIResourceIdFromBitmap() {
   if (!bitmap_.empty())
     SetBitmap(bitmap_);
 }
 
 void UIResourceLayer::SetUIResourceIdInternal(UIResourceId resource_id) {
   resource_id_ = resource_id;
   UpdateDrawsContent(HasDrawableContent());
   SetNeedsCommit();
 }
 
 }  // namespace cc