Add cc::SurfaceInfo::is_valid()

ui/aura/mus/window_port_mus.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 "ui/aura/mus/window_port_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/mus/client_surface_embedder.h"
@@ skipping 14 matching lines @@
 // static
 WindowMus* WindowMus::Get(Window* window) {
   return WindowPortMus::Get(window);
 }
 
 WindowPortMus::WindowPortMus(WindowTreeClient* client,
                              WindowMusType window_mus_type)
     : WindowMus(window_mus_type), window_tree_client_(client) {}
 
 WindowPortMus::~WindowPortMus() {
-  if (surface_info_.id().is_valid())
+  if (surface_info_.is_valid())
     SetSurfaceInfoFromServer(cc::SurfaceInfo());
 
   // DESTROY is only scheduled from DestroyFromServer(), meaning if DESTROY is
   // present then the server originated the change.
   const WindowTreeClient::Origin origin =
       RemoveChangeByTypeAndData(ServerChangeType::DESTROY, ServerChangeData())
           ? WindowTreeClient::Origin::SERVER
           : WindowTreeClient::Origin::CLIENT;
   window_tree_client_->OnWindowMusDestroyed(this, origin);
 }
@@ skipping 192 matching lines @@
     const std::vector<uint8_t>* property_data) {
   ServerChangeData data;
   data.property_name = property_name;
   ScopedServerChange change(this, ServerChangeType::PROPERTY, data);
   GetPropertyConverter()->SetPropertyFromTransportValue(window_, property_name,
                                                         property_data);
 }
 
 void WindowPortMus::SetSurfaceInfoFromServer(
     const cc::SurfaceInfo& surface_info) {
-  if (surface_info_.id().is_valid()) {
+  if (surface_info_.is_valid()) {
     const cc::SurfaceId& existing_surface_id = surface_info_.id();
     const cc::SurfaceId& new_surface_id = surface_info.id();
     if (existing_surface_id.is_valid() &&
         existing_surface_id != new_surface_id) {
       // TODO(kylechar): Start return reference here?
     }
   }
 
   // The fact that SetSurfaceIdFromServer was called means that this window
   // corresponds to an embedded client.
-  if (!client_surface_embedder && surface_info.id().is_valid())
+  if (!client_surface_embedder && surface_info.is_valid())
     client_surface_embedder = base::MakeUnique<ClientSurfaceEmbedder>(window_);
 
-  if (surface_info.id().is_valid())
+  if (surface_info.is_valid())
     client_surface_embedder->UpdateSurface(surface_info);
   else
     client_surface_embedder.reset();
 
   surface_info_ = surface_info;
 }
 
 void WindowPortMus::DestroyFromServer() {
   std::unique_ptr<ScopedServerChange> remove_from_parent_change;
   if (window_->parent()) {
@@ skipping 168 matching lines @@
   change_data.property_name =
       GetPropertyConverter()->GetTransportNameForPropertyKey(key);
   // TODO(sky): investigate to see if we need to compare data. In particular do
   // we ever have a case where changing a property cascades into changing the
   // same property?
   if (!RemoveChangeByTypeAndData(ServerChangeType::PROPERTY, change_data))
     window_tree_client_->OnWindowMusPropertyChanged(this, key, std::move(data));
 }
 
 }  // namespace aura