Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1191)

Unified Diff: components/exo/surface.cc

Issue 2485473003: Remove SurfaceFactory::Create and SurfaceFactory::Destroy (Closed)
Patch Set: up Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/exo/surface.cc
diff --git a/components/exo/surface.cc b/components/exo/surface.cc
index 7bec786df4de698989671706eb84e3345437c127..70876f5981827d6697bfb500a1131feb425d230f 100644
--- a/components/exo/surface.cc
+++ b/components/exo/surface.cc
@@ -244,12 +244,9 @@ Surface::~Surface() {
frame_callbacks_);
for (const auto& frame_callback : active_frame_callbacks_)
frame_callback.Run(base::TimeTicks());
-
if (begin_frame_source_ && needs_begin_frame_)
begin_frame_source_->RemoveObserver(this);
- if (!local_frame_id_.is_null())
- factory_owner_->surface_factory_->Destroy(local_frame_id_);
surface_manager_->UnregisterSurfaceFactoryClient(
factory_owner_->frame_sink_id_);
@@ -478,7 +475,9 @@ void Surface::CommitSurfaceHierarchy() {
if (needs_commit_to_new_surface_ || local_frame_id_.is_null()) {
needs_commit_to_new_surface_ = false;
local_frame_id_ = factory_owner_->id_allocator_->GenerateId();
- factory_owner_->surface_factory_->Create(local_frame_id_);
+ factory_owner_->surface_factory_->SubmitCompositorFrame(
Fady Samuel 2016/11/08 22:23:59 Is this necessary?
Saman Sami 2016/11/11 17:49:58 Removed
+ local_frame_id_, cc::CompositorFrame(),
+ cc::SurfaceFactory::DrawCallback());
}
UpdateSurface(true);
@@ -486,7 +485,6 @@ void Surface::CommitSurfaceHierarchy() {
if (!old_local_frame_id.is_null() && old_local_frame_id != local_frame_id_) {
factory_owner_->surface_factory_->SetPreviousFrameSurface(
local_frame_id_, old_local_frame_id);
- factory_owner_->surface_factory_->Destroy(old_local_frame_id);
}
if (old_local_frame_id != local_frame_id_) {

Powered by Google App Engine
This is Rietveld 408576698