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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/surface_layer_unittest.cc ('k') | cc/surfaces/display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/direct_compositor_frame_sink.cc
diff --git a/cc/surfaces/direct_compositor_frame_sink.cc b/cc/surfaces/direct_compositor_frame_sink.cc
index b504ab1539ea12530f910a0f58d37c0719386b27..5dfd7e0e356fc7cf216f4a4d109fa51551dd429d 100644
--- a/cc/surfaces/direct_compositor_frame_sink.cc
+++ b/cc/surfaces/direct_compositor_frame_sink.cc
@@ -82,7 +82,7 @@ void DirectCompositorFrameSink::DetachFromClient() {
// Unregister the SurfaceFactoryClient here instead of the dtor so that only
// one client is alive for this namespace at any given time.
surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
- if (!delegated_local_frame_id_.is_null())
+ if (delegated_local_frame_id_.is_valid())
factory_.Destroy(delegated_local_frame_id_);
CompositorFrameSink::DetachFromClient();
@@ -91,7 +91,7 @@ void DirectCompositorFrameSink::DetachFromClient() {
void DirectCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size();
if (frame_size.IsEmpty() || frame_size != last_swap_frame_size_) {
- if (!delegated_local_frame_id_.is_null()) {
+ if (delegated_local_frame_id_.is_valid()) {
factory_.Destroy(delegated_local_frame_id_);
}
delegated_local_frame_id_ = surface_id_allocator_.GenerateId();
@@ -108,7 +108,7 @@ void DirectCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
}
void DirectCompositorFrameSink::ForceReclaimResources() {
- if (!delegated_local_frame_id_.is_null()) {
+ if (delegated_local_frame_id_.is_valid()) {
factory_.SubmitCompositorFrame(delegated_local_frame_id_, CompositorFrame(),
SurfaceFactory::DrawCallback());
}
« 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