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

ui/wm/core/image_grid.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/wm/core/image_grid.h"
 
 #include <algorithm>
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/compositor/dip_util.h"
+#include "ui/compositor/paint_context.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/transform.h"
 
 using std::max;
@@ skipping 237 matching lines @@
 }
 
 void ImageGrid::ImagePainter::SetClipRect(const gfx::Rect& clip_rect,
                                           ui::Layer* layer) {
   if (clip_rect != clip_rect_) {
     clip_rect_ = clip_rect;
     layer->SchedulePaint(layer->bounds());
   }
 }
 
-void ImageGrid::ImagePainter::OnPaintLayer(gfx::Canvas* canvas) {
+void ImageGrid::ImagePainter::OnPaintLayer(const ui::PaintContext& context) {
   if (!clip_rect_.IsEmpty())
-    canvas->ClipRect(clip_rect_);
-  canvas->DrawImageInt(image_, 0, 0);
+    context.canvas()->ClipRect(clip_rect_);
+  context.canvas()->DrawImageInt(image_, 0, 0);
 }
 
 void ImageGrid::ImagePainter::OnDelegatedFrameDamage(
     const gfx::Rect& damage_rect_in_dip) {
 }
 
 void ImageGrid::ImagePainter::OnDeviceScaleFactorChanged(
     float device_scale_factor) {
   // Redrawing will take care of scale factor change.
 }
@@ skipping 50 matching lines @@
   layer_ptr->get()->SetBounds(gfx::Rect(0, 0, size.width(), size.height()));
 
   painter_ptr->reset(new ImagePainter(image_skia));
   layer_ptr->get()->set_delegate(painter_ptr->get());
   layer_ptr->get()->SetFillsBoundsOpaquely(false);
   layer_ptr->get()->SetVisible(true);
   layer_->Add(layer_ptr->get());
 }
 
 }  // namespace wm