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

Unified Diff: ui/android/delegated_frame_host_android.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 | « services/ui/ws/server_window_compositor_frame_sink.cc ('k') | ui/aura/mus/window_port_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/delegated_frame_host_android.cc
diff --git a/ui/android/delegated_frame_host_android.cc b/ui/android/delegated_frame_host_android.cc
index 72e98ef7652d61b7db05a1ccf08f52793176c361..da0d50b04755805961f9c7146159663dcc23ec00 100644
--- a/ui/android/delegated_frame_host_android.cc
+++ b/ui/android/delegated_frame_host_android.cc
@@ -221,7 +221,7 @@ void DelegatedFrameHostAndroid::UpdateContainerSizeinDIP(
void DelegatedFrameHostAndroid::RegisterFrameSinkHierarchy(
const cc::FrameSinkId& parent_id) {
- if (!registered_parent_frame_sink_id_.is_null())
+ if (registered_parent_frame_sink_id_.is_valid())
UnregisterFrameSinkHierarchy();
registered_parent_frame_sink_id_ = parent_id;
surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
@@ -229,7 +229,7 @@ void DelegatedFrameHostAndroid::RegisterFrameSinkHierarchy(
}
void DelegatedFrameHostAndroid::UnregisterFrameSinkHierarchy() {
- if (registered_parent_frame_sink_id_.is_null())
+ if (!registered_parent_frame_sink_id_.is_valid())
return;
surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
surface_manager_->UnregisterFrameSinkHierarchy(
« no previous file with comments | « services/ui/ws/server_window_compositor_frame_sink.cc ('k') | ui/aura/mus/window_port_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698