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

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

Issue 2425923003: Replaced is_null() with is_valid in SurfaceId and related classes. (Closed)
Patch Set: Rebase 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 unified diff | Download patch
« no previous file with comments | « cc/layers/surface_layer_unittest.cc ('k') | cc/surfaces/display.cc » ('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/direct_compositor_frame_sink.h" 5 #include "cc/surfaces/direct_compositor_frame_sink.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "cc/output/compositor_frame.h" 8 #include "cc/output/compositor_frame.h"
9 #include "cc/output/compositor_frame_sink_client.h" 9 #include "cc/output/compositor_frame_sink_client.h"
10 #include "cc/surfaces/display.h" 10 #include "cc/surfaces/display.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // Avoid initializing GL context here, as this should be sharing the 75 // Avoid initializing GL context here, as this should be sharing the
76 // Display's context. 76 // Display's context.
77 display_->Initialize(this, surface_manager_, frame_sink_id_); 77 display_->Initialize(this, surface_manager_, frame_sink_id_);
78 return true; 78 return true;
79 } 79 }
80 80
81 void DirectCompositorFrameSink::DetachFromClient() { 81 void DirectCompositorFrameSink::DetachFromClient() {
82 // Unregister the SurfaceFactoryClient here instead of the dtor so that only 82 // Unregister the SurfaceFactoryClient here instead of the dtor so that only
83 // one client is alive for this namespace at any given time. 83 // one client is alive for this namespace at any given time.
84 surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_); 84 surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
85 if (!delegated_local_frame_id_.is_null()) 85 if (delegated_local_frame_id_.is_valid())
86 factory_.Destroy(delegated_local_frame_id_); 86 factory_.Destroy(delegated_local_frame_id_);
87 87
88 CompositorFrameSink::DetachFromClient(); 88 CompositorFrameSink::DetachFromClient();
89 } 89 }
90 90
91 void DirectCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) { 91 void DirectCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
92 gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size(); 92 gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size();
93 if (frame_size.IsEmpty() || frame_size != last_swap_frame_size_) { 93 if (frame_size.IsEmpty() || frame_size != last_swap_frame_size_) {
94 if (!delegated_local_frame_id_.is_null()) { 94 if (delegated_local_frame_id_.is_valid()) {
95 factory_.Destroy(delegated_local_frame_id_); 95 factory_.Destroy(delegated_local_frame_id_);
96 } 96 }
97 delegated_local_frame_id_ = surface_id_allocator_.GenerateId(); 97 delegated_local_frame_id_ = surface_id_allocator_.GenerateId();
98 factory_.Create(delegated_local_frame_id_); 98 factory_.Create(delegated_local_frame_id_);
99 last_swap_frame_size_ = frame_size; 99 last_swap_frame_size_ = frame_size;
100 } 100 }
101 display_->SetSurfaceId(SurfaceId(frame_sink_id_, delegated_local_frame_id_), 101 display_->SetSurfaceId(SurfaceId(frame_sink_id_, delegated_local_frame_id_),
102 frame.metadata.device_scale_factor); 102 frame.metadata.device_scale_factor);
103 103
104 factory_.SubmitCompositorFrame( 104 factory_.SubmitCompositorFrame(
105 delegated_local_frame_id_, std::move(frame), 105 delegated_local_frame_id_, std::move(frame),
106 base::Bind(&DirectCompositorFrameSink::DidDrawCallback, 106 base::Bind(&DirectCompositorFrameSink::DidDrawCallback,
107 base::Unretained(this))); 107 base::Unretained(this)));
108 } 108 }
109 109
110 void DirectCompositorFrameSink::ForceReclaimResources() { 110 void DirectCompositorFrameSink::ForceReclaimResources() {
111 if (!delegated_local_frame_id_.is_null()) { 111 if (delegated_local_frame_id_.is_valid()) {
112 factory_.SubmitCompositorFrame(delegated_local_frame_id_, CompositorFrame(), 112 factory_.SubmitCompositorFrame(delegated_local_frame_id_, CompositorFrame(),
113 SurfaceFactory::DrawCallback()); 113 SurfaceFactory::DrawCallback());
114 } 114 }
115 } 115 }
116 116
117 void DirectCompositorFrameSink::ReturnResources( 117 void DirectCompositorFrameSink::ReturnResources(
118 const ReturnedResourceArray& resources) { 118 const ReturnedResourceArray& resources) {
119 if (client_) 119 if (client_)
120 client_->ReclaimResources(resources); 120 client_->ReclaimResources(resources);
121 } 121 }
(...skipping 19 matching lines...) Expand all
141 // This notification is not relevant to our client outside of tests. We 141 // This notification is not relevant to our client outside of tests. We
142 // unblock the client from DidDrawCallback() when the surface is going to 142 // unblock the client from DidDrawCallback() when the surface is going to
143 // be drawn. 143 // be drawn.
144 } 144 }
145 145
146 void DirectCompositorFrameSink::DidDrawCallback() { 146 void DirectCompositorFrameSink::DidDrawCallback() {
147 client_->DidReceiveCompositorFrameAck(); 147 client_->DidReceiveCompositorFrameAck();
148 } 148 }
149 149
150 } // namespace cc 150 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/surface_layer_unittest.cc ('k') | cc/surfaces/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698