Revert of Mus+Ash: propagate Surface ID to parents

services/ui/ws/window_tree.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/ws/window_tree.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/ws/default_access_policy.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/event_matcher.h"
 #include "services/ui/ws/focus_controller.h"
 #include "services/ui/ws/operation.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_observer.h"
-#include "services/ui/ws/server_window_surface_manager.h"
 #include "services/ui/ws/user_display_manager.h"
 #include "services/ui/ws/window_manager_display_root.h"
 #include "services/ui/ws/window_manager_state.h"
 #include "services/ui/ws/window_server.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "ui/display/display.h"
 #include "ui/platform_window/mojo/ime_type_converters.h"
 #include "ui/platform_window/text_input_state.h"
 
 using mojo::Array;
@@ skipping 716 matching lines @@
     return;
   ClientWindowId client_window_id, transient_client_window_id;
   if (!IsWindowKnown(window, &client_window_id) ||
       !IsWindowKnown(transient_window, &transient_client_window_id)) {
     return;
   }
   client()->OnTransientWindowRemoved(client_window_id.id,
                                      transient_client_window_id.id);
 }
 
-void WindowTree::ProcessWindowSurfaceChanged(ServerWindow* window,
-                                             const cc::SurfaceId& surface_id,
-                                             const gfx::Size& frame_size,
-                                             float device_scale_factor) {
-  ServerWindow* parent_window = window->parent();
-  ClientWindowId client_window_id, parent_client_window_id;
-  if (!IsWindowKnown(window, &client_window_id) ||
-      !IsWindowKnown(parent_window, &parent_client_window_id) ||
-      !created_window_map_.count(parent_window->id())) {
-    return;
-  }
-
-  ServerWindowSurfaceManager* surface_manager =
-      window->GetOrCreateSurfaceManager();
-  ServerWindowSurface* surface = surface_manager->GetDefaultSurface();
-  cc::SurfaceSequence sequence = surface->CreateSurfaceSequence();
-  client()->OnWindowSurfaceChanged(client_window_id.id, surface_id, sequence,
-                                   frame_size, device_scale_factor);
-}
-
 void WindowTree::SendToPointerWatcher(const ui::Event& event,
                                       ServerWindow* target_window) {
   if (!EventMatchesPointerWatcher(event))
     return;
 
   ClientWindowId client_window_id;
   // Ignore the return value from IsWindowKnown() as in the case of the client
   // not knowing the window we'll send 0, which corresponds to no window.
   IsWindowKnown(target_window, &client_window_id);
   client()->OnPointerEventObserved(ui::Event::Clone(event),
@@ skipping 563 matching lines @@
       GetWindowByClientId(ClientWindowId(transport_window_id));
   const bool success =
       window && access_policy_->CanSetWindowSurface(window, type);
   if (!success) {
     DVLOG(1) << "request to AttachSurface failed";
     return;
   }
   window->CreateSurface(type, std::move(surface), std::move(client));
 }
 
-void WindowTree::OnWindowSurfaceDetached(Id transport_window_id,
-                                         const cc::SurfaceSequence& sequence) {
-  ServerWindow* window =
-      GetWindowByClientId(ClientWindowId(transport_window_id));
-  if (!window)
-    return;
-  window_server_->GetDisplayCompositor()->ReturnSurfaceReference(sequence);
-}
-
 void WindowTree::SetWindowTextInputState(Id transport_window_id,
                                          mojo::TextInputStatePtr state) {
   ServerWindow* window =
       GetWindowByClientId(ClientWindowId(transport_window_id));
   bool success = window && access_policy_->CanSetWindowTextInputState(window);
   if (success)
     window->SetTextInputState(state.To<ui::TextInputState>());
 }
 
 void WindowTree::SetImeVisibility(Id transport_window_id,
@@ skipping 554 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui