| 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 7b26124a754f11d4e1c73a84141e04bc62f8b2b8..7c06b2f4f099963aa8f5cac1448708bf6f216aa1 100644
|
| --- a/ui/android/delegated_frame_host_android.cc
|
| +++ b/ui/android/delegated_frame_host_android.cc
|
| @@ -226,7 +226,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);
|
| @@ -234,7 +234,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(
|
|
|