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

ui/aura/bench/bench_main.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.
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 11 matching lines @@
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
+#include "ui/compositor/paint_context.h"
 #include "ui/compositor/test/in_process_context_factory.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/x/x11_connection.h"
 #include "ui/gl/gl_surface.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 11 matching lines @@
   explicit ColoredLayer(SkColor color)
       : Layer(ui::LAYER_TEXTURED),
         color_(color),
         draw_(true) {
     set_delegate(this);
   }
 
   ~ColoredLayer() override {}
 
   // Overridden from LayerDelegate:
-  void OnPaintLayer(gfx::Canvas* canvas) override {
+  void OnPaintLayer(const ui::PaintContext& context) override {
     if (draw_) {
-      canvas->DrawColor(color_);
+      context.canvas()->DrawColor(color_);
     }
   }
 
   void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {}
 
   void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
 
   base::Closure PrepareForLayerBoundsChange() override {
     return base::Closure();
   }
@@ skipping 287 matching lines @@
   ui::PrintLayerHierarchy(host->window()->layer(), gfx::Point(100, 100));
 #endif
 
   host->Show();
   base::MessageLoopForUI::current()->Run();
   focus_client.reset();
   host.reset();
 
   return 0;
 }