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

Side by Side Diff: services/ui/ws/server_window_surface.cc

Issue 2167713002: cc: Delete SurfaceDrawStatus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Scott's comments Created 4 years, 5 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 | « services/ui/ws/frame_generator.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "services/ui/ws/server_window_surface.h" 5 #include "services/ui/ws/server_window_surface.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "cc/output/compositor_frame.h" 8 #include "cc/output/compositor_frame.h"
9 #include "cc/quads/shared_quad_state.h" 9 #include "cc/quads/shared_quad_state.h"
10 #include "cc/quads/surface_draw_quad.h" 10 #include "cc/quads/surface_draw_quad.h"
11 #include "services/ui/surfaces/surfaces_state.h" 11 #include "services/ui/surfaces/surfaces_state.h"
12 #include "services/ui/ws/server_window.h" 12 #include "services/ui/ws/server_window.h"
13 #include "services/ui/ws/server_window_delegate.h" 13 #include "services/ui/ws/server_window_delegate.h"
14 #include "services/ui/ws/server_window_surface_manager.h" 14 #include "services/ui/ws/server_window_surface_manager.h"
15 15
16 namespace ui { 16 namespace ui {
17 namespace ws { 17 namespace ws {
18 namespace {
19
20 void CallCallback(const base::Closure& callback, cc::SurfaceDrawStatus status) {
21 callback.Run();
22 }
23
24 } // namespace
25 18
26 ServerWindowSurface::ServerWindowSurface( 19 ServerWindowSurface::ServerWindowSurface(
27 ServerWindowSurfaceManager* manager, 20 ServerWindowSurfaceManager* manager,
28 mojo::InterfaceRequest<Surface> request, 21 mojo::InterfaceRequest<Surface> request,
29 mojom::SurfaceClientPtr client) 22 mojom::SurfaceClientPtr client)
30 : manager_(manager), 23 : manager_(manager),
31 surface_id_(manager->GenerateId()), 24 surface_id_(manager->GenerateId()),
32 surface_factory_(manager_->GetSurfaceManager(), this), 25 surface_factory_(manager_->GetSurfaceManager(), this),
33 client_(std::move(client)), 26 client_(std::move(client)),
34 binding_(this, std::move(request)), 27 binding_(this, std::move(request)),
(...skipping 29 matching lines...) Expand all
64 // this we schedule destruction via the delegate. The delegate will call 57 // this we schedule destruction via the delegate. The delegate will call
65 // us back when we're not waiting on a frame to be drawn (which may be 58 // us back when we're not waiting on a frame to be drawn (which may be
66 // synchronously). 59 // synchronously).
67 surfaces_scheduled_for_destruction_.insert(surface_id_); 60 surfaces_scheduled_for_destruction_.insert(surface_id_);
68 window()->delegate()->ScheduleSurfaceDestruction(window()); 61 window()->delegate()->ScheduleSurfaceDestruction(window());
69 surface_id_ = manager_->GenerateId(); 62 surface_id_ = manager_->GenerateId();
70 surface_factory_.Create(surface_id_); 63 surface_factory_.Create(surface_id_);
71 } 64 }
72 } 65 }
73 surface_factory_.SubmitCompositorFrame(surface_id_, std::move(frame), 66 surface_factory_.SubmitCompositorFrame(surface_id_, std::move(frame),
74 base::Bind(&CallCallback, callback)); 67 callback);
75 last_submitted_frame_size_ = frame_size; 68 last_submitted_frame_size_ = frame_size;
76 window()->delegate()->OnScheduleWindowPaint(window()); 69 window()->delegate()->OnScheduleWindowPaint(window());
77 } 70 }
78 71
79 void ServerWindowSurface::DestroySurfacesScheduledForDestruction() { 72 void ServerWindowSurface::DestroySurfacesScheduledForDestruction() {
80 std::set<cc::SurfaceId> surfaces; 73 std::set<cc::SurfaceId> surfaces;
81 surfaces.swap(surfaces_scheduled_for_destruction_); 74 surfaces.swap(surfaces_scheduled_for_destruction_);
82 for (auto& id : surfaces) 75 for (auto& id : surfaces)
83 surface_factory_.Destroy(id); 76 surface_factory_.Destroy(id);
84 } 77 }
(...skipping 16 matching lines...) Expand all
101 client_->ReturnResources(mojo::Array<cc::ReturnedResource>::From(resources)); 94 client_->ReturnResources(mojo::Array<cc::ReturnedResource>::From(resources));
102 } 95 }
103 96
104 void ServerWindowSurface::SetBeginFrameSource( 97 void ServerWindowSurface::SetBeginFrameSource(
105 cc::BeginFrameSource* begin_frame_source) { 98 cc::BeginFrameSource* begin_frame_source) {
106 // TODO(tansell): Implement this. 99 // TODO(tansell): Implement this.
107 } 100 }
108 101
109 } // namespace ws 102 } // namespace ws
110 } // namespace ui 103 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/frame_generator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698