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

ash/utility/partial_screenshot_controller.cc

 // Copyright 2014 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 "ash/utility/partial_screenshot_controller.h"
 
 #include <cmath>
 
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/stl_util.h"
+#include "ui/compositor/paint_context.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/canvas.h"
 #include "ui/wm/core/cursor_manager.h"
 
 namespace ash {
 
 namespace {
 
 // The size to increase the invalidated area in the layer to repaint. The area
 // should be slightly bigger than the actual region because the region indicator
@@ skipping 26 matching lines @@
     union_rect.Inset(-kInvalidateRegionAdditionalSize,
                      -kInvalidateRegionAdditionalSize);
     union_rect.Intersects(layer()->bounds());
 
     region_ = region;
     layer()->SchedulePaint(union_rect);
   }
 
  private:
   // ui::LayerDelegate:
-  void OnPaintLayer(gfx::Canvas* canvas) override {
+  void OnPaintLayer(const ui::PaintContext& context) override {
     if (region_.IsEmpty())
       return;
 
+    gfx::Canvas* canvas = context.canvas();
     // Screenshot area representation: black rectangle with white
     // rectangle inside.  To avoid capturing these rectangles when mouse
     // release, they should be outside of the actual capturing area.
     gfx::Rect rect(region_);
     rect.Inset(-1, -1);
     canvas->DrawRect(rect, SK_ColorWHITE);
     rect.Inset(-1, -1);
     canvas->DrawRect(rect, SK_ColorBLACK);
   }
 
@@ skipping 181 matching lines @@
     return;
   Cancel();
 }
 
 void PartialScreenshotController::OnDisplayMetricsChanged(
     const gfx::Display& display,
     uint32_t changed_metrics) {
 }
 
 }  // namespace ash