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

Unified Diff: components/exo/surface.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
Index: components/exo/surface.cc
diff --git a/components/exo/surface.cc b/components/exo/surface.cc
index 7bec786df4de698989671706eb84e3345437c127..5edc802f9635be0168c30c9bf197969867378ace 100644
--- a/components/exo/surface.cc
+++ b/components/exo/surface.cc
@@ -248,7 +248,7 @@ Surface::~Surface() {
if (begin_frame_source_ && needs_begin_frame_)
begin_frame_source_->RemoveObserver(this);
- if (!local_frame_id_.is_null())
+ if (local_frame_id_.is_valid())
factory_owner_->surface_factory_->Destroy(local_frame_id_);
surface_manager_->UnregisterSurfaceFactoryClient(
@@ -475,7 +475,7 @@ void Surface::CommitSurfaceHierarchy() {
}
cc::LocalFrameId old_local_frame_id = local_frame_id_;
- if (needs_commit_to_new_surface_ || local_frame_id_.is_null()) {
+ if (needs_commit_to_new_surface_ || !local_frame_id_.is_valid()) {
needs_commit_to_new_surface_ = false;
local_frame_id_ = factory_owner_->id_allocator_->GenerateId();
factory_owner_->surface_factory_->Create(local_frame_id_);
@@ -483,7 +483,7 @@ void Surface::CommitSurfaceHierarchy() {
UpdateSurface(true);
- if (!old_local_frame_id.is_null() && old_local_frame_id != local_frame_id_) {
+ if (old_local_frame_id.is_valid() && old_local_frame_id != local_frame_id_) {
factory_owner_->surface_factory_->SetPreviousFrameSurface(
local_frame_id_, old_local_frame_id);
factory_owner_->surface_factory_->Destroy(old_local_frame_id);
@@ -636,7 +636,7 @@ void Surface::CheckIfSurfaceHierarchyNeedsCommitToNewSurfaces() {
}
void Surface::OnLostResources() {
- if (local_frame_id_.is_null())
+ if (!local_frame_id_.is_valid())
return;
UpdateResource(false);
« no previous file with comments | « cc/test/test_compositor_frame_sink.cc ('k') | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698