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

chrome/browser/chromeos/display/overscan_calibrator.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 "chrome/browser/chromeos/display/overscan_calibrator.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/callback.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
+#include "ui/compositor/paint_context.h"
 #include "ui/gfx/canvas.h"
 
 namespace chromeos {
 namespace {
 
 // The opacity for the arrows of the overscan calibration.
 const float kArrowOpacity = 0.8;
 
 // The height in pixel for the arrows to show the overscan calibration.
 const int kCalibrationArrowHeight = 50;
@@ skipping 83 matching lines @@
 }
 
 void OverscanCalibrator::UpdateInsets(const gfx::Insets& insets) {
   insets_.Set(std::max(insets.top(), 0),
               std::max(insets.left(), 0),
               std::max(insets.bottom(), 0),
               std::max(insets.right(), 0));
   calibration_layer_->SchedulePaint(calibration_layer_->bounds());
 }
 
-void OverscanCalibrator::OnPaintLayer(gfx::Canvas* canvas) {
+void OverscanCalibrator::OnPaintLayer(const ui::PaintContext& context) {
+  gfx::Canvas* canvas = context.canvas();
   static const SkColor kTransparent = SkColorSetARGB(0, 0, 0, 0);
   gfx::Rect full_bounds = calibration_layer_->bounds();
   gfx::Rect inner_bounds = full_bounds;
   inner_bounds.Inset(insets_);
   canvas->FillRect(full_bounds, SK_ColorBLACK);
   canvas->FillRect(inner_bounds, kTransparent, SkXfermode::kClear_Mode);
 
   gfx::Point center = inner_bounds.CenterPoint();
   int vertical_offset = inner_bounds.height() / 2 - kArrowGapWidth;
   int horizontal_offset = inner_bounds.width() / 2 - kArrowGapWidth;
@@ skipping 12 matching lines @@
     float device_scale_factor) {
   // TODO(mukai): Cancel the overscan calibration when the device
   // configuration has changed.
 }
 
 base::Closure OverscanCalibrator::PrepareForLayerBoundsChange() {
   return base::Closure();
 }
 
 }  // namespace chromeos