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

ui/aura_extra/image_window_delegate.cc

 // Copyright (c) 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 "ui/aura_extra/image_window_delegate.h"
 
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/compositor.h"
+#include "ui/compositor/paint_context.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace aura_extra {
 
 ImageWindowDelegate::ImageWindowDelegate()
     : background_color_(SK_ColorWHITE),
@@ skipping 42 matching lines @@
   return false;
 }
 
 bool ImageWindowDelegate::CanFocus() {
   return false;
 }
 
 void ImageWindowDelegate::OnCaptureLost() {
 }
 
-void ImageWindowDelegate::OnPaint(gfx::Canvas* canvas) {
+void ImageWindowDelegate::OnPaint(const ui::PaintContext& context) {
+  gfx::Canvas* canvas = context.canvas();
   if (background_color_ != SK_ColorTRANSPARENT &&
       (image_.IsEmpty() || size_mismatch_ || !offset_.IsZero())) {
     canvas->DrawColor(background_color_);
   }
   if (!image_.IsEmpty())
     canvas->DrawImageInt(image_.AsImageSkia(), offset_.x(), offset_.y());
 }
 
 void ImageWindowDelegate::OnDeviceScaleFactorChanged(float scale_factor) {
 }
 
 void ImageWindowDelegate::OnWindowDestroying(aura::Window* window) {
 }
 
 void ImageWindowDelegate::OnWindowDestroyed(aura::Window* window) {
   delete this;
 }
 
 void ImageWindowDelegate::OnWindowTargetVisibilityChanged(bool visible) {
 }
 
 bool ImageWindowDelegate::HasHitTestMask() const {
   return false;
 }
 
 void ImageWindowDelegate::GetHitTestMask(gfx::Path* mask) const {
 }
 
 }  // namespace aura_extra