| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_ | 5 #ifndef CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_ |
| 6 #define CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_ | 6 #define CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/memory/shared_memory.h" |
| 12 #include "cc/cc_export.h" | 13 #include "cc/cc_export.h" |
| 13 #include "cc/input/selection.h" | 14 #include "cc/input/selection.h" |
| 15 #include "cc/resources/shared_bitmap.h" |
| 14 #include "cc/output/begin_frame_args.h" | 16 #include "cc/output/begin_frame_args.h" |
| 15 #include "cc/surfaces/surface_id.h" | 17 #include "cc/surfaces/surface_id.h" |
| 16 #include "third_party/skia/include/core/SkColor.h" | 18 #include "third_party/skia/include/core/SkColor.h" |
| 17 #include "ui/gfx/geometry/size_f.h" | 19 #include "ui/gfx/geometry/size_f.h" |
| 18 #include "ui/gfx/geometry/vector2d_f.h" | 20 #include "ui/gfx/geometry/vector2d_f.h" |
| 19 #include "ui/gfx/selection_bound.h" | 21 #include "ui/gfx/selection_bound.h" |
| 20 #include "ui/latency/latency_info.h" | 22 #include "ui/latency/latency_info.h" |
| 21 | 23 |
| 22 namespace cc { | 24 namespace cc { |
| 23 | 25 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 uint32_t content_source_id = 0; | 111 uint32_t content_source_id = 0; |
| 110 | 112 |
| 111 // BeginFrameAck for the BeginFrame that this CompositorFrame answers. | 113 // BeginFrameAck for the BeginFrame that this CompositorFrame answers. |
| 112 BeginFrameAck begin_frame_ack; | 114 BeginFrameAck begin_frame_ack; |
| 113 | 115 |
| 114 // Once the display compositor processes a frame containing a non-zero frame | 116 // Once the display compositor processes a frame containing a non-zero frame |
| 115 // token, the token is sent to embedder of the frame. This is helpful when | 117 // token, the token is sent to embedder of the frame. This is helpful when |
| 116 // the embedder wants to do something after a particular frame is processed. | 118 // the embedder wants to do something after a particular frame is processed. |
| 117 uint32_t frame_token = 0; | 119 uint32_t frame_token = 0; |
| 118 | 120 |
| 121 struct SharedBitmapInfo { |
| 122 SharedBitmapId id; |
| 123 base::SharedMemoryHandle handle; |
| 124 size_t size; |
| 125 }; |
| 126 |
| 127 std::vector<SharedBitmapInfo> shared_bitmaps_to_register; |
| 128 |
| 119 private: | 129 private: |
| 120 CompositorFrameMetadata(const CompositorFrameMetadata& other); | 130 CompositorFrameMetadata(const CompositorFrameMetadata& other); |
| 121 CompositorFrameMetadata operator=(const CompositorFrameMetadata&) = delete; | 131 CompositorFrameMetadata operator=(const CompositorFrameMetadata&) = delete; |
| 122 }; | 132 }; |
| 123 | 133 |
| 124 } // namespace cc | 134 } // namespace cc |
| 125 | 135 |
| 126 #endif // CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_ | 136 #endif // CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_ |
| OLD | NEW |