| Index: blimp/client/core/compositor/blimp_compositor.cc
|
| diff --git a/blimp/client/core/compositor/blimp_compositor.cc b/blimp/client/core/compositor/blimp_compositor.cc
|
| index 9159663e20681493d86250020a5bc62b65cea886..637cd95079260e1090c337b0891b941386a8f720 100644
|
| --- a/blimp/client/core/compositor/blimp_compositor.cc
|
| +++ b/blimp/client/core/compositor/blimp_compositor.cc
|
| @@ -203,7 +203,7 @@ void BlimpCompositor::RequestCopyOfOutput(
|
| std::move(copy_request), weak_ptr_factory_.GetWeakPtr(),
|
| base::ThreadTaskRunnerHandle::Get()));
|
| host_->SetNeedsCommit();
|
| - } else if (!local_frame_id_.is_null()) {
|
| + } else if (local_frame_id_.is_valid()) {
|
| // Make a copy request for the surface directly.
|
| surface_factory_->RequestCopyOfSurface(local_frame_id_,
|
| std::move(copy_request));
|
| @@ -418,7 +418,7 @@ void BlimpCompositor::SubmitCompositorFrame(cc::CompositorFrame frame) {
|
| cc::RenderPass* root_pass = frame.render_pass_list.back().get();
|
| gfx::Size surface_size = root_pass->output_rect.size();
|
|
|
| - if (local_frame_id_.is_null() || current_surface_size_ != surface_size) {
|
| + if (!local_frame_id_.is_valid() || current_surface_size_ != surface_size) {
|
| DestroyDelegatedContent();
|
| DCHECK(layer_->children().empty());
|
|
|
| @@ -515,7 +515,7 @@ CompositorDependencies* BlimpCompositor::GetEmbedderDeps() {
|
| }
|
|
|
| void BlimpCompositor::DestroyDelegatedContent() {
|
| - if (local_frame_id_.is_null())
|
| + if (!local_frame_id_.is_valid())
|
| return;
|
|
|
| // Remove any references for the surface layer that uses this
|
|
|