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

Unified Diff: cc/surfaces/surface_display_output_surface.cc

Issue 1088883004: Revert of Use null rather than empty frame to lock Surface resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « cc/surfaces/surface.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_display_output_surface.cc
diff --git a/cc/surfaces/surface_display_output_surface.cc b/cc/surfaces/surface_display_output_surface.cc
index ac89ab6118b82ecb640118f3c4c002f7a464ceb1..04937247d71a01d9f05047802c0dc5341d86143b 100644
--- a/cc/surfaces/surface_display_output_surface.cc
+++ b/cc/surfaces/surface_display_output_surface.cc
@@ -76,8 +76,12 @@
}
void SurfaceDisplayOutputSurface::ForceReclaimResources() {
- if (!surface_id_.is_null())
- factory_.SubmitFrame(surface_id_, nullptr, SurfaceFactory::DrawCallback());
+ if (!surface_id_.is_null()) {
+ scoped_ptr<CompositorFrame> empty_frame(new CompositorFrame());
+ empty_frame->delegated_frame_data.reset(new DelegatedFrameData);
+ factory_.SubmitFrame(surface_id_, empty_frame.Pass(),
+ SurfaceFactory::DrawCallback());
+ }
}
void SurfaceDisplayOutputSurface::ReturnResources(
« no previous file with comments | « cc/surfaces/surface.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698