Revert of Mus+Ash: propagate Surface ID to parents

services/ui/public/cpp/window.cc

Index: services/ui/public/cpp/window.cc
diff --git a/services/ui/public/cpp/window.cc b/services/ui/public/cpp/window.cc
index f03060604e0ad6ff8162bd23b472c79bab644fe9..966e51888c18a26e688a91a45c1a44010347b7a9 100644
--- a/services/ui/public/cpp/window.cc
+++ b/services/ui/public/cpp/window.cc
@@ -14,7 +14,6 @@
 #include "base/macros.h"
 #include "services/ui/common/transient_window_utils.h"
 #include "services/ui/public/cpp/property_type_converters.h"
-#include "services/ui/public/cpp/surface_id_handler.h"
 #include "services/ui/public/cpp/window_observer.h"
 #include "services/ui/public/cpp/window_private.h"
 #include "services/ui/public/cpp/window_property.h"
@@ -534,10 +533,6 @@
   if (transient_parent_)
     transient_parent_->LocalRemoveTransientWindow(this);
 
-  // Return the surface reference if there is one.
-  if (surface_info_)
-    LocalSetSurfaceId(nullptr);
-
   // Remove transient children.
   while (!transient_children_.empty()) {
     Window* transient_child = transient_children_.front();
@@ -587,7 +582,6 @@
       // Matches aura, see aura::Window for details.
       observers_(base::ObserverList<WindowObserver>::NOTIFY_EXISTING_ONLY),
       input_event_handler_(nullptr),
-      surface_id_handler_(nullptr),
       visible_(false),
       opacity_(1.0f),
       display_id_(display::Display::kInvalidDisplayID),
@@ -794,25 +788,6 @@
   FOR_EACH_OBSERVER(
       WindowObserver, observers_,
       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;
-    if (!existing_surface_id.is_null() &&
-        existing_surface_id != surface_info->surface_id) {
-      // Return the existing surface sequence.
-      if (client_) {
-        client_->OnWindowSurfaceDetached(server_id_,
-                                         surface_info_->surface_sequence);
-      }
-    }
-  }
-  if (parent_ && parent_->surface_id_handler_) {
-    parent_->surface_id_handler_->OnChildWindowSurfaceChanged(this,
-                                                              &surface_info);
-  }
-  surface_info_ = std::move(surface_info);
 }
 
 void Window::NotifyWindowStackingChanged() {