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

Side by Side Diff: cc/surfaces/surface_display_output_surface.cc

Issue 1013463003: Update from https://crrev.com/320931 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « cc/surfaces/surface_aggregator_unittest.cc ('k') | cc/test/data/image_mask_of_layer.png » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "cc/surfaces/surface_display_output_surface.h" 5 #include "cc/surfaces/surface_display_output_surface.h"
6 6
7 #include "base/bind.h"
7 #include "cc/output/compositor_frame.h" 8 #include "cc/output/compositor_frame.h"
8 #include "cc/output/compositor_frame_ack.h" 9 #include "cc/output/compositor_frame_ack.h"
9 #include "cc/surfaces/display.h" 10 #include "cc/surfaces/display.h"
10 #include "cc/surfaces/onscreen_display_client.h" 11 #include "cc/surfaces/onscreen_display_client.h"
11 #include "cc/surfaces/surface.h" 12 #include "cc/surfaces/surface.h"
12 #include "cc/surfaces/surface_manager.h" 13 #include "cc/surfaces/surface_manager.h"
13 14
14 namespace cc { 15 namespace cc {
15 16
16 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface( 17 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface(
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 if (client_) 90 if (client_)
90 client_->ReclaimResources(&ack); 91 client_->ReclaimResources(&ack);
91 } 92 }
92 93
93 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) { 94 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) {
94 if (client_ && !display_client_->output_surface_lost()) 95 if (client_ && !display_client_->output_surface_lost())
95 client_->DidSwapBuffersComplete(); 96 client_->DidSwapBuffersComplete();
96 } 97 }
97 98
98 } // namespace cc 99 } // namespace cc
OLDNEW
« no previous file with comments | « cc/surfaces/surface_aggregator_unittest.cc ('k') | cc/test/data/image_mask_of_layer.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698