| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index 1621ebc41ec1d87609204a7489b367a59fb544fe..ff7325c4291032cbd263309fa278ed7d3e1f060d 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -49,7 +49,7 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| ~BeginMainFrameAndCommitState();
|
|
|
| unsigned int begin_frame_id;
|
| - base::TimeTicks monotonic_frame_begin_time;
|
| + BeginFrameArgs begin_frame_args;
|
| scoped_ptr<ScrollAndScaleSet> scroll_info;
|
| size_t memory_allocation_limit_bytes;
|
| int memory_allocation_priority_cutoff;
|
|
|