Revert of Ensure that the focus ring in the bookmarks bar does not paint outside the parent view.

ui/views/view.cc

 // Copyright (c) 2012 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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 519 matching lines @@
       CreateLayer(ui::LAYER_TEXTURED);
     layer()->SetTransform(transform);
     layer()->ScheduleDraw();
   }
 }
 
 void View::SetPaintToLayer(ui::LayerType layer_type) {
   if (paint_to_layer_ && (layer()->type() == layer_type))
     return;
 
-  DestroyLayerImpl(LayerChangeNotifyBehavior::DONT_NOTIFY);
+  DestroyLayer();
   CreateLayer(layer_type);
   paint_to_layer_ = true;
-
-  // Notify the parent chain about the layer change.
-  NotifyParentsOfLayerChange();
 }
 
 void View::DestroyLayer() {
-  DestroyLayerImpl(LayerChangeNotifyBehavior::NOTIFY);
+  if (!paint_to_layer_)
+    return;
+
+  paint_to_layer_ = false;
+  if (!layer())
+    return;
+
+  ui::Layer* new_parent = layer()->parent();
+  std::vector<ui::Layer*> children = layer()->children();
+  for (size_t i = 0; i < children.size(); ++i) {
+    layer()->Remove(children[i]);
+    if (new_parent)
+      new_parent->Add(children[i]);
+  }
+
+  LayerOwner::DestroyLayer();
+
+  if (new_parent)
+    ReorderLayers();
+
+  UpdateChildLayerBounds(CalculateOffsetToAncestorWithLayer(NULL));
+
+  SchedulePaint();
+
+  Widget* widget = GetWidget();
+  if (widget)
+    widget->LayerTreeChanged();
 }
 
 std::unique_ptr<ui::Layer> View::RecreateLayer() {
   std::unique_ptr<ui::Layer> old_layer = LayerOwner::RecreateLayer();
   Widget* widget = GetWidget();
   if (widget)
     widget->LayerTreeChanged();
   return old_layer;
 }
 
@@ skipping 1038 matching lines @@
 void View::UpdateChildLayerVisibility(bool ancestor_visible) {
   if (layer()) {
     layer()->SetVisible(ancestor_visible && visible_);
   } else {
     internal::ScopedChildrenLock lock(this);
     for (auto* child : children_)
       child->UpdateChildLayerVisibility(ancestor_visible && visible_);
   }
 }
 
-void View::DestroyLayerImpl(LayerChangeNotifyBehavior notify_parents) {
-  if (!paint_to_layer_)
-    return;
-
-  paint_to_layer_ = false;
-  if (!layer())
-    return;
-
-  ui::Layer* new_parent = layer()->parent();
-  std::vector<ui::Layer*> children = layer()->children();
-  for (size_t i = 0; i < children.size(); ++i) {
-    layer()->Remove(children[i]);
-    if (new_parent)
-      new_parent->Add(children[i]);
-  }
-
-  LayerOwner::DestroyLayer();
-
-  if (new_parent)
-    ReorderLayers();
-
-  UpdateChildLayerBounds(CalculateOffsetToAncestorWithLayer(NULL));
-
-  SchedulePaint();
-
-  // Notify the parent chain about the layer change.
-  if (notify_parents == LayerChangeNotifyBehavior::NOTIFY)
-    NotifyParentsOfLayerChange();
-
-  Widget* widget = GetWidget();
-  if (widget)
-    widget->LayerTreeChanged();
-}
-
-void View::NotifyParentsOfLayerChange() {
-  // Notify the parent chain about the layer change.
-  View* view_parent = parent();
-  while (view_parent) {
-    view_parent->OnChildLayerChanged(this);
-    view_parent = view_parent->parent();
-  }
-}
-
 void View::UpdateChildLayerBounds(const gfx::Vector2d& offset) {
   if (layer()) {
     SetLayerBounds(GetLocalBounds() + offset);
   } else {
     internal::ScopedChildrenLock lock(this);
     for (auto* child : children_) {
       child->UpdateChildLayerBounds(
           offset + gfx::Vector2d(child->GetMirroredX(), child->y()));
     }
   }
@@ skipping 48 matching lines @@
     // Iterate backwards through the children so that a child with a layer
     // which is further to the back is stacked above one which is further to
     // the front.
     View::Views children = GetChildrenInZOrder();
     DCHECK_EQ(child_count(), static_cast<int>(children.size()));
     for (auto* child : base::Reversed(children))
       child->ReorderChildLayers(parent_layer);
   }
 }
 
-void View::OnChildLayerChanged(View* child) {}
-
 // Input -----------------------------------------------------------------------
 
 View::DragInfo* View::GetDragInfo() {
   return parent_ ? parent_->GetDragInfo() : NULL;
 }
 
 // Focus -----------------------------------------------------------------------
 
 void View::OnFocus() {
   // TODO(beng): Investigate whether it's possible for us to move this to
@@ skipping 931 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views