| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index ff7325c4291032cbd263309fa278ed7d3e1f060d..fdc3e6cb9be6eb0e8cac89b0c477fe0fbec264ad 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -5,8 +5,10 @@
|
| #ifndef CC_TREES_THREAD_PROXY_H_
|
| #define CC_TREES_THREAD_PROXY_H_
|
|
|
| +#include <set>
|
| #include <string>
|
|
|
| +#include "base/containers/hash_tables.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| @@ -51,6 +53,7 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| unsigned int begin_frame_id;
|
| BeginFrameArgs begin_frame_args;
|
| scoped_ptr<ScrollAndScaleSet> scroll_info;
|
| + scoped_ptr<CompositeTimingSet> smoothness_composite_counts;
|
| size_t memory_allocation_limit_bytes;
|
| int memory_allocation_priority_cutoff;
|
| bool evicted_ui_resources;
|
|
|