Replaced is_null() with is_valid in SurfaceId and related classes.

android_webview/browser/surfaces_instance.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/surfaces_instance.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
@@ skipping 67 matching lines @@
   DCHECK(!g_surfaces_instance);
   g_surfaces_instance = this;
 
 }
 
 SurfacesInstance::~SurfacesInstance() {
   DCHECK_EQ(g_surfaces_instance, this);
   g_surfaces_instance = nullptr;
 
   DCHECK(child_ids_.empty());
-  if (!root_id_.is_null())
+  if (root_id_.is_valid())
     surface_factory_->Destroy(root_id_);
 
   surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void SurfacesInstance::DisplayOutputSurfaceLost() {
   // Android WebView does not handle context loss.
   LOG(FATAL) << "Render thread context loss";
 }
 
@@ skipping 30 matching lines @@
 
   cc::SurfaceDrawQuad* surface_quad =
       render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
   surface_quad->SetNew(quad_state, gfx::Rect(quad_state->quad_layer_bounds),
                        gfx::Rect(quad_state->quad_layer_bounds), child_id);
 
   cc::CompositorFrame frame;
   frame.render_pass_list.push_back(std::move(render_pass));
   frame.metadata.referenced_surfaces = child_ids_;
 
-  if (root_id_.is_null()) {
+  if (!root_id_.is_valid()) {
     root_id_ = surface_id_allocator_->GenerateId();
     surface_factory_->Create(root_id_);
     display_->SetSurfaceId(cc::SurfaceId(frame_sink_id_, root_id_), 1.f);
   }
   surface_factory_->SubmitCompositorFrame(root_id_, std::move(frame),
                                           cc::SurfaceFactory::DrawCallback());
 
   display_->Resize(viewport);
   display_->DrawAndSwap();
 }
 
 void SurfacesInstance::AddChildId(const cc::SurfaceId& child_id) {
   DCHECK(std::find(child_ids_.begin(), child_ids_.end(), child_id) ==
          child_ids_.end());
   child_ids_.push_back(child_id);
-  if (!root_id_.is_null())
+  if (root_id_.is_valid())
     SetEmptyRootFrame();
 }
 
 void SurfacesInstance::RemoveChildId(const cc::SurfaceId& child_id) {
   auto itr = std::find(child_ids_.begin(), child_ids_.end(), child_id);
   DCHECK(itr != child_ids_.end());
   child_ids_.erase(itr);
-  if (!root_id_.is_null())
+  if (root_id_.is_valid())
     SetEmptyRootFrame();
 }
 
 void SurfacesInstance::SetEmptyRootFrame() {
   cc::CompositorFrame empty_frame;
   empty_frame.metadata.referenced_surfaces = child_ids_;
   surface_factory_->SubmitCompositorFrame(root_id_, std::move(empty_frame),
                                           cc::SurfaceFactory::DrawCallback());
 }
 
 void SurfacesInstance::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   // Root surface should have no resources to return.
   CHECK(resources.empty());
 }
 
 void SurfacesInstance::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // Parent compsitor calls DrawAndSwap directly and doesn't use
   // BeginFrameSource.
 }
 
 }  // namespace android_webview