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

android_webview/browser/hardware_renderer.cc

 // Copyright 2014 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/hardware_renderer.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/aw_render_thread_context_provider.h"
@@ skipping 23 matching lines @@
       last_submitted_compositor_frame_sink_id_(0u) {
   DCHECK(last_egl_context_);
   surfaces_->GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
   surfaces_->GetSurfaceManager()->RegisterSurfaceFactoryClient(frame_sink_id_,
                                                                this);
 }
 
 HardwareRenderer::~HardwareRenderer() {
   // Must reset everything before |surface_factory_| to ensure all
   // resources are returned before resetting.
-  if (!child_id_.is_null())
+  if (child_id_.is_valid())
     DestroySurface();
   surface_factory_.reset();
   surfaces_->GetSurfaceManager()->UnregisterSurfaceFactoryClient(
       frame_sink_id_);
   surfaces_->GetSurfaceManager()->InvalidateFrameSinkId(frame_sink_id_);
 
   // Reset draw constraints.
   render_thread_manager_->PostExternalDrawConstraintsToChildCompositorOnRT(
       ParentCompositorDrawConstraints());
   ReturnResourcesInChildFrame();
@@ skipping 27 matching lines @@
     DLOG(WARNING) << "EGLContextChanged";
 
   // SurfaceFactory::SubmitCompositorFrame might call glFlush. So calling it
   // during "kModeSync" stage (which does not allow GL) might result in extra
   // kModeProcess. Instead, submit the frame in "kModeDraw" stage to avoid
   // unnecessary kModeProcess.
   if (child_frame_.get() && child_frame_->frame.get()) {
     if (!compositor_id_.Equals(child_frame_->compositor_id) ||
         last_submitted_compositor_frame_sink_id_ !=
             child_frame_->compositor_frame_sink_id) {
-      if (!child_id_.is_null())
+      if (child_id_.is_valid())
         DestroySurface();
 
       // This will return all the resources to the previous compositor.
       surface_factory_.reset();
       compositor_id_ = child_frame_->compositor_id;
       last_submitted_compositor_frame_sink_id_ =
           child_frame_->compositor_frame_sink_id;
       surface_factory_.reset(new cc::SurfaceFactory(
           frame_sink_id_, surfaces_->GetSurfaceManager(), this));
     }
 
     std::unique_ptr<cc::CompositorFrame> child_compositor_frame =
         std::move(child_frame_->frame);
 
     gfx::Size frame_size =
         child_compositor_frame->delegated_frame_data->render_pass_list.back()
             ->output_rect.size();
     bool size_changed = frame_size != frame_size_;
     frame_size_ = frame_size;
-    if (child_id_.is_null() || size_changed) {
-      if (!child_id_.is_null())
+    if (!child_id_.is_valid() || size_changed) {
+      if (child_id_.is_valid())
         DestroySurface();
       AllocateSurface();
     }
 
     surface_factory_->SubmitCompositorFrame(child_id_,
                                             std::move(*child_compositor_frame),
                                             cc::SurfaceFactory::DrawCallback());
   }
 
   gfx::Transform transform(gfx::Transform::kSkipInitialization);
   transform.matrix().setColMajorf(draw_info->transform);
   transform.Translate(scroll_offset_.x(), scroll_offset_.y());
 
   gfx::Size viewport(draw_info->width, draw_info->height);
   // Need to post the new transform matrix back to child compositor
   // because there is no onDraw during a Render Thread animation, and child
   // compositor might not have the tiles rasterized as the animation goes on.
   ParentCompositorDrawConstraints draw_constraints(
       draw_info->is_layer, transform, viewport.IsEmpty());
   if (!child_frame_.get() || draw_constraints.NeedUpdate(*child_frame_)) {
     render_thread_manager_->PostExternalDrawConstraintsToChildCompositorOnRT(
         draw_constraints);
   }
 
-  if (child_id_.is_null())
+  if (!child_id_.is_valid())
     return;
 
   gfx::Rect clip(draw_info->clip_left, draw_info->clip_top,
                  draw_info->clip_right - draw_info->clip_left,
                  draw_info->clip_bottom - draw_info->clip_top);
   surfaces_->DrawAndSwap(viewport, clip, transform, frame_size_,
                          cc::SurfaceId(frame_sink_id_, child_id_));
 }
 
 void HardwareRenderer::AllocateSurface() {
-  DCHECK(child_id_.is_null());
+  DCHECK(!child_id_.is_valid());
   DCHECK(surface_factory_);
   child_id_ = surface_id_allocator_->GenerateId();
   surface_factory_->Create(child_id_);
   surfaces_->AddChildId(cc::SurfaceId(frame_sink_id_, child_id_));
 }
 
 void HardwareRenderer::DestroySurface() {
-  DCHECK(!child_id_.is_null());
+  DCHECK(child_id_.is_valid());
   DCHECK(surface_factory_);
 
   // Submit an empty frame to force any existing resources to be returned.
   cc::CompositorFrame empty_frame;
   empty_frame.delegated_frame_data =
       base::WrapUnique(new cc::DelegatedFrameData);
   surface_factory_->SubmitCompositorFrame(child_id_, std::move(empty_frame),
                                           cc::SurfaceFactory::DrawCallback());
 
   surfaces_->RemoveChildId(cc::SurfaceId(frame_sink_id_, child_id_));
@@ skipping 32 matching lines @@
     const cc::ReturnedResourceArray& resources,
     const CompositorID& compositor_id,
     uint32_t compositor_frame_sink_id) {
   if (compositor_frame_sink_id != last_committed_compositor_frame_sink_id_)
     return;
   render_thread_manager_->InsertReturnedResourcesOnRT(resources, compositor_id,
                                                       compositor_frame_sink_id);
 }
 
 }  // namespace android_webview