OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "cc/surfaces/surface.h" | 5 #include "cc/surfaces/surface.h" |
6 | 6 |
7 #include "cc/output/compositor_frame.h" | 7 #include "cc/output/compositor_frame.h" |
8 #include "cc/output/copy_output_request.h" | 8 #include "cc/output/copy_output_request.h" |
9 #include "cc/surfaces/surface_factory.h" | 9 #include "cc/surfaces/surface_factory.h" |
10 | 10 |
(...skipping 15 matching lines...) Expand all Loading... | |
26 ReturnedResourceArray current_resources; | 26 ReturnedResourceArray current_resources; |
27 TransferableResource::ReturnResources( | 27 TransferableResource::ReturnResources( |
28 current_frame_->delegated_frame_data->resource_list, | 28 current_frame_->delegated_frame_data->resource_list, |
29 ¤t_resources); | 29 ¤t_resources); |
30 factory_->UnrefResources(current_resources); | 30 factory_->UnrefResources(current_resources); |
31 } | 31 } |
32 } | 32 } |
33 | 33 |
34 void Surface::QueueFrame(scoped_ptr<CompositorFrame> frame, | 34 void Surface::QueueFrame(scoped_ptr<CompositorFrame> frame, |
35 const base::Closure& callback) { | 35 const base::Closure& callback) { |
36 TakeLatencyInfo(&frame->metadata.latency_info); | |
36 scoped_ptr<CompositorFrame> previous_frame = current_frame_.Pass(); | 37 scoped_ptr<CompositorFrame> previous_frame = current_frame_.Pass(); |
37 current_frame_ = frame.Pass(); | 38 current_frame_ = frame.Pass(); |
38 factory_->ReceiveFromChild( | 39 factory_->ReceiveFromChild( |
39 current_frame_->delegated_frame_data->resource_list); | 40 current_frame_->delegated_frame_data->resource_list); |
40 ++frame_index_; | 41 ++frame_index_; |
41 | 42 |
42 if (previous_frame) { | 43 if (previous_frame) { |
43 ReturnedResourceArray previous_resources; | 44 ReturnedResourceArray previous_resources; |
44 TransferableResource::ReturnResources( | 45 TransferableResource::ReturnResources( |
45 previous_frame->delegated_frame_data->resource_list, | 46 previous_frame->delegated_frame_data->resource_list, |
46 &previous_resources); | 47 &previous_resources); |
47 factory_->UnrefResources(previous_resources); | 48 factory_->UnrefResources(previous_resources); |
48 } | 49 } |
49 if (!draw_callback_.is_null()) | 50 if (!draw_callback_.is_null()) |
50 draw_callback_.Run(); | 51 draw_callback_.Run(); |
51 draw_callback_ = callback; | 52 draw_callback_ = callback; |
52 } | 53 } |
53 | 54 |
54 void Surface::RequestCopyOfOutput(scoped_ptr<CopyOutputRequest> copy_request) { | 55 void Surface::RequestCopyOfOutput(scoped_ptr<CopyOutputRequest> copy_request) { |
55 // TODO(jbauman): Make this work. | 56 // TODO(jbauman): Make this work. |
56 copy_request->SendEmptyResult(); | 57 copy_request->SendEmptyResult(); |
57 } | 58 } |
58 | 59 |
59 const CompositorFrame* Surface::GetEligibleFrame() { | 60 const CompositorFrame* Surface::GetEligibleFrame() { |
60 return current_frame_.get(); | 61 return current_frame_.get(); |
61 } | 62 } |
62 | 63 |
64 void Surface::TakeLatencyInfo(std::vector<ui::LatencyInfo>* latency_info) { | |
65 if (!current_frame_) | |
66 return; | |
67 std::copy(current_frame_->metadata.latency_info.begin(), | |
jamesr
2014/09/02 19:04:28
if we expect the dest to be empty (which i think i
| |
68 current_frame_->metadata.latency_info.end(), | |
69 std::back_inserter(*latency_info)); | |
70 current_frame_->metadata.latency_info.clear(); | |
71 } | |
72 | |
63 void Surface::RunDrawCallbacks() { | 73 void Surface::RunDrawCallbacks() { |
64 if (!draw_callback_.is_null()) { | 74 if (!draw_callback_.is_null()) { |
65 base::Closure callback = draw_callback_; | 75 base::Closure callback = draw_callback_; |
66 draw_callback_ = base::Closure(); | 76 draw_callback_ = base::Closure(); |
67 callback.Run(); | 77 callback.Run(); |
68 } | 78 } |
69 } | 79 } |
70 | 80 |
71 } // namespace cc | 81 } // namespace cc |
OLD | NEW |