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

Unified Diff: cc/surfaces/surface_factory.cc

Issue 2449853004: Getting rid of DelegatedFrameData (Closed)
Patch Set: IsEmpty + rebase Created 4 years, 2 months 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: cc/surfaces/surface_factory.cc
diff --git a/cc/surfaces/surface_factory.cc b/cc/surfaces/surface_factory.cc
index 67cfce8aa8373f591e3a818edd74396b38f0c35f..19fd8910d660480a0c2e235b452d9330ab6ddfd9 100644
--- a/cc/surfaces/surface_factory.cc
+++ b/cc/surfaces/surface_factory.cc
@@ -76,18 +76,14 @@ void SurfaceFactory::SubmitCompositorFrame(const LocalFrameId& local_frame_id,
OwningSurfaceMap::iterator it = surface_map_.find(local_frame_id);
DCHECK(it != surface_map_.end());
DCHECK(it->second->factory().get() == this);
- const CompositorFrame& previous_frame = it->second->GetEligibleFrame();
// Tell the SurfaceManager if this is the first frame submitted with this
// LocalFrameId.
- if (!previous_frame.delegated_frame_data) {
+ if (!it->second->HasFrame()) {
float device_scale_factor = frame.metadata.device_scale_factor;
gfx::Size frame_size;
// CompositorFrames may not be populated with a RenderPass in unit tests.
- if (frame.delegated_frame_data &&
- !frame.delegated_frame_data->render_pass_list.empty()) {
- frame_size =
- frame.delegated_frame_data->render_pass_list[0]->output_rect.size();
- }
+ if (!frame.render_pass_list.empty())
+ frame_size = frame.render_pass_list[0]->output_rect.size();
manager_->SurfaceCreated(it->second->surface_id(), frame_size,
device_scale_factor);
}

Powered by Google App Engine
This is Rietveld 408576698