| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index 1e6da2d46c429db62c003ba2e2c95320370b1593..d1f4dcf97e3d7b82fd0384b7665ebe77a1c872ba 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -312,7 +312,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,
|
| @@ -456,7 +456,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_;
|
|
|