| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index f4f1f283c77553e28348a790ffafa687b815da63..8e4b2f5da552385a6a8beaa59887495e8bf801b9 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -55,6 +55,8 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| unsigned int begin_frame_id;
|
| BeginFrameArgs begin_frame_args;
|
| scoped_ptr<ScrollAndScaleSet> scroll_info;
|
| + scoped_ptr<FrameTimingTracker::CompositeTimingSet> frame_composite_events;
|
| + scoped_ptr<FrameTimingTracker::MainFrameTimingSet> frame_render_events;
|
| size_t memory_allocation_limit_bytes;
|
| int memory_allocation_priority_cutoff;
|
| bool evicted_ui_resources;
|
|
|