Unify SurfaceInfo

services/ui/public/cpp/window.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 "services/ui/public/cpp/window.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 526 matching lines @@
     // we update local state only, and wait for the next focus change from the
     // server.
     client_->LocalSetFocus(nullptr);
   }
 
   // Remove from transient parent.
   if (transient_parent_)
     transient_parent_->LocalRemoveTransientWindow(this);
 
   // Return the surface reference if there is one.
-  if (surface_info_)
-    LocalSetSurfaceId(nullptr);
+  if (surface_info_.id().is_valid())
+    LocalSetSurfaceInfo(cc::SurfaceInfo());
 
   // Remove transient children.
   while (!transient_children_.empty()) {
     Window* transient_child = transient_children_.front();
     LocalRemoveTransientWindow(transient_child);
     transient_child->LocalDestroy();
     DCHECK(transient_children_.empty() ||
            transient_children_.front() != transient_child);
   }
 
@@ skipping 243 matching lines @@
   if (value) {
     properties_[name] = *value;
   } else if (it != properties_.end()) {
     properties_.erase(it);
   }
 
   for (auto& observer : observers_)
     observer.OnWindowSharedPropertyChanged(this, name, old_value_ptr, value);
 }
 
-void Window::LocalSetSurfaceId(std::unique_ptr<SurfaceInfo> surface_info) {
-  if (surface_info_) {
-    const cc::SurfaceId& existing_surface_id = surface_info_->surface_id;
-    cc::SurfaceId new_surface_id =
-        surface_info ? surface_info->surface_id : cc::SurfaceId();
+void Window::LocalSetSurfaceInfo(const cc::SurfaceInfo& surface_info) {
+  if (surface_info_.id().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?
     }
   }
   if (parent_ && parent_->surface_id_handler_) {
     parent_->surface_id_handler_->OnChildWindowSurfaceChanged(this,
-                                                              &surface_info);
+                                                              surface_info);
   }
-  surface_info_ = std::move(surface_info);
+  surface_info_ = surface_info;
 }
 
 void Window::NotifyWindowStackingChanged() {
   if (stacking_target_) {
     Children::const_iterator window_i = std::find(
         parent()->children().begin(), parent()->children().end(), this);
     DCHECK(window_i != parent()->children().end());
     if (window_i != parent()->children().begin() &&
         (*(window_i - 1) == stacking_target_))
       return;
@@ skipping 128 matching lines @@
     notifier->NotifyWindowReordered();
 
   return true;
 }
 
 // static
 Window** Window::GetStackingTarget(Window* window) {
   return &window->stacking_target_;
 }
 }  // namespace ui