Create a unified UIElement interface for Widget, View and Window.

ash/common/devtools/ash_devtools_dom_agent.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 "ash/common/devtools/ash_devtools_dom_agent.h"
 
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
@@ skipping 119 matching lines @@
 }
 
 ui::devtools::protocol::Response AshDevToolsDOMAgent::hideHighlight() {
   if (widget_for_highlighting_ && widget_for_highlighting_->IsVisible())
     widget_for_highlighting_->Hide();
   return ui::devtools::protocol::Response::OK();
 }
 
 // Handles removing windows.
 void AshDevToolsDOMAgent::OnWindowHierarchyChanging(
-    const HierarchyChangeParams& params) {
+    const aura::WindowObserver::HierarchyChangeParams& params) {
   // Only trigger this when params.receiver == params.old_parent.
   // Only removals are handled here. Removing a node can occur as a result of
   // reorganizing a window or just destroying it. OnWindowHierarchyChanged
   // is only called if there is a new_parent. The only case this method isn't
   // called is when adding a node because old_parent is then null.
   // Finally, We only trigger this  0 or 1 times as an old_parent will
   // either exist and only call this callback once, or not at all.
   if (params.receiver == params.old_parent)
     RemoveWindowTree(WmWindow::Get(params.target), true);
 }
 
 // Handles adding windows.
 void AshDevToolsDOMAgent::OnWindowHierarchyChanged(
-    const HierarchyChangeParams& params) {
+    const aura::WindowObserver::HierarchyChangeParams& params) {
   // Only trigger this when params.receiver == params.new_parent.
   // If there is an old_parent + new_parent, then this window's node was
   // removed in OnWindowHierarchyChanging and will now be added to the
   // new_parent. If there is only a new_parent, OnWindowHierarchyChanging is
   // never called and the window is only added here.
   if (params.receiver == params.new_parent)
     AddWindowTree(WmWindow::Get(params.target));
 }
 
-void AshDevToolsDOMAgent::OnWindowStackingChanged(aura::Window* window) {
-  RemoveWindowTree(WmWindow::Get(window), false);
-  AddWindowTree(WmWindow::Get(window));
+// For WindowElement observers
+void AshDevToolsDOMAgent::NotifyOnWindowHierarchyChanging(
+    const aura::WindowObserver::HierarchyChangeParams& params) {
+  OnWindowHierarchyChanging(params);
 }
 
-void AshDevToolsDOMAgent::OnWindowBoundsChanged(aura::Window* window,
-                                                const gfx::Rect& old_bounds,
-                                                const gfx::Rect& new_bounds) {
-  for (auto& observer : observers_)
-    observer.OnWindowBoundsChanged(WmWindow::Get(window));
+void AshDevToolsDOMAgent::NotifyOnWindowHierarchyChanged(
+    const aura::WindowObserver::HierarchyChangeParams& params) {
+  OnWindowHierarchyChanged(params);
 }
 
-void AshDevToolsDOMAgent::OnWillRemoveView(views::Widget* widget,
-                                           views::View* view) {
-  if (view == widget->GetRootView())
-    RemoveViewTree(view, nullptr, true);
+void AshDevToolsDOMAgent::NotifyRemoveWindowTree(WmWindow* window,
+                                                 bool remove_observer) {
+  RemoveWindowTree(window, remove_observer);
 }
 
-void AshDevToolsDOMAgent::OnWidgetBoundsChanged(views::Widget* widget,
-                                                const gfx::Rect& new_bounds) {
+void AshDevToolsDOMAgent::NotifyAddWindowTree(WmWindow* window) {
+  AddWindowTree(window);
+}
+
+void AshDevToolsDOMAgent::NotfiyOnWindowBoundsChanged(WmWindow* window) {
+  for (auto& observer : observers_)
+    observer.OnWindowBoundsChanged(window);
+}
+
+// For ViewElement observers
+void AshDevToolsDOMAgent::NotifyRemoveViewTree(views::View* view,
+                                               views::View* parent,
+                                               bool remove_observer) {
+  RemoveViewTree(view, parent, true);
+}
+
+void AshDevToolsDOMAgent::NotifyAddViewTree(views::View* view) {
+  AddViewTree(view);
+}
+
+void AshDevToolsDOMAgent::NotifyOnViewBoundsChanged(views::View* view) {
+  for (auto& observer : observers_)
+    observer.OnViewBoundsChanged(view);
+}
+
+// For WidgetElement observers
+void AshDevToolsDOMAgent::NotifyOnWidgetBoundsChanged(views::Widget* widget) {
   for (auto& observer : observers_)
     observer.OnWidgetBoundsChanged(widget);
 }
 
-void AshDevToolsDOMAgent::OnChildViewRemoved(views::View* parent,
-                                             views::View* view) {
-  RemoveViewTree(view, parent, true);
-}
-
-void AshDevToolsDOMAgent::OnChildViewAdded(views::View* parent,
-                                           views::View* view) {
-  AddViewTree(view);
-}
-
-void AshDevToolsDOMAgent::OnChildViewReordered(views::View* parent,
-                                               views::View* view) {
-  RemoveViewTree(view, parent, false);
-  AddViewTree(view);
-}
-
-void AshDevToolsDOMAgent::OnViewBoundsChanged(views::View* view) {
+void AshDevToolsDOMAgent::OnUIElementBoundsChanged(UIElement* ui_element) {
   for (auto& observer : observers_)
-    observer.OnViewBoundsChanged(view);
+    observer.OnUIElementBoundsChanged(ui_element);
 }
 
 WmWindow* AshDevToolsDOMAgent::GetWindowFromNodeId(int nodeId) {
   return node_id_to_window_map_.count(nodeId) ? node_id_to_window_map_[nodeId]
                                               : nullptr;
 }
 
 views::Widget* AshDevToolsDOMAgent::GetWidgetFromNodeId(int nodeId) {
   return node_id_to_widget_map_.count(nodeId) ? node_id_to_widget_map_[nodeId]
                                               : nullptr;
@@ skipping 43 matching lines @@
   views::Widget* widget = GetWidgetFromWmWindow(window);
   if (widget)
     children->addItem(BuildTreeForRootWidget(widget));
   for (ash::WmWindow* child : window->GetChildren()) {
     if (!IsHighlightingWindow(child))
       children->addItem(BuildTreeForWindow(child));
   }
 
   std::unique_ptr<ui::devtools::protocol::DOM::Node> node =
       BuildNode("Window", GetAttributes(window), std::move(children));
-  if (!window->aura_window()->HasObserver(this))
-    window->aura_window()->AddObserver(this);
+  // if (!window->aura_window()->HasObserver(this))
+  // window->aura_window()->AddObserver(this);
   window_to_node_id_map_[window] = node->getNodeId();
   node_id_to_window_map_[node->getNodeId()] = window;
   return node;
 }
 
 std::unique_ptr<DOM::Node> AshDevToolsDOMAgent::BuildTreeForRootWidget(
     views::Widget* widget) {
   DCHECK(!widget_to_node_id_map_.count(widget));
   std::unique_ptr<Array<DOM::Node>> children = Array<DOM::Node>::create();
   children->addItem(BuildTreeForView(widget->GetRootView()));
   std::unique_ptr<ui::devtools::protocol::DOM::Node> node =
       BuildNode("Widget", GetAttributes(widget), std::move(children));
-  if (!widget->HasRemovalsObserver(this))
-    widget->AddRemovalsObserver(this);
+  // if (!widget->HasRemovalsObserver(this))
+  // widget->AddRemovalsObserver(this);
   widget_to_node_id_map_[widget] = node->getNodeId();
   node_id_to_widget_map_[node->getNodeId()] = widget;
   return node;
 }
 
 std::unique_ptr<DOM::Node> AshDevToolsDOMAgent::BuildTreeForView(
     views::View* view) {
   DCHECK(!view_to_node_id_map_.count(view));
   std::unique_ptr<Array<DOM::Node>> children = Array<DOM::Node>::create();
   for (int i = 0, count = view->child_count(); i < count; i++)
     children->addItem(BuildTreeForView(view->child_at(i)));
   std::unique_ptr<ui::devtools::protocol::DOM::Node> node =
       BuildNode("View", GetAttributes(view), std::move(children));
-  if (!view->HasObserver(this))
-    view->AddObserver(this);
+  // if (!view->HasObserver(this))
+  // view->AddObserver(this);
   view_to_node_id_map_[view] = node->getNodeId();
   node_id_to_view_map_[node->getNodeId()] = view;
   return node;
 }
 
 void AshDevToolsDOMAgent::AddWindowTree(WmWindow* window) {
   if (IsHighlightingWindow(window))
     return;
 
   DCHECK(window_to_node_id_map_.count(window->GetParent()));
@@ skipping 25 matching lines @@
       window_to_node_id_map_.find(window);
   DCHECK(window_to_node_id_it != window_to_node_id_map_.end());
 
   int node_id = window_to_node_id_it->second;
   int parent_id = GetNodeIdFromWindow(window->GetParent());
 
   NodeIdToWindowMap::iterator node_id_to_window_it =
       node_id_to_window_map_.find(node_id);
   DCHECK(node_id_to_window_it != node_id_to_window_map_.end());
 
-  if (remove_observer)
-    window->aura_window()->RemoveObserver(this);
+  // if (remove_observer)
+  // window->aura_window()->RemoveObserver(this);
 
   node_id_to_window_map_.erase(node_id_to_window_it);
   window_to_node_id_map_.erase(window_to_node_id_it);
   frontend()->childNodeRemoved(parent_id, node_id);
 }
 
 void AshDevToolsDOMAgent::RemoveWidgetTree(views::Widget* widget,
                                            bool remove_observer) {
   DCHECK(widget);
   if (widget->GetRootView())
     RemoveViewTree(widget->GetRootView(), nullptr, remove_observer);
   RemoveWidgetNode(widget, remove_observer);
 }
 
 void AshDevToolsDOMAgent::RemoveWidgetNode(views::Widget* widget,
                                            bool remove_observer) {
   WidgetToNodeIdMap::iterator widget_to_node_id_it =
       widget_to_node_id_map_.find(widget);
   DCHECK(widget_to_node_id_it != widget_to_node_id_map_.end());
 
   int node_id = widget_to_node_id_it->second;
   int parent_id = GetNodeIdFromWindow(WmWindow::Get(widget->GetNativeWindow()));
 
-  if (remove_observer)
-    widget->RemoveRemovalsObserver(this);
+  // if (remove_observer)
+  // widget->RemoveRemovalsObserver(this);
 
   NodeIdToWidgetMap::iterator node_id_to_widget_it =
       node_id_to_widget_map_.find(node_id);
   DCHECK(node_id_to_widget_it != node_id_to_widget_map_.end());
 
   widget_to_node_id_map_.erase(widget_to_node_id_it);
   node_id_to_widget_map_.erase(node_id_to_widget_it);
   frontend()->childNodeRemoved(parent_id, node_id);
 }
 
@@ skipping 22 matching lines @@
       view_to_node_id_map_.find(view);
   DCHECK(view_to_node_id_it != view_to_node_id_map_.end());
 
   int node_id = view_to_node_id_it->second;
   int parent_id = 0;
   if (parent)
     parent_id = GetNodeIdFromView(parent);
   else  // views::RootView
     parent_id = GetNodeIdFromWidget(view->GetWidget());
 
-  if (remove_observer)
-    view->RemoveObserver(this);
+  // if (remove_observer)
+  // view->RemoveObserver(this);
 
   NodeIdToViewMap::iterator node_id_to_view_it =
       node_id_to_view_map_.find(node_id);
   DCHECK(node_id_to_view_it != node_id_to_view_map_.end());
 
   view_to_node_id_map_.erase(view_to_node_id_it);
   node_id_to_view_map_.erase(node_id_to_view_it);
   frontend()->childNodeRemoved(parent_id, node_id);
 }
 
 void AshDevToolsDOMAgent::RemoveObservers() {
-  for (auto& pair : window_to_node_id_map_)
-    pair.first->aura_window()->RemoveObserver(this);
-  for (auto& pair : widget_to_node_id_map_)
-    pair.first->RemoveRemovalsObserver(this);
-  for (auto& pair : view_to_node_id_map_)
-    pair.first->RemoveObserver(this);
+  // for (auto& pair : window_to_node_id_map_)
+  // pair.first->aura_window()->RemoveObserver(this);
+  // for (auto& pair : widget_to_node_id_map_)
+  // pair.first->RemoveRemovalsObserver(this);
+  // for (auto& pair : view_to_node_id_map_)
+  // pair.first->RemoveObserver(this);
 }
 
 void AshDevToolsDOMAgent::Reset() {
   RemoveObservers();
   widget_for_highlighting_.reset();
   window_to_node_id_map_.clear();
   widget_to_node_id_map_.clear();
   view_to_node_id_map_.clear();
   node_id_to_window_map_.clear();
   node_id_to_widget_map_.clear();
@@ skipping 80 matching lines @@
   return ui::devtools::protocol::Response::OK();
 }
 
 bool AshDevToolsDOMAgent::IsHighlightingWindow(WmWindow* window) {
   return widget_for_highlighting_ &&
          GetWidgetFromWmWindow(window) == widget_for_highlighting_.get();
 }
 
 }  // namespace devtools
 }  // namespace ash