Make View::Paint use ui::PaintRecorder to access PaintContext's canvas

ui/aura/window_unittest.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/aura/window.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/test/window_test_api.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
+#include "ui/compositor/paint_context.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/compositor/test/test_layers.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/vector2d.h"
@@ skipping 2993 matching lines @@
   }
 
   const gfx::Vector2d& most_recent_paint_matrix_offset() const {
     return most_recent_paint_matrix_offset_;
   }
 
   void clear_paint_count() { paint_count_ = 0; }
   int paint_count() const { return paint_count_; }
 
   // TestWindowDelegate::
-  void OnPaint(gfx::Canvas* canvas) override {
+  void OnPaint(const ui::PaintContext& context) override {
+    gfx::Canvas* canvas = context.canvas();
     paint_count_++;
     canvas->GetClipBounds(&most_recent_paint_clip_bounds_);
     const SkMatrix& matrix = canvas->sk_canvas()->getTotalMatrix();
     most_recent_paint_matrix_offset_ = gfx::Vector2d(
         SkScalarFloorToInt(matrix.getTranslateX()),
         SkScalarFloorToInt(matrix.getTranslateY()));
   }
 
  private:
   int paint_count_;
@@ skipping 41 matching lines @@
   w111->Show();
   w11ll->AddChild(w111);
 
   EXPECT_EQ(0, w1ll_delegate.paint_count());
   EXPECT_EQ(0, w11ll_delegate.paint_count());
   EXPECT_EQ(0, w111_delegate.paint_count());
 
   // Paint the root, this should trigger painting of the two layerless
   // descendants but not the layered descendant.
   gfx::Canvas canvas(gfx::Size(200, 200), 1.0f, true);
-  static_cast<ui::LayerDelegate&>(root).OnPaintLayer(&canvas);
+  static_cast<ui::LayerDelegate&>(root).OnPaintLayer(ui::PaintContext(&canvas));
 
   // NOTE: SkCanvas::getClipBounds() extends the clip 1 pixel to the left and up
   // and 2 pixels down and to the right.
   EXPECT_EQ(1, w1ll_delegate.paint_count());
   EXPECT_EQ("-1,-1 42x52",
             w1ll_delegate.most_recent_paint_clip_bounds().ToString());
   EXPECT_EQ("[1 2]",
             w1ll_delegate.most_recent_paint_matrix_offset().ToString());
   EXPECT_EQ(1, w11ll_delegate.paint_count());
   EXPECT_EQ("-1,-1 13x14",
@@ skipping 462 matching lines @@
 
   EXPECT_TRUE(animator.get());
   EXPECT_FALSE(animator->is_animating());
   EXPECT_TRUE(observer.animation_completed());
   EXPECT_FALSE(observer.animation_aborted());
   animator->RemoveObserver(&observer);
 }
 
 }  // namespace test
 }  // namespace aura