| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index 7da65a1835106447827ef55f3b2c8d489b9ef1dd..dacd9cb72e030abdda562cb42a41113aeec7ea18 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -229,7 +229,7 @@ class ThreadProxy : public Proxy,
|
|
|
| // Accessed on the main thread, or when main thread is blocked.
|
| bool commit_waits_for_activation_;
|
| - bool inside_commit_;
|
| + bool main_thread_inside_commit_;
|
|
|
| scoped_ptr<LayerTreeHostImpl> layer_tree_host_impl_;
|
|
|
|
|