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" |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 if (!surface) { | 155 if (!surface) { |
156 LOG(ERROR) << "Attempting to require callback on nonexistent surface"; | 156 LOG(ERROR) << "Attempting to require callback on nonexistent surface"; |
157 return; | 157 return; |
158 } | 158 } |
159 surface->AddDestructionDependency(sequence); | 159 surface->AddDestructionDependency(sequence); |
160 } | 160 } |
161 | 161 |
162 } // namespace | 162 } // namespace |
163 | 163 |
164 //////////////////////////////////////////////////////////////////////////////// | 164 //////////////////////////////////////////////////////////////////////////////// |
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: | 165 // Surface, public: |
205 | 166 |
| 167 // Note: Crashes due to null references |
206 Surface::Surface() | 168 Surface::Surface() |
207 : window_(new aura::Window(new CustomWindowDelegate(this))), | 169 : window_(new aura::Window(new CustomWindowDelegate(this))), |
| 170 frame_sink_id_( |
| 171 aura::Env::GetInstance()->context_factory()->AllocateFrameSinkId()), |
208 surface_manager_( | 172 surface_manager_( |
209 aura::Env::GetInstance()->context_factory()->GetSurfaceManager()), | 173 aura::Env::GetInstance()->context_factory()->GetSurfaceManager()), |
210 factory_owner_(new SurfaceFactoryOwner) { | 174 weak_ptr_factory_(this) { |
| 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), weak_ptr_factory_.GetWeakPtr(), |
| 183 std::move(request)); |
211 window_->SetType(ui::wm::WINDOW_TYPE_CONTROL); | 184 window_->SetType(ui::wm::WINDOW_TYPE_CONTROL); |
212 window_->SetName("ExoSurface"); | 185 window_->SetName("ExoSurface"); |
213 window_->SetProperty(kSurfaceKey, this); | 186 window_->SetProperty(kSurfaceKey, this); |
214 window_->Init(ui::LAYER_SOLID_COLOR); | 187 window_->Init(ui::LAYER_SOLID_COLOR); |
215 window_->SetEventTargeter(base::WrapUnique(new CustomWindowTargeter)); | 188 window_->SetEventTargeter(base::WrapUnique(new CustomWindowTargeter)); |
216 window_->set_owned_by_parent(false); | 189 window_->set_owned_by_parent(false); |
217 window_->AddObserver(this); | 190 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); | 191 aura::Env::GetInstance()->context_factory()->AddObserver(this); |
228 } | 192 } |
229 | 193 |
230 Surface::~Surface() { | 194 Surface::~Surface() { |
231 aura::Env::GetInstance()->context_factory()->RemoveObserver(this); | 195 aura::Env::GetInstance()->context_factory()->RemoveObserver(this); |
232 for (SurfaceObserver& observer : observers_) | 196 for (SurfaceObserver& observer : observers_) |
233 observer.OnSurfaceDestroying(this); | 197 observer.OnSurfaceDestroying(this); |
234 | 198 |
235 window_->RemoveObserver(this); | 199 window_->RemoveObserver(this); |
236 window_->layer()->SetShowSolidColorContent(); | 200 window_->layer()->SetShowSolidColorContent(); |
237 | 201 |
238 factory_owner_->surface_ = nullptr; | |
239 | |
240 // Call pending frame callbacks with a null frame time to indicate that they | 202 // Call pending frame callbacks with a null frame time to indicate that they |
241 // have been cancelled. | 203 // have been cancelled. |
242 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); | 204 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); |
243 active_frame_callbacks_.splice(active_frame_callbacks_.end(), | 205 active_frame_callbacks_.splice(active_frame_callbacks_.end(), |
244 frame_callbacks_); | 206 frame_callbacks_); |
245 for (const auto& frame_callback : active_frame_callbacks_) | 207 for (const auto& frame_callback : active_frame_callbacks_) |
246 frame_callback.Run(base::TimeTicks()); | 208 frame_callback.Run(base::TimeTicks()); |
247 | 209 |
248 if (begin_frame_source_ && needs_begin_frame_) | 210 if (begin_frame_source_ && needs_begin_frame_) |
249 begin_frame_source_->RemoveObserver(this); | 211 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 } | 212 } |
257 | 213 |
258 // static | 214 // static |
259 Surface* Surface::AsSurface(const aura::Window* window) { | 215 Surface* Surface::AsSurface(const aura::Window* window) { |
260 return window->GetProperty(kSurfaceKey); | 216 return window->GetProperty(kSurfaceKey); |
261 } | 217 } |
262 | 218 |
263 cc::SurfaceId Surface::GetSurfaceId() const { | 219 cc::SurfaceId Surface::GetSurfaceId() const { |
264 return cc::SurfaceId(factory_owner_->frame_sink_id_, local_frame_id_); | 220 return cc::SurfaceId(frame_sink_id_, local_frame_id_); |
265 } | 221 } |
266 | 222 |
267 void Surface::Attach(Buffer* buffer) { | 223 void Surface::Attach(Buffer* buffer) { |
268 TRACE_EVENT1("exo", "Surface::Attach", "buffer", | 224 TRACE_EVENT1("exo", "Surface::Attach", "buffer", |
269 buffer ? buffer->GetSize().ToString() : "null"); | 225 buffer ? buffer->GetSize().ToString() : "null"); |
270 | 226 |
271 has_pending_contents_ = true; | 227 has_pending_contents_ = true; |
272 pending_buffer_.Reset(buffer ? buffer->AsWeakPtr() : base::WeakPtr<Buffer>()); | 228 pending_buffer_.Reset(buffer ? buffer->AsWeakPtr() : base::WeakPtr<Buffer>()); |
273 } | 229 } |
274 | 230 |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
471 has_pending_contents_ = false; | 427 has_pending_contents_ = false; |
472 | 428 |
473 current_buffer_ = std::move(pending_buffer_); | 429 current_buffer_ = std::move(pending_buffer_); |
474 | 430 |
475 UpdateResource(true); | 431 UpdateResource(true); |
476 } | 432 } |
477 | 433 |
478 cc::LocalFrameId old_local_frame_id = local_frame_id_; | 434 cc::LocalFrameId old_local_frame_id = local_frame_id_; |
479 if (needs_commit_to_new_surface_ || !local_frame_id_.is_valid()) { | 435 if (needs_commit_to_new_surface_ || !local_frame_id_.is_valid()) { |
480 needs_commit_to_new_surface_ = false; | 436 needs_commit_to_new_surface_ = false; |
481 local_frame_id_ = factory_owner_->id_allocator_->GenerateId(); | 437 local_frame_id_ = id_allocator_.GenerateId(); |
482 factory_owner_->surface_factory_->Create(local_frame_id_); | |
483 } | 438 } |
484 | 439 |
485 UpdateSurface(true); | 440 UpdateSurface(true); |
486 | 441 |
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_) { | 442 if (old_local_frame_id != local_frame_id_) { |
494 float contents_surface_to_layer_scale = 1.0; | 443 float contents_surface_to_layer_scale = 1.0; |
495 // The bounds must be updated before switching to the new surface, because | 444 // 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 | 445 // the layer may be mirrored, in which case a surface change causes the |
497 // mirror layer to update its surface using the latest bounds. | 446 // mirror layer to update its surface using the latest bounds. |
498 window_->layer()->SetBounds( | 447 window_->layer()->SetBounds( |
499 gfx::Rect(window_->layer()->bounds().origin(), content_size_)); | 448 gfx::Rect(window_->layer()->bounds().origin(), content_size_)); |
500 window_->layer()->SetShowSurface( | 449 window_->layer()->SetShowSurface( |
501 cc::SurfaceId(factory_owner_->frame_sink_id_, local_frame_id_), | 450 cc::SurfaceId(frame_sink_id_, local_frame_id_), |
502 base::Bind(&SatisfyCallback, base::Unretained(surface_manager_)), | 451 base::Bind(&SatisfyCallback, base::Unretained(surface_manager_)), |
503 base::Bind(&RequireCallback, base::Unretained(surface_manager_)), | 452 base::Bind(&RequireCallback, base::Unretained(surface_manager_)), |
504 content_size_, contents_surface_to_layer_scale, content_size_); | 453 content_size_, contents_surface_to_layer_scale, content_size_); |
505 window_->layer()->SetFillsBoundsOpaquely( | 454 window_->layer()->SetFillsBoundsOpaquely( |
506 state_.blend_mode == SkBlendMode::kSrc || | 455 state_.blend_mode == SkBlendMode::kSrc || |
507 state_.opaque_region.contains( | 456 state_.opaque_region.contains( |
508 gfx::RectToSkIRect(gfx::Rect(content_size_)))); | 457 gfx::RectToSkIRect(gfx::Rect(content_size_)))); |
509 } | 458 } |
510 | 459 |
511 // Reset damage. | 460 // Reset damage. |
512 pending_damage_.setEmpty(); | 461 pending_damage_.setEmpty(); |
513 | 462 |
514 DCHECK(!current_resource_.id || | 463 DCHECK( |
515 factory_owner_->release_callbacks_.count(current_resource_.id)); | 464 !current_resource_.id || |
| 465 compositor_frame_sink_holder_->HasReleaseCallbacks(current_resource_.id)); |
516 | 466 |
517 // Move pending frame callbacks to the end of frame_callbacks_. | 467 // Move pending frame callbacks to the end of frame_callbacks_. |
518 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); | 468 frame_callbacks_.splice(frame_callbacks_.end(), pending_frame_callbacks_); |
519 | 469 |
520 // Synchronize window hierarchy. This will position and update the stacking | 470 // Synchronize window hierarchy. This will position and update the stacking |
521 // order of all sub-surfaces after committing all pending state of sub-surface | 471 // order of all sub-surfaces after committing all pending state of sub-surface |
522 // descendants. | 472 // descendants. |
523 aura::Window* stacking_target = nullptr; | 473 aura::Window* stacking_target = nullptr; |
524 for (auto& sub_surface_entry : pending_sub_surfaces_) { | 474 for (auto& sub_surface_entry : pending_sub_surfaces_) { |
525 Surface* sub_surface = sub_surface_entry.first; | 475 Surface* sub_surface = sub_surface_entry.first; |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
638 | 588 |
639 void Surface::OnLostResources() { | 589 void Surface::OnLostResources() { |
640 if (!local_frame_id_.is_valid()) | 590 if (!local_frame_id_.is_valid()) |
641 return; | 591 return; |
642 | 592 |
643 UpdateResource(false); | 593 UpdateResource(false); |
644 UpdateSurface(false); | 594 UpdateSurface(false); |
645 } | 595 } |
646 | 596 |
647 void Surface::OnWindowAddedToRootWindow(aura::Window* window) { | 597 void Surface::OnWindowAddedToRootWindow(aura::Window* window) { |
648 window->layer()->GetCompositor()->AddFrameSink( | 598 window->layer()->GetCompositor()->AddFrameSink(frame_sink_id_); |
649 factory_owner_->frame_sink_id_); | |
650 } | 599 } |
651 | 600 |
652 void Surface::OnWindowRemovingFromRootWindow(aura::Window* window, | 601 void Surface::OnWindowRemovingFromRootWindow(aura::Window* window, |
653 aura::Window* new_root) { | 602 aura::Window* new_root) { |
654 window->layer()->GetCompositor()->RemoveFrameSink( | 603 window->layer()->GetCompositor()->RemoveFrameSink(frame_sink_id_); |
655 factory_owner_->frame_sink_id_); | |
656 } | 604 } |
657 | 605 |
658 void Surface::OnBeginFrame(const cc::BeginFrameArgs& args) { | 606 void Surface::OnBeginFrame(const cc::BeginFrameArgs& args) { |
659 while (!active_frame_callbacks_.empty()) { | 607 while (!active_frame_callbacks_.empty()) { |
660 active_frame_callbacks_.front().Run(args.frame_time); | 608 active_frame_callbacks_.front().Run(args.frame_time); |
661 active_frame_callbacks_.pop_front(); | 609 active_frame_callbacks_.pop_front(); |
662 } | 610 } |
663 last_begin_frame_args_ = args; | 611 last_begin_frame_args_ = args; |
664 } | 612 } |
665 | 613 |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
745 resource.id = next_resource_id_++; | 693 resource.id = next_resource_id_++; |
746 resource.format = cc::RGBA_8888; | 694 resource.format = cc::RGBA_8888; |
747 resource.filter = | 695 resource.filter = |
748 texture_mailbox.nearest_neighbor() ? GL_NEAREST : GL_LINEAR; | 696 texture_mailbox.nearest_neighbor() ? GL_NEAREST : GL_LINEAR; |
749 resource.size = texture_mailbox.size_in_pixels(); | 697 resource.size = texture_mailbox.size_in_pixels(); |
750 resource.mailbox_holder = gpu::MailboxHolder(texture_mailbox.mailbox(), | 698 resource.mailbox_holder = gpu::MailboxHolder(texture_mailbox.mailbox(), |
751 texture_mailbox.sync_token(), | 699 texture_mailbox.sync_token(), |
752 texture_mailbox.target()); | 700 texture_mailbox.target()); |
753 resource.is_overlay_candidate = texture_mailbox.is_overlay_candidate(); | 701 resource.is_overlay_candidate = texture_mailbox.is_overlay_candidate(); |
754 | 702 |
755 factory_owner_->release_callbacks_[resource.id] = std::make_pair( | 703 compositor_frame_sink_holder_->AddResourceReleaseCallback( |
756 factory_owner_, std::move(texture_mailbox_release_callback)); | 704 resource.id, std::move(texture_mailbox_release_callback)); |
757 current_resource_ = resource; | 705 current_resource_ = resource; |
758 } else { | 706 } else { |
759 current_resource_.id = 0; | 707 current_resource_.id = 0; |
760 current_resource_.size = gfx::Size(); | 708 current_resource_.size = gfx::Size(); |
761 } | 709 } |
762 } | 710 } |
763 | 711 |
764 void Surface::UpdateSurface(bool full_damage) { | 712 void Surface::UpdateSurface(bool full_damage) { |
765 gfx::Size buffer_size = current_resource_.size; | 713 gfx::Size buffer_size = current_resource_.size; |
766 gfx::SizeF scaled_buffer_size( | 714 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_); | 784 frame.resource_list.push_back(current_resource_); |
837 } | 785 } |
838 } else { | 786 } else { |
839 cc::SolidColorDrawQuad* solid_quad = | 787 cc::SolidColorDrawQuad* solid_quad = |
840 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); | 788 render_pass->CreateAndAppendDrawQuad<cc::SolidColorDrawQuad>(); |
841 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); | 789 solid_quad->SetNew(quad_state, quad_rect, quad_rect, SK_ColorBLACK, false); |
842 } | 790 } |
843 | 791 |
844 frame.render_pass_list.push_back(std::move(render_pass)); | 792 frame.render_pass_list.push_back(std::move(render_pass)); |
845 | 793 |
846 factory_owner_->surface_factory_->SubmitCompositorFrame( | 794 compositor_frame_sink_holder_->SubmitCompositorFrame(local_frame_id_, |
847 local_frame_id_, std::move(frame), cc::SurfaceFactory::DrawCallback()); | 795 std::move(frame)); |
848 } | 796 } |
849 | 797 |
850 void Surface::UpdateNeedsBeginFrame() { | 798 void Surface::UpdateNeedsBeginFrame() { |
851 if (!begin_frame_source_) | 799 if (!begin_frame_source_) |
852 return; | 800 return; |
853 | 801 |
854 bool needs_begin_frame = !active_frame_callbacks_.empty(); | 802 bool needs_begin_frame = !active_frame_callbacks_.empty(); |
855 if (needs_begin_frame == needs_begin_frame_) | 803 if (needs_begin_frame == needs_begin_frame_) |
856 return; | 804 return; |
857 | 805 |
(...skipping 24 matching lines...) Expand all Loading... |
882 | 830 |
883 int64_t Surface::GetPropertyInternal(const void* key, | 831 int64_t Surface::GetPropertyInternal(const void* key, |
884 int64_t default_value) const { | 832 int64_t default_value) const { |
885 std::map<const void*, Value>::const_iterator iter = prop_map_.find(key); | 833 std::map<const void*, Value>::const_iterator iter = prop_map_.find(key); |
886 if (iter == prop_map_.end()) | 834 if (iter == prop_map_.end()) |
887 return default_value; | 835 return default_value; |
888 return iter->second.value; | 836 return iter->second.value; |
889 } | 837 } |
890 | 838 |
891 } // namespace exo | 839 } // namespace exo |
OLD | NEW |