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

cc/surfaces/display.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 "cc/surfaces/display.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 98 matching lines @@
   TRACE_EVENT1("cc", "Display::SetVisible", "visible", visible);
   if (renderer_)
     renderer_->SetVisible(visible);
   if (scheduler_)
     scheduler_->SetVisible(visible);
   visible_ = visible;
 
   if (!visible) {
     // Damage tracker needs a full reset as renderer resources are dropped when
     // not visible.
-    if (aggregator_ && !current_surface_id_.is_null())
+    if (aggregator_ && current_surface_id_.is_valid())
       aggregator_->SetFullDamageForSurface(current_surface_id_);
   }
 }
 
 void Display::Resize(const gfx::Size& size) {
   if (size == current_surface_size_)
     return;
 
   TRACE_EVENT0("cc", "Display::Resize");
 
@@ skipping 17 matching lines @@
 }
 
 void Display::SetOutputIsSecure(bool secure) {
   if (secure == output_is_secure_)
     return;
   output_is_secure_ = secure;
 
   if (aggregator_) {
     aggregator_->set_output_is_secure(secure);
     // Force a redraw.
-    if (!current_surface_id_.is_null())
+    if (current_surface_id_.is_valid())
       aggregator_->SetFullDamageForSurface(current_surface_id_);
   }
 }
 
 void Display::InitializeRenderer() {
   // Not relevant for display compositor since it's not delegated.
   bool delegated_sync_points_required = false;
   resource_provider_.reset(new ResourceProvider(
       output_surface_->context_provider(), bitmap_manager_,
       gpu_memory_buffer_manager_, nullptr, settings_.highp_threshold_min,
@@ skipping 46 matching lines @@
   Surface* surface = surface_manager_->GetSurfaceForId(current_surface_id_);
   bool root_surface_resources_locked =
       !surface || !surface->GetEligibleFrame().delegated_frame_data;
   if (scheduler_)
     scheduler_->SetRootSurfaceResourcesLocked(root_surface_resources_locked);
 }
 
 bool Display::DrawAndSwap() {
   TRACE_EVENT0("cc", "Display::DrawAndSwap");
 
-  if (current_surface_id_.is_null()) {
+  if (!current_surface_id_.is_valid()) {
     TRACE_EVENT_INSTANT0("cc", "No root surface.", TRACE_EVENT_SCOPE_THREAD);
     return false;
   }
 
   if (!output_surface_) {
     TRACE_EVENT_INSTANT0("cc", "No output surface", TRACE_EVENT_SCOPE_THREAD);
     return false;
   }
 
   CompositorFrame frame = aggregator_->Aggregate(current_surface_id_);
@@ skipping 153 matching lines @@
 const SurfaceId& Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 void Display::ForceImmediateDrawAndSwapIfPossible() {
   if (scheduler_)
     scheduler_->ForceImmediateSwapIfPossible();
 }
 
 }  // namespace cc