Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1081)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/ui_resource_layer.cc

Issue 2661523003: cc: Merge LayerTree into the LayerTreeHost. (Closed)
Patch Set: .. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/layers/layer.h ('K') | « cc/layers/texture_layer_unittest.cc ('k') | cc/output/bsp_tree_perftest.cc » ('j') | cc/trees/layer_tree_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/ui_resource_layer.cc
diff --git a/cc/layers/ui_resource_layer.cc b/cc/layers/ui_resource_layer.cc
index 3ec7af8f02ac666bf1e141a443bead4377777aac..c2ed21477277b169b5b7a8ebf97705fd6bc1f50f 100644
--- a/cc/layers/ui_resource_layer.cc
+++ b/cc/layers/ui_resource_layer.cc
@@ -76,7 +76,7 @@ void UIResourceLayer::SetLayerTreeHost(LayerTreeHost* host) {
void UIResourceLayer::SetBitmap(const SkBitmap& bitmap) {
bitmap_ = bitmap;
- if (!GetLayerTree())
+ if (!layer_tree_host())
return;
SetUIResourceIdInternal(
layer_tree_host()->GetUIResourceManager()->GetOrCreateUIResource(bitmap));
@@ -103,7 +103,7 @@ void UIResourceLayer::PushPropertiesTo(LayerImpl* layer) {
layer_impl->SetUIResourceId(resource_id_);
if (resource_id_) {
- DCHECK(GetLayerTree());
+ DCHECK(layer_tree_host());
gfx::Size image_size =
layer_tree_host()->GetUIResourceManager()->GetUIResourceSize(
« cc/layers/layer.h ('K') | « cc/layers/texture_layer_unittest.cc ('k') | cc/output/bsp_tree_perftest.cc » ('j') | cc/trees/layer_tree_host.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698