| Index: content/renderer/android/synchronous_compositor_frame_sink.cc
|
| diff --git a/content/renderer/android/synchronous_compositor_frame_sink.cc b/content/renderer/android/synchronous_compositor_frame_sink.cc
|
| index 788b36f45cfcf0c5844b2266ea5a038e3479750c..b2f48abdbb69a40c6acfc014cf62243fc22c459a 100644
|
| --- a/content/renderer/android/synchronous_compositor_frame_sink.cc
|
| +++ b/content/renderer/android/synchronous_compositor_frame_sink.cc
|
| @@ -194,7 +194,7 @@ void SynchronousCompositorFrameSink::DetachFromClient() {
|
| begin_frame_source_ = nullptr;
|
| registry_->UnregisterCompositorFrameSink(routing_id_, this);
|
| client_->SetTreeActivationCallback(base::Closure());
|
| - if (!root_local_frame_id_.is_null()) {
|
| + if (root_local_frame_id_.is_valid()) {
|
| surface_factory_->Destroy(root_local_frame_id_);
|
| surface_factory_->Destroy(child_local_frame_id_);
|
| }
|
| @@ -231,7 +231,7 @@ void SynchronousCompositorFrameSink::SubmitCompositorFrame(
|
| // the |frame| for the software path below.
|
| submit_frame.metadata = frame.metadata.Clone();
|
|
|
| - if (root_local_frame_id_.is_null()) {
|
| + if (!root_local_frame_id_.is_valid()) {
|
| root_local_frame_id_ = surface_id_allocator_->GenerateId();
|
| surface_factory_->Create(root_local_frame_id_);
|
| child_local_frame_id_ = surface_id_allocator_->GenerateId();
|
|
|