Delete mus surfaces hit testing

components/mus/ws/display.cc

 // Copyright 2015 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 "components/mus/ws/display.h"
 
 #include <set>
 #include <vector>
 
 #include "base/debug/debugger.h"
@@ skipping 218 matching lines @@
 void Display::SetTitle(const mojo::String& title) {
   platform_display_->SetTitle(title.To<base::string16>());
 }
 
 void Display::InitWindowManagersIfNecessary() {
   if (!init_called_ || !root_)
     return;
 
   display_manager()->OnDisplayAcceleratedWidgetAvailable(this);
   if (binding_) {
-    std::unique_ptr<WindowManagerState> wms_ptr(new WindowManagerState(
-        this, platform_display_.get(), top_level_surface_id_));
+    std::unique_ptr<WindowManagerState> wms_ptr(
+        new WindowManagerState(this, platform_display_.get()));
     WindowManagerState* wms = wms_ptr.get();
     // For this case we never create additional WindowManagerStates, so any
     // id works.
     window_manager_state_map_[shell::mojom::kRootUserID] = std::move(wms_ptr);
     wms->tree_ = binding_->CreateWindowTree(wms->root());
   } else {
     CreateWindowManagerStatesFromRegistry();
   }
 }
 
 void Display::CreateWindowManagerStatesFromRegistry() {
   std::vector<WindowManagerFactoryService*> services =
       window_server_->window_manager_factory_registry()->GetServices();
   for (WindowManagerFactoryService* service : services) {
     if (service->window_manager_factory())
       CreateWindowManagerStateFromService(service);
   }
 }
 
 void Display::CreateWindowManagerStateFromService(
     WindowManagerFactoryService* service) {
-  std::unique_ptr<WindowManagerState> wms_ptr(
-      new WindowManagerState(this, platform_display_.get(),
-                             top_level_surface_id_, service->user_id()));
+  std::unique_ptr<WindowManagerState> wms_ptr(new WindowManagerState(
+      this, platform_display_.get(), service->user_id()));
   WindowManagerState* wms = wms_ptr.get();
   window_manager_state_map_[service->user_id()] = std::move(wms_ptr);
   wms->tree_ = window_server_->CreateTreeForWindowManager(
       this, service->window_manager_factory(), wms->root(), service->user_id());
   if (!binding_) {
     const bool is_active =
         service->user_id() == window_server_->user_id_tracker()->active_id();
     wms->root()->SetVisible(is_active);
   }
 }
@@ skipping 34 matching lines @@
     root_->SetBounds(gfx::Rect(new_metrics.size_in_pixels.To<gfx::Size>()));
     const gfx::Rect wm_bounds(root_->bounds().size());
     for (auto& pair : window_manager_state_map_)
       pair.second->root()->SetBounds(wm_bounds);
   }
   // TODO(sky): if bounds changed, then need to update
   // Display/WindowManagerState appropriately (e.g. notify observers).
   window_server_->ProcessViewportMetricsChanged(this, old_metrics, new_metrics);
 }
 
-void Display::OnTopLevelSurfaceChanged(cc::SurfaceId surface_id) {
-  DCHECK(!root_);
-  // This should only be called once, and before we've created root_.
-  top_level_surface_id_ = surface_id;
-}
-
 void Display::OnCompositorFrameDrawn() {
   std::set<ServerWindow*> windows;
   windows.swap(windows_needing_frame_destruction_);
   for (ServerWindow* window : windows) {
     window->RemoveObserver(this);
     window->DestroySurfacesScheduledForDestruction();
   }
 }
 
 bool Display::CanHaveActiveChildren(ServerWindow* window) const {
@@ skipping 132 matching lines @@
   DCHECK_EQ(0u, window_manager_state_map_.count(id));
 }
 
 void Display::OnWindowManagerFactorySet(WindowManagerFactoryService* service) {
   if (!binding_)
     CreateWindowManagerStateFromService(service);
 }
 
 }  // namespace ws
 }  // namespace mus