Add cc::SurfaceInfo::is_valid()

services/ui/ws/frame_generator.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 "services/ui/ws/frame_generator.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/containers/adapters.h"
@@ skipping 25 matching lines @@
       widget, std::move(sink_request), binding_.CreateInterfacePtrAndBind(),
       std::move(display_request));
 }
 
 FrameGenerator::~FrameGenerator() = default;
 
 void FrameGenerator::SetDeviceScaleFactor(float device_scale_factor) {
   if (device_scale_factor_ == device_scale_factor)
     return;
   device_scale_factor_ = device_scale_factor;
-  if (window_manager_surface_info_.id().is_valid())
+  if (window_manager_surface_info_.is_valid())
     compositor_frame_sink_->SetNeedsBeginFrame(true);
 }
 
 void FrameGenerator::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) {
-  DCHECK(surface_info.id().is_valid());
+  DCHECK(surface_info.is_valid());
 
   // Only handle embedded surfaces changing here. The display root surface
   // changing is handled immediately after the CompositorFrame is submitted.
   if (surface_info != window_manager_surface_info_) {
     window_manager_surface_info_ = surface_info;
     compositor_frame_sink_->SetNeedsBeginFrame(true);
   }
 }
 
 void FrameGenerator::OnWindowDamaged() {
-  if (window_manager_surface_info_.id().is_valid())
+  if (window_manager_surface_info_.is_valid())
     compositor_frame_sink_->SetNeedsBeginFrame(true);
 }
 
 void FrameGenerator::DidReceiveCompositorFrameAck() {}
 
 void FrameGenerator::OnBeginFrame(const cc::BeginFrameArgs& begin_frame_arags) {
   if (!root_window_->visible())
     return;
 
   // TODO(fsamuel): We should add a trace for generating a top level frame.
@@ skipping 54 matching lines @@
     quad->SetNew(shared_state, output_rect, output_rect, render_pass_id,
                  0 /* mask_resource_id */, gfx::RectF() /* mask_uv_rect */,
                  gfx::Size() /* mask_texture_size */,
                  gfx::Vector2dF() /* filters_scale */,
                  gfx::PointF() /* filters_origin */,
                  gfx::RectF() /* tex_coord_rect */);
     frame.render_pass_list.push_back(std::move(invert_pass));
   }
   frame.metadata.device_scale_factor = device_scale_factor_;
 
-  if (window_manager_surface_info_.id().is_valid()) {
+  if (window_manager_surface_info_.is_valid()) {
     frame.metadata.referenced_surfaces.push_back(
         window_manager_surface_info_.id());
   }
 
   return frame;
 }
 
 void FrameGenerator::DrawWindow(cc::RenderPass* pass) {
-  DCHECK(window_manager_surface_info_.id().is_valid());
+  DCHECK(window_manager_surface_info_.is_valid());
 
   const gfx::Rect bounds_at_origin(
       window_manager_surface_info_.size_in_pixels());
 
   gfx::Transform quad_to_target_transform;
   quad_to_target_transform.Translate(bounds_at_origin.x(),
                                      bounds_at_origin.y());
 
   cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
 
@@ skipping 12 matching lines @@
   auto* quad = pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
   quad->SetAll(sqs, bounds_at_origin /* rect */, gfx::Rect() /* opaque_rect */,
                bounds_at_origin /* visible_rect */, true /* needs_blending*/,
                window_manager_surface_info_.id(),
                cc::SurfaceDrawQuadType::PRIMARY, nullptr);
 }
 
 }  // namespace ws
 
 }  // namespace ui