Pass a ui::PaintContext from ui::Layer to layer delegates.

ui/aura/test/test_window_delegate.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/test/test_window_delegate.h"
 
 #include "base/strings/stringprintf.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
+#include "ui/compositor/paint_context.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 
 #if defined(USE_AURA)
 #include "ui/base/cursor/cursor.h"
 #endif
 
 namespace aura {
@@ skipping 48 matching lines @@
   return true;
 }
 
 bool TestWindowDelegate::CanFocus() {
   return can_focus_;
 }
 
 void TestWindowDelegate::OnCaptureLost() {
 }
 
-void TestWindowDelegate::OnPaint(gfx::Canvas* canvas) {
+void TestWindowDelegate::OnPaint(const ui::PaintContext& context) {
 }
 
 void TestWindowDelegate::OnDeviceScaleFactorChanged(
     float device_scale_factor) {
 }
 
 void TestWindowDelegate::OnWindowDestroying(Window* window) {
 }
 
 void TestWindowDelegate::OnWindowDestroyed(Window* window) {
@@ skipping 24 matching lines @@
 
 void ColorTestWindowDelegate::OnKeyEvent(ui::KeyEvent* event) {
   last_key_code_ = event->key_code();
   event->SetHandled();
 }
 
 void ColorTestWindowDelegate::OnWindowDestroyed(Window* window) {
   delete this;
 }
 
-void ColorTestWindowDelegate::OnPaint(gfx::Canvas* canvas) {
-  canvas->DrawColor(color_, SkXfermode::kSrc_Mode);
+void ColorTestWindowDelegate::OnPaint(const ui::PaintContext& context) {
+  context.canvas()->DrawColor(color_, SkXfermode::kSrc_Mode);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MaskedWindowDelegate
 
 MaskedWindowDelegate::MaskedWindowDelegate(const gfx::Rect mask_rect)
     : mask_rect_(mask_rect) {
 }
 
 bool MaskedWindowDelegate::HasHitTestMask() const {
@@ skipping 87 matching lines @@
 }
 
 int EventCountDelegate::GetGestureCountAndReset() {
   int gesture_count = gesture_count_;
   gesture_count_ = 0;
   return gesture_count;
 }
 
 }  // namespace test
 }  // namespace aura