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_factory.h" | 5 #include "cc/surfaces/surface_factory.h" |
6 | 6 |
7 #include "base/trace_event/trace_event.h" | 7 #include "base/trace_event/trace_event.h" |
8 #include "cc/output/compositor_frame.h" | 8 #include "cc/output/compositor_frame.h" |
9 #include "cc/output/copy_output_request.h" | 9 #include "cc/output/copy_output_request.h" |
10 #include "cc/surfaces/surface.h" | 10 #include "cc/surfaces/surface.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 void SurfaceFactory::DestroyAll() { | 33 void SurfaceFactory::DestroyAll() { |
34 for (auto it = surface_map_.begin(); it != surface_map_.end(); ++it) | 34 for (auto it = surface_map_.begin(); it != surface_map_.end(); ++it) |
35 manager_->Destroy(surface_map_.take(it)); | 35 manager_->Destroy(surface_map_.take(it)); |
36 surface_map_.clear(); | 36 surface_map_.clear(); |
37 } | 37 } |
38 | 38 |
39 void SurfaceFactory::Create(SurfaceId surface_id) { | 39 void SurfaceFactory::Create(SurfaceId surface_id) { |
40 scoped_ptr<Surface> surface(new Surface(surface_id, this)); | 40 scoped_ptr<Surface> surface(new Surface(surface_id, this)); |
41 manager_->RegisterSurface(surface.get()); | 41 manager_->RegisterSurface(surface.get()); |
42 DCHECK(!surface_map_.count(surface_id)); | 42 DCHECK(!surface_map_.count(surface_id)); |
43 surface_map_.add(surface_id, surface.Pass()); | 43 surface_map_.add(surface_id, std::move(surface)); |
44 } | 44 } |
45 | 45 |
46 void SurfaceFactory::Destroy(SurfaceId surface_id) { | 46 void SurfaceFactory::Destroy(SurfaceId surface_id) { |
47 OwningSurfaceMap::iterator it = surface_map_.find(surface_id); | 47 OwningSurfaceMap::iterator it = surface_map_.find(surface_id); |
48 DCHECK(it != surface_map_.end()); | 48 DCHECK(it != surface_map_.end()); |
49 DCHECK(it->second->factory().get() == this); | 49 DCHECK(it->second->factory().get() == this); |
50 manager_->Destroy(surface_map_.take_and_erase(it)); | 50 manager_->Destroy(surface_map_.take_and_erase(it)); |
51 } | 51 } |
52 | 52 |
53 void SurfaceFactory::SetBeginFrameSource(SurfaceId surface_id, | 53 void SurfaceFactory::SetBeginFrameSource(SurfaceId surface_id, |
54 BeginFrameSource* begin_frame_source) { | 54 BeginFrameSource* begin_frame_source) { |
55 client_->SetBeginFrameSource(surface_id, begin_frame_source); | 55 client_->SetBeginFrameSource(surface_id, begin_frame_source); |
56 } | 56 } |
57 | 57 |
58 void SurfaceFactory::SubmitCompositorFrame(SurfaceId surface_id, | 58 void SurfaceFactory::SubmitCompositorFrame(SurfaceId surface_id, |
59 scoped_ptr<CompositorFrame> frame, | 59 scoped_ptr<CompositorFrame> frame, |
60 const DrawCallback& callback) { | 60 const DrawCallback& callback) { |
61 TRACE_EVENT0("cc", "SurfaceFactory::SubmitCompositorFrame"); | 61 TRACE_EVENT0("cc", "SurfaceFactory::SubmitCompositorFrame"); |
62 OwningSurfaceMap::iterator it = surface_map_.find(surface_id); | 62 OwningSurfaceMap::iterator it = surface_map_.find(surface_id); |
63 DCHECK(it != surface_map_.end()); | 63 DCHECK(it != surface_map_.end()); |
64 DCHECK(it->second->factory().get() == this); | 64 DCHECK(it->second->factory().get() == this); |
65 it->second->QueueFrame(frame.Pass(), callback); | 65 it->second->QueueFrame(std::move(frame), callback); |
66 if (!manager_->SurfaceModified(surface_id)) { | 66 if (!manager_->SurfaceModified(surface_id)) { |
67 TRACE_EVENT_INSTANT0("cc", "Damage not visible.", TRACE_EVENT_SCOPE_THREAD); | 67 TRACE_EVENT_INSTANT0("cc", "Damage not visible.", TRACE_EVENT_SCOPE_THREAD); |
68 it->second->RunDrawCallbacks(SurfaceDrawStatus::DRAW_SKIPPED); | 68 it->second->RunDrawCallbacks(SurfaceDrawStatus::DRAW_SKIPPED); |
69 } | 69 } |
70 } | 70 } |
71 | 71 |
72 void SurfaceFactory::RequestCopyOfSurface( | 72 void SurfaceFactory::RequestCopyOfSurface( |
73 SurfaceId surface_id, | 73 SurfaceId surface_id, |
74 scoped_ptr<CopyOutputRequest> copy_request) { | 74 scoped_ptr<CopyOutputRequest> copy_request) { |
75 OwningSurfaceMap::iterator it = surface_map_.find(surface_id); | 75 OwningSurfaceMap::iterator it = surface_map_.find(surface_id); |
76 if (it == surface_map_.end()) { | 76 if (it == surface_map_.end()) { |
77 copy_request->SendEmptyResult(); | 77 copy_request->SendEmptyResult(); |
78 return; | 78 return; |
79 } | 79 } |
80 DCHECK(it->second->factory().get() == this); | 80 DCHECK(it->second->factory().get() == this); |
81 it->second->RequestCopyOfOutput(copy_request.Pass()); | 81 it->second->RequestCopyOfOutput(std::move(copy_request)); |
82 manager_->SurfaceModified(surface_id); | 82 manager_->SurfaceModified(surface_id); |
83 } | 83 } |
84 | 84 |
85 void SurfaceFactory::ReceiveFromChild( | 85 void SurfaceFactory::ReceiveFromChild( |
86 const TransferableResourceArray& resources) { | 86 const TransferableResourceArray& resources) { |
87 holder_.ReceiveFromChild(resources); | 87 holder_.ReceiveFromChild(resources); |
88 } | 88 } |
89 | 89 |
90 void SurfaceFactory::RefResources(const TransferableResourceArray& resources) { | 90 void SurfaceFactory::RefResources(const TransferableResourceArray& resources) { |
91 holder_.RefResources(resources); | 91 holder_.RefResources(resources); |
92 } | 92 } |
93 | 93 |
94 void SurfaceFactory::UnrefResources(const ReturnedResourceArray& resources) { | 94 void SurfaceFactory::UnrefResources(const ReturnedResourceArray& resources) { |
95 holder_.UnrefResources(resources); | 95 holder_.UnrefResources(resources); |
96 } | 96 } |
97 | 97 |
98 } // namespace cc | 98 } // namespace cc |
OLD | NEW |