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

Unified Diff: ui/compositor/compositor.cc

Issue 2425923003: Replaced is_null() with is_valid in SurfaceId and related classes. (Closed)
Patch Set: Removed added printf statements; LocalFrameId::is_valid() no longer checks if nonce is 0. Created 4 years, 2 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
« cc/surfaces/local_frame_id.h ('K') | « ui/android/delegated_frame_host_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 1ee75e7699f3c3dc3a00c6d1d8ff96de5bf13224..34d2a4c6ae06c8400476d3695d9f56f43612765b 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -234,7 +234,7 @@ Compositor::~Compositor() {
context_factory_->RemoveCompositor(this);
auto* manager = context_factory_->GetSurfaceManager();
for (auto& client : child_frame_sinks_) {
- DCHECK(!client.is_null());
+ DCHECK(client.is_valid());
manager->UnregisterFrameSinkHierarchy(frame_sink_id_, client);
}
manager->InvalidateFrameSinkId(frame_sink_id_);
@@ -249,7 +249,7 @@ void Compositor::AddFrameSink(const cc::FrameSinkId& frame_sink_id) {
void Compositor::RemoveFrameSink(const cc::FrameSinkId& frame_sink_id) {
auto it = child_frame_sinks_.find(frame_sink_id);
DCHECK(it != child_frame_sinks_.end());
- DCHECK(!it->is_null());
+ DCHECK(it->is_valid());
context_factory_->GetSurfaceManager()->UnregisterFrameSinkHierarchy(
frame_sink_id_, *it);
child_frame_sinks_.erase(it);
« cc/surfaces/local_frame_id.h ('K') | « ui/android/delegated_frame_host_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698