| Index: cc/trees/layer_tree_host_common.h
|
| diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
|
| index 1f4717257bb4a44fdc1f6b657645a84847fc2912..ad136b13b1f82c2bcee631d4298c5f2768cd677e 100644
|
| --- a/cc/trees/layer_tree_host_common.h
|
| +++ b/cc/trees/layer_tree_host_common.h
|
| @@ -6,10 +6,12 @@
|
| #define CC_TREES_LAYER_TREE_HOST_COMMON_H_
|
|
|
| #include <limits>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| #include "base/memory/ref_counted.h"
|
| +#include "base/time/time.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/base/scoped_ptr_vector.h"
|
| #include "cc/layers/layer_lists.h"
|
| @@ -132,6 +134,13 @@ class CC_EXPORT LayerTreeHostCommon {
|
| int layer_id;
|
| gfx::Vector2d scroll_delta;
|
| };
|
| +
|
| + struct CompositeTimingInfo {
|
| + CompositeTimingInfo();
|
| + ~CompositeTimingInfo();
|
| + int64_t rect_id;
|
| + std::vector<std::pair<int, base::TimeTicks> > timestamps;
|
| + };
|
| };
|
|
|
| struct CC_EXPORT ScrollAndScaleSet {
|
| @@ -144,6 +153,16 @@ struct CC_EXPORT ScrollAndScaleSet {
|
| ScopedPtrVector<SwapPromise> swap_promises;
|
| };
|
|
|
| +struct CC_EXPORT CompositeTimingSet {
|
| + CompositeTimingSet();
|
| + ~CompositeTimingSet();
|
| +
|
| + std::vector<LayerTreeHostCommon::CompositeTimingInfo> composites;
|
| +};
|
| +
|
| +typedef std::vector<std::pair<int64_t, gfx::Rect> >
|
| + SmoothnessTimingRequestsType;
|
| +
|
| template <typename LayerType>
|
| bool LayerTreeHostCommon::RenderSurfaceContributesToTarget(
|
| LayerType* layer,
|
|
|