views: Make SubmenuView::PaintChildren use the canvas via PaintRecorder

ui/views/controls/menu/submenu_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.
 
 #include "ui/views/controls/menu/submenu_view.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/compositor/paint_context.h"
+#include "ui/compositor/paint_recorder.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_host.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 162 matching lines @@
   state->role = ui::AX_ROLE_MENU_LIST_POPUP;
 }
 
 ui::TextInputClient* SubmenuView::GetTextInputClient() {
   return &prefix_selector_;
 }
 
 void SubmenuView::PaintChildren(const ui::PaintContext& context) {
   View::PaintChildren(context);
 
-  if (drop_item_ && drop_position_ != MenuDelegate::DROP_ON)
-    PaintDropIndicator(context.canvas(), drop_item_, drop_position_);

[sadrul, 2015/04/07 18:49:01]

I assume PaintContext::canvas() will be removed so it can't be misused?

[danakj, 2015/04/07 18:49:25]

yep!

+  bool paint_drop_indicator = false;
+  if (drop_item_) {
+    switch (drop_position_) {
+      case MenuDelegate::DROP_NONE:
+      case MenuDelegate::DROP_ON:
+        break;
+      case MenuDelegate::DROP_UNKNOWN:
+      case MenuDelegate::DROP_BEFORE:
+      case MenuDelegate::DROP_AFTER:
+        paint_drop_indicator = true;
+        break;
+    }
+  }
+
+  if (paint_drop_indicator) {
+    gfx::Rect bounds = CalculateDropIndicatorBounds(drop_item_, drop_position_);
+    ui::PaintRecorder recorder(context);
+    recorder.canvas()->FillRect(bounds, kDropIndicatorColor);
+  }
 }
 
 bool SubmenuView::GetDropFormats(
       int* formats,
       std::set<OSExchangeData::CustomFormat>* custom_formats) {
   DCHECK(GetMenuItem()->GetMenuController());
   return GetMenuItem()->GetMenuController()->GetDropFormats(this, formats,
                                                             custom_formats);
 }
 
@@ skipping 232 matching lines @@
 }
 
 const char* SubmenuView::GetClassName() const {
   return kViewClassName;
 }
 
 void SubmenuView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   SchedulePaint();
 }
 
-void SubmenuView::PaintDropIndicator(gfx::Canvas* canvas,
-                                     MenuItemView* item,
-                                     MenuDelegate::DropPosition position) {
-  if (position == MenuDelegate::DROP_NONE)
-    return;
-
-  gfx::Rect bounds = CalculateDropIndicatorBounds(item, position);
-  canvas->FillRect(bounds, kDropIndicatorColor);
-}
-
 void SubmenuView::SchedulePaintForDropIndicator(
     MenuItemView* item,
     MenuDelegate::DropPosition position) {
   if (item == NULL)
     return;
 
   if (position == MenuDelegate::DROP_ON) {
     item->SchedulePaint();
   } else if (position != MenuDelegate::DROP_NONE) {
     SchedulePaintInRect(CalculateDropIndicatorBounds(item, position));
@@ skipping 34 matching lines @@
   y = std::max(y, 0);
   gfx::Rect new_vis_bounds(x, y, vis_bounds.width(), vis_bounds.height());
   if (new_vis_bounds != vis_bounds) {
     ScrollRectToVisible(new_vis_bounds);
     return true;
   }
   return false;
 }
 
 }  // namespace views