| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index 339ae4e3e0d62e635aa9bc02239ab8213d23320e..4b92787bc2be1a5c2930e52c4b6d859fd88cbd46 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -280,7 +280,7 @@ class CC_EXPORT LayerTreeHost {
|
| virtual gfx::Size GetUIResourceSize(UIResourceId id) const;
|
|
|
| bool UsingSharedMemoryResources();
|
| - int id() const { return tree_id_; }
|
| + int id() const { return id_; }
|
|
|
| bool ScheduleMicroBenchmark(const std::string& benchmark_name,
|
| scoped_ptr<base::Value> value,
|
| @@ -424,7 +424,7 @@ class CC_EXPORT LayerTreeHost {
|
| int64 total_num_cc_layers_will_use_lcd_text;
|
| };
|
| LCDTextMetrics lcd_text_metrics_;
|
| - int tree_id_;
|
| + int id_;
|
| bool next_commit_forces_redraw_;
|
|
|
| scoped_refptr<Layer> page_scale_layer_;
|
|
|