Updates to overrides of InkDropHost::AddInkDropLayer()

chrome/browser/ui/views/toolbar/toolbar_button.cc

 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/toolbar_button.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 208 matching lines @@
                                            ui::MenuSourceType source_type) {
   if (!enabled())
     return;
 
   show_menu_factory_.InvalidateWeakPtrs();
   ShowDropDownMenu(source_type);
 }
 
 void ToolbarButton::AddInkDropLayer(ui::Layer* ink_drop_layer) {
   SetPaintToLayer(true);
+  SetFillsBoundsOpaquely(false);
   image()->SetPaintToLayer(true);
   image()->SetFillsBoundsOpaquely(false);
 
   layer()->Add(ink_drop_layer);
   layer()->StackAtBottom(ink_drop_layer);
+
+  // Invalidates the contents of the parent's layer which may contain
+  // a stale close/reload icon that should not remain visible.
+  parent()->SchedulePaint();

[bruthig, 2015/11/18 16:26:17]

sadrul@, would it make sense to move this parent()->SchedulePaint() call to
View::SetFillsBoundsOpaquely() and invoke it if |fills_bounds_opaquely| is
false?

I'm thinking this would solve the more general problem and I can't think of a
valid case where a View would not want to repaint it's parent when
|fills_bounds_opaquely| is false.

Also what do you think about updating View::SchedulePaint() to call
parent()->SchedulePaint() when layer()->fills_bounds_opaquely() is false.  Again
I can't think of a valid case where we wouldn't want to re-paint the parent if
layer()->fills_bounds_opaquely() is false.

[jonross, 2015/11/18 16:36:52]

I'm slightly surprised that changing the layer tree with SetPaintToLayer(true)
doesn't cause parent->SchedulePaint already

I'd like this centralized to avoid implementation issues elsewhere in the future

[bruthig, 2015/11/18 16:51:19]

I've posted my propsed changes here: https://codereview.chromium.org/1461673002/

[tdanderson, 2015/11/19 15:15:42]

Note I'm landing this CL as-is, feel free to modify afterwards pending the
outcome of your other CL.

 }
 
 void ToolbarButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
   layer()->Remove(ink_drop_layer);
 
   image()->SetFillsBoundsOpaquely(true);
   image()->SetPaintToLayer(false);
   SetPaintToLayer(false);
 }
 
@@ skipping 98 matching lines @@
     SetState(STATE_NORMAL);
 }
 
 gfx::Point ToolbarButton::CalculateInkDropCenter() const {
   return GetLocalBounds().CenterPoint();
 }
 
 const char* ToolbarButton::GetClassName() const {
   return "ToolbarButton";
 }