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

Unified Diff: cc/surfaces/display.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/surfaces/direct_compositor_frame_sink.cc ('k') | cc/surfaces/frame_sink_id.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/display.cc
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index e0b0439ee7333b6d76e5ad438cc50b80d076da47..bbcf14a104224670d5145825a832be5347e489f4 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -126,7 +126,7 @@ void Display::SetVisible(bool visible) {
if (!visible) {
// Damage tracker needs a full reset as renderer resources are dropped when
// not visible.
- if (aggregator_ && !current_surface_id_.is_null())
+ if (aggregator_ && current_surface_id_.is_valid())
aggregator_->SetFullDamageForSurface(current_surface_id_);
}
}
@@ -164,7 +164,7 @@ void Display::SetOutputIsSecure(bool secure) {
if (aggregator_) {
aggregator_->set_output_is_secure(secure);
// Force a redraw.
- if (!current_surface_id_.is_null())
+ if (current_surface_id_.is_valid())
aggregator_->SetFullDamageForSurface(current_surface_id_);
}
}
@@ -230,7 +230,7 @@ void Display::DidLoseContextProvider() {
bool Display::DrawAndSwap() {
TRACE_EVENT0("cc", "Display::DrawAndSwap");
- if (current_surface_id_.is_null()) {
+ if (!current_surface_id_.is_valid()) {
TRACE_EVENT_INSTANT0("cc", "No root surface.", TRACE_EVENT_SCOPE_THREAD);
return false;
}
« no previous file with comments | « cc/surfaces/direct_compositor_frame_sink.cc ('k') | cc/surfaces/frame_sink_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698