OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/exo/surface.h" | 5 #include "components/exo/surface.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
13 #include "base/trace_event/trace_event.h" | 13 #include "base/trace_event/trace_event.h" |
14 #include "base/trace_event/trace_event_argument.h" | 14 #include "base/trace_event/trace_event_argument.h" |
15 #include "cc/quads/render_pass.h" | 15 #include "cc/quads/render_pass.h" |
16 #include "cc/quads/shared_quad_state.h" | 16 #include "cc/quads/shared_quad_state.h" |
17 #include "cc/quads/solid_color_draw_quad.h" | 17 #include "cc/quads/solid_color_draw_quad.h" |
18 #include "cc/quads/texture_draw_quad.h" | 18 #include "cc/quads/texture_draw_quad.h" |
19 #include "cc/resources/single_release_callback.h" | 19 #include "cc/resources/single_release_callback.h" |
20 #include "cc/surfaces/surface.h" | 20 #include "cc/surfaces/surface.h" |
21 #include "cc/surfaces/surface_factory.h" | 21 #include "cc/surfaces/surface_factory.h" |
22 #include "cc/surfaces/surface_id_allocator.h" | 22 #include "cc/surfaces/surface_id_allocator.h" |
23 #include "cc/surfaces/surface_manager.h" | 23 #include "cc/surfaces/surface_manager.h" |
24 #include "components/exo/buffer.h" | 24 #include "components/exo/buffer.h" |
25 #include "components/exo/surface_delegate.h" | 25 #include "components/exo/surface_delegate.h" |
26 #include "components/exo/surface_observer.h" | 26 #include "components/exo/surface_observer.h" |
27 #include "mojo/public/cpp/bindings/strong_binding.h" | |
Fady Samuel
2016/11/23 14:39:03
I suspect you don't need this.
Alex Z.
2016/11/23 15:28:18
Done.
| |
27 #include "third_party/khronos/GLES2/gl2.h" | 28 #include "third_party/khronos/GLES2/gl2.h" |
28 #include "ui/aura/env.h" | 29 #include "ui/aura/env.h" |
29 #include "ui/aura/window_delegate.h" | 30 #include "ui/aura/window_delegate.h" |
30 #include "ui/aura/window_property.h" | 31 #include "ui/aura/window_property.h" |
31 #include "ui/aura/window_targeter.h" | 32 #include "ui/aura/window_targeter.h" |
32 #include "ui/base/cursor/cursor.h" | 33 #include "ui/base/cursor/cursor.h" |
33 #include "ui/base/hit_test.h" | 34 #include "ui/base/hit_test.h" |
34 #include "ui/compositor/layer.h" | 35 #include "ui/compositor/layer.h" |
35 #include "ui/events/event.h" | 36 #include "ui/events/event.h" |
36 #include "ui/gfx/buffer_format_util.h" | 37 #include "ui/gfx/buffer_format_util.h" |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
155 if (!surface) { | 156 if (!surface) { |
156 LOG(ERROR) << "Attempting to require callback on nonexistent surface"; | 157 LOG(ERROR) << "Attempting to require callback on nonexistent surface"; |
157 return; | 158 return; |
158 } | 159 } |
159 surface->AddDestructionDependency(sequence); | 160 surface->AddDestructionDependency(sequence); |
160 } | 161 } |
161 | 162 |
162 } // namespace | 163 } // namespace |
163 | 164 |
164 //////////////////////////////////////////////////////////////////////////////// | 165 //////////////////////////////////////////////////////////////////////////////// |
165 // SurfaceFactoryOwner, public: | |
166 | |
167 SurfaceFactoryOwner::SurfaceFactoryOwner() {} | |
168 | |
169 //////////////////////////////////////////////////////////////////////////////// | |
170 // cc::SurfaceFactoryClient overrides: | |
171 | |
172 void SurfaceFactoryOwner::ReturnResources( | |
173 const cc::ReturnedResourceArray& resources) { | |
174 scoped_refptr<SurfaceFactoryOwner> holder(this); | |
175 for (auto& resource : resources) { | |
176 auto it = release_callbacks_.find(resource.id); | |
177 DCHECK(it != release_callbacks_.end()); | |
178 it->second.second->Run(resource.sync_token, resource.lost); | |
179 release_callbacks_.erase(it); | |
180 } | |
181 } | |
182 | |
183 void SurfaceFactoryOwner::WillDrawSurface(const cc::LocalFrameId& id, | |
184 const gfx::Rect& damage_rect) { | |
185 if (surface_) | |
186 surface_->WillDraw(); | |
187 } | |
188 | |
189 void SurfaceFactoryOwner::SetBeginFrameSource( | |
190 cc::BeginFrameSource* begin_frame_source) { | |
191 if (surface_) | |
192 surface_->SetBeginFrameSource(begin_frame_source); | |
193 } | |
194 | |
195 //////////////////////////////////////////////////////////////////////////////// | |
196 // SurfaceFactoryOwner, private: | |
197 | |
198 SurfaceFactoryOwner::~SurfaceFactoryOwner() { | |
199 if (surface_factory_->manager()) | |
200 surface_factory_->manager()->InvalidateFrameSinkId(frame_sink_id_); | |
201 } | |
202 | |
203 //////////////////////////////////////////////////////////////////////////////// | |
204 // Surface, public: | 166 // Surface, public: |
205 | 167 |
168 // Note: Crashes due to null references | |
206 Surface::Surface() | 169 Surface::Surface() |
207 : window_(new aura::Window(new CustomWindowDelegate(this))), | 170 : window_(new aura::Window(new CustomWindowDelegate(this))), |
171 frame_sink_id_( | |
172 aura::Env::GetInstance()->context_factory()->AllocateFrameSinkId()), | |
208 surface_manager_( | 173 surface_manager_( |
209 aura::Env::GetInstance()->context_factory()->GetSurfaceManager()), | 174 aura::Env::GetInstance()->context_factory()->GetSurfaceManager()) { |
210 factory_owner_(new SurfaceFactoryOwner) { | 175 cc::mojom::MojoCompositorFrameSinkClientPtr pholder; |
176 cc::mojom::MojoCompositorFrameSinkClientRequest request = | |
177 mojo::GetProxy(&pholder); | |
178 std::unique_ptr<ExoCompositorFrameSink> compositor_frame_sink( | |
179 new ExoCompositorFrameSink(frame_sink_id_, surface_manager_, | |
180 std::move(pholder))); | |
181 compositor_frame_sink_holder_ = new CompositorFrameSinkHolder( | |
182 std::move(compositor_frame_sink), this, std::move(request)); | |
211 window_->SetType(ui::wm::WINDOW_TYPE_CONTROL); | 183 window_->SetType(ui::wm::WINDOW_TYPE_CONTROL); |
212 window_->SetName("ExoSurface"); | 184 window_->SetName("ExoSurface"); |
213 window_->SetProperty(kSurfaceKey, this); | 185 window_->SetProperty(kSurfaceKey, this); |
214 window_->Init(ui::LAYER_SOLID_COLOR); | 186 window_->Init(ui::LAYER_SOLID_COLOR); |
215 window_->SetEventTargeter(base::WrapUnique(new CustomWindowTargeter)); | 187 window_->SetEventTargeter(base::WrapUnique(new CustomWindowTargeter)); |
216 window_->set_owned_by_parent(false); | 188 window_->set_owned_by_parent(false); |
217 window_->AddObserver(this); | 189 window_->AddObserver(this); |
218 factory_owner_->surface_ = this; | |
219 factory_owner_->frame_sink_id_ = | |
220 aura::Env::GetInstance()->context_factory()->AllocateFrameSinkId(); | |
221 factory_owner_->id_allocator_.reset(new cc::SurfaceIdAllocator()); | |
222 surface_manager_->RegisterFrameSinkId(factory_owner_->frame_sink_id_); | |
223 surface_manager_->RegisterSurfaceFactoryClient(factory_owner_->frame_sink_id_, | |
224 factory_owner_.get()); | |
225 factory_owner_->surface_factory_.reset(new cc::SurfaceFactory( | |
226 factory_owner_->frame_sink_id_, surface_manager_, factory_owner_.get())); | |
227 aura::Env::GetInstance()->context_factory()->AddObserver(this); | 190 aura::Env::GetInstance()->context_factory()->AddObserver(this); |
228 } | 191 } |
229 | 192 |
230 Surface::~Surface() { | 193 Surface::~Surface() { |
231 aura::Env::GetInstance()->context_factory()->RemoveObserver(this); | 194 aura::Env::GetInstance()->context_factory()->RemoveObserver(this); |
232 for (SurfaceObserver& observer : observers_) | 195 for (SurfaceObserver& observer : observers_) |
233 observer.OnSurfaceDestroying(this); | 196 observer.OnSurfaceDestroying(this); |
234 | 197 |
235 window_->RemoveObserver(this); | 198 window_->RemoveObserver(this); |
236 window_->layer()->SetShowSolidColorContent(); | 199 window_->layer()->SetShowSolidColorContent(); |
237 | 200 |
238 factory_owner_->surface_ = nullptr; | |
239 | |
240 // Call pending frame callbacks with a null frame time to indicate that they | 201 // Call pending frame callbacks with a null frame time to indicate that they |
241 // have been cancelled. | 202 // have been cancelled. |
242 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); | 203 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); |
243 active_frame_callbacks_.splice(active_frame_callbacks_.end(), | 204 active_frame_callbacks_.splice(active_frame_callbacks_.end(), |
244 frame_callbacks_); | 205 frame_callbacks_); |
245 for (const auto& frame_callback : active_frame_callbacks_) | 206 for (const auto& frame_callback : active_frame_callbacks_) |
246 frame_callback.Run(base::TimeTicks()); | 207 frame_callback.Run(base::TimeTicks()); |
247 | 208 |
248 if (begin_frame_source_ && needs_begin_frame_) | 209 if (begin_frame_source_ && needs_begin_frame_) |
249 begin_frame_source_->RemoveObserver(this); | 210 begin_frame_source_->RemoveObserver(this); |
250 | |
251 if (local_frame_id_.is_valid()) | |
252 factory_owner_->surface_factory_->Destroy(local_frame_id_); | |
253 | |
254 surface_manager_->UnregisterSurfaceFactoryClient( | |
255 factory_owner_->frame_sink_id_); | |
256 } | 211 } |
257 | 212 |
258 // static | 213 // static |
259 Surface* Surface::AsSurface(const aura::Window* window) { | 214 Surface* Surface::AsSurface(const aura::Window* window) { |
260 return window->GetProperty(kSurfaceKey); | 215 return window->GetProperty(kSurfaceKey); |
261 } | 216 } |
262 | 217 |
263 cc::SurfaceId Surface::GetSurfaceId() const { | 218 cc::SurfaceId Surface::GetSurfaceId() const { |
264 return cc::SurfaceId(factory_owner_->frame_sink_id_, local_frame_id_); | 219 return cc::SurfaceId(frame_sink_id_, local_frame_id_); |
265 } | 220 } |
266 | 221 |
267 void Surface::Attach(Buffer* buffer) { | 222 void Surface::Attach(Buffer* buffer) { |
268 TRACE_EVENT1("exo", "Surface::Attach", "buffer", | 223 TRACE_EVENT1("exo", "Surface::Attach", "buffer", |
269 buffer ? buffer->GetSize().ToString() : "null"); | 224 buffer ? buffer->GetSize().ToString() : "null"); |
270 | 225 |
271 has_pending_contents_ = true; | 226 has_pending_contents_ = true; |
272 pending_buffer_.Reset(buffer ? buffer->AsWeakPtr() : base::WeakPtr<Buffer>()); | 227 pending_buffer_.Reset(buffer ? buffer->AsWeakPtr() : base::WeakPtr<Buffer>()); |
273 } | 228 } |
274 | 229 |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
471 has_pending_contents_ = false; | 426 has_pending_contents_ = false; |
472 | 427 |
473 current_buffer_ = std::move(pending_buffer_); | 428 current_buffer_ = std::move(pending_buffer_); |
474 | 429 |
475 UpdateResource(true); | 430 UpdateResource(true); |
476 } | 431 } |
477 | 432 |
478 cc::LocalFrameId old_local_frame_id = local_frame_id_; | 433 cc::LocalFrameId old_local_frame_id = local_frame_id_; |
479 if (needs_commit_to_new_surface_ || !local_frame_id_.is_valid()) { | 434 if (needs_commit_to_new_surface_ || !local_frame_id_.is_valid()) { |
480 needs_commit_to_new_surface_ = false; | 435 needs_commit_to_new_surface_ = false; |
481 local_frame_id_ = factory_owner_->id_allocator_->GenerateId(); | 436 local_frame_id_ = id_allocator_.GenerateId(); |
482 factory_owner_->surface_factory_->Create(local_frame_id_); | |
483 } | 437 } |
484 | 438 |
485 UpdateSurface(true); | 439 UpdateSurface(true); |
486 | 440 |
487 if (old_local_frame_id.is_valid() && old_local_frame_id != local_frame_id_) { | |
488 factory_owner_->surface_factory_->SetPreviousFrameSurface( | |
489 local_frame_id_, old_local_frame_id); | |
490 factory_owner_->surface_factory_->Destroy(old_local_frame_id); | |
491 } | |
492 | |
493 if (old_local_frame_id != local_frame_id_) { | 441 if (old_local_frame_id != local_frame_id_) { |
494 float contents_surface_to_layer_scale = 1.0; | 442 float contents_surface_to_layer_scale = 1.0; |
495 // The bounds must be updated before switching to the new surface, because | 443 // The bounds must be updated before switching to the new surface, because |
496 // the layer may be mirrored, in which case a surface change causes the | 444 // the layer may be mirrored, in which case a surface change causes the |
497 // mirror layer to update its surface using the latest bounds. | 445 // mirror layer to update its surface using the latest bounds. |
498 window_->layer()->SetBounds( | 446 window_->layer()->SetBounds( |
499 gfx::Rect(window_->layer()->bounds().origin(), content_size_)); | 447 gfx::Rect(window_->layer()->bounds().origin(), content_size_)); |
500 window_->layer()->SetShowSurface( | 448 window_->layer()->SetShowSurface( |
501 cc::SurfaceId(factory_owner_->frame_sink_id_, local_frame_id_), | 449 cc::SurfaceId(frame_sink_id_, local_frame_id_), |
502 base::Bind(&SatisfyCallback, base::Unretained(surface_manager_)), | 450 base::Bind(&SatisfyCallback, base::Unretained(surface_manager_)), |
503 base::Bind(&RequireCallback, base::Unretained(surface_manager_)), | 451 base::Bind(&RequireCallback, base::Unretained(surface_manager_)), |
504 content_size_, contents_surface_to_layer_scale, content_size_); | 452 content_size_, contents_surface_to_layer_scale, content_size_); |
505 window_->layer()->SetFillsBoundsOpaquely( | 453 window_->layer()->SetFillsBoundsOpaquely( |
506 state_.blend_mode == SkBlendMode::kSrc || | 454 state_.blend_mode == SkBlendMode::kSrc || |
507 state_.opaque_region.contains( | 455 state_.opaque_region.contains( |
508 gfx::RectToSkIRect(gfx::Rect(content_size_)))); | 456 gfx::RectToSkIRect(gfx::Rect(content_size_)))); |
509 } | 457 } |
510 | 458 |
511 // Reset damage. | 459 // Reset damage. |
512 pending_damage_.setEmpty(); | 460 pending_damage_.setEmpty(); |
513 | 461 |
514 DCHECK(!current_resource_.id || | 462 DCHECK( |
515 factory_owner_->release_callbacks_.count(current_resource_.id)); | 463 !current_resource_.id || |
464 compositor_frame_sink_holder_->HasReleaseCallbacks(current_resource_.id)); | |
516 | 465 |
517 // Move pending frame callbacks to the end of frame_callbacks_. | 466 // Move pending frame callbacks to the end of frame_callbacks_. |
518 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); | 467 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); |
519 | 468 |
520 // Synchronize window hierarchy. This will position and update the stacking | 469 // Synchronize window hierarchy. This will position and update the stacking |
521 // order of all sub-surfaces after committing all pending state of sub-surface | 470 // order of all sub-surfaces after committing all pending state of sub-surface |
522 // descendants. | 471 // descendants. |
523 aura::Window* stacking_target = nullptr; | 472 aura::Window* stacking_target = nullptr; |
524 for (auto& sub_surface_entry : pending_sub_surfaces_) { | 473 for (auto& sub_surface_entry : pending_sub_surfaces_) { |
525 Surface* sub_surface = sub_surface_entry.first; | 474 Surface* sub_surface = sub_surface_entry.first; |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
638 | 587 |
639 void Surface::OnLostResources() { | 588 void Surface::OnLostResources() { |
640 if (!local_frame_id_.is_valid()) | 589 if (!local_frame_id_.is_valid()) |
641 return; | 590 return; |
642 | 591 |
643 UpdateResource(false); | 592 UpdateResource(false); |
644 UpdateSurface(false); | 593 UpdateSurface(false); |
645 } | 594 } |
646 | 595 |
647 void Surface::OnWindowAddedToRootWindow(aura::Window* window) { | 596 void Surface::OnWindowAddedToRootWindow(aura::Window* window) { |
648 window->layer()->GetCompositor()->AddFrameSink( | 597 window->layer()->GetCompositor()->AddFrameSink(frame_sink_id_); |
649 factory_owner_->frame_sink_id_); | |
650 } | 598 } |
651 | 599 |
652 void Surface::OnWindowRemovingFromRootWindow(aura::Window* window, | 600 void Surface::OnWindowRemovingFromRootWindow(aura::Window* window, |
653 aura::Window* new_root) { | 601 aura::Window* new_root) { |
654 window->layer()->GetCompositor()->RemoveFrameSink( | 602 window->layer()->GetCompositor()->RemoveFrameSink(frame_sink_id_); |
655 factory_owner_->frame_sink_id_); | |
656 } | 603 } |
657 | 604 |
658 void Surface::OnBeginFrame(const cc::BeginFrameArgs& args) { | 605 void Surface::OnBeginFrame(const cc::BeginFrameArgs& args) { |
659 while (!active_frame_callbacks_.empty()) { | 606 while (!active_frame_callbacks_.empty()) { |
660 active_frame_callbacks_.front().Run(args.frame_time); | 607 active_frame_callbacks_.front().Run(args.frame_time); |
661 active_frame_callbacks_.pop_front(); | 608 active_frame_callbacks_.pop_front(); |
662 } | 609 } |
663 last_begin_frame_args_ = args; | 610 last_begin_frame_args_ = args; |
664 } | 611 } |
665 | 612 |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
745 resource.id = next_resource_id_++; | 692 resource.id = next_resource_id_++; |
746 resource.format = cc::RGBA_8888; | 693 resource.format = cc::RGBA_8888; |
747 resource.filter = | 694 resource.filter = |
748 texture_mailbox.nearest_neighbor() ? GL_NEAREST : GL_LINEAR; | 695 texture_mailbox.nearest_neighbor() ? GL_NEAREST : GL_LINEAR; |
749 resource.size = texture_mailbox.size_in_pixels(); | 696 resource.size = texture_mailbox.size_in_pixels(); |
750 resource.mailbox_holder = gpu::MailboxHolder(texture_mailbox.mailbox(), | 697 resource.mailbox_holder = gpu::MailboxHolder(texture_mailbox.mailbox(), |
751 texture_mailbox.sync_token(), | 698 texture_mailbox.sync_token(), |
752 texture_mailbox.target()); | 699 texture_mailbox.target()); |
753 resource.is_overlay_candidate = texture_mailbox.is_overlay_candidate(); | 700 resource.is_overlay_candidate = texture_mailbox.is_overlay_candidate(); |
754 | 701 |
755 factory_owner_->release_callbacks_[resource.id] = std::make_pair( | 702 compositor_frame_sink_holder_->AddResourceReleaseCallback( |
756 factory_owner_, std::move(texture_mailbox_release_callback)); | 703 resource.id, std::move(texture_mailbox_release_callback)); |
757 current_resource_ = resource; | 704 current_resource_ = resource; |
758 } else { | 705 } else { |
759 current_resource_.id = 0; | 706 current_resource_.id = 0; |
760 current_resource_.size = gfx::Size(); | 707 current_resource_.size = gfx::Size(); |
761 } | 708 } |
762 } | 709 } |
763 | 710 |
764 void Surface::UpdateSurface(bool full_damage) { | 711 void Surface::UpdateSurface(bool full_damage) { |
765 gfx::Size buffer_size = current_resource_.size; | 712 gfx::Size buffer_size = current_resource_.size; |
766 gfx::SizeF scaled_buffer_size( | 713 gfx::SizeF scaled_buffer_size( |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
836 frame.resource_list.push_back(current_resource_); | 783 frame.resource_list.push_back(current_resource_); |
837 } | 784 } |
838 } else { | 785 } else { |
839 cc::SolidColorDrawQuad* solid_quad = | 786 cc::SolidColorDrawQuad* solid_quad = |
840 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); | 787 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); |
841 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); | 788 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); |
842 } | 789 } |
843 | 790 |
844 frame.render_pass_list.push_back(std::move(render_pass)); | 791 frame.render_pass_list.push_back(std::move(render_pass)); |
845 | 792 |
846 factory_owner_->surface_factory_->SubmitCompositorFrame( | 793 compositor_frame_sink_holder_->SubmitCompositorFrame(local_frame_id_, |
847 local_frame_id_, std::move(frame), cc::SurfaceFactory::DrawCallback()); | 794 std::move(frame)); |
848 } | 795 } |
849 | 796 |
850 void Surface::UpdateNeedsBeginFrame() { | 797 void Surface::UpdateNeedsBeginFrame() { |
851 if (!begin_frame_source_) | 798 if (!begin_frame_source_) |
852 return; | 799 return; |
853 | 800 |
854 bool needs_begin_frame = !active_frame_callbacks_.empty(); | 801 bool needs_begin_frame = !active_frame_callbacks_.empty(); |
855 if (needs_begin_frame == needs_begin_frame_) | 802 if (needs_begin_frame == needs_begin_frame_) |
856 return; | 803 return; |
857 | 804 |
(...skipping 24 matching lines...) Expand all Loading... | |
882 | 829 |
883 int64_t Surface::GetPropertyInternal(const void* key, | 830 int64_t Surface::GetPropertyInternal(const void* key, |
884 int64_t default_value) const { | 831 int64_t default_value) const { |
885 std::map<const void*, Value>::const_iterator iter = prop_map_.find(key); | 832 std::map<const void*, Value>::const_iterator iter = prop_map_.find(key); |
886 if (iter == prop_map_.end()) | 833 if (iter == prop_map_.end()) |
887 return default_value; | 834 return default_value; |
888 return iter->second.value; | 835 return iter->second.value; |
889 } | 836 } |
890 | 837 |
891 } // namespace exo | 838 } // namespace exo |
OLD | NEW |