ui: Use a PaintRecorder to access the Canvas for painting.

ui/wm/core/image_grid.cc

Index: ui/wm/core/image_grid.cc
diff --git a/ui/wm/core/image_grid.cc b/ui/wm/core/image_grid.cc
index f45e8b30f8b128b857b8b4f7090bfc21f5fb1c91..c849454412a224457be1f0c58a8b254fafb3313a 100644
--- a/ui/wm/core/image_grid.cc
+++ b/ui/wm/core/image_grid.cc
@@ -9,7 +9,7 @@
 #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/compositor/paint_recorder.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
@@ -268,9 +268,10 @@ void ImageGrid::ImagePainter::SetClipRect(const gfx::Rect& clip_rect,
 }
 
 void ImageGrid::ImagePainter::OnPaintLayer(const ui::PaintContext& context) {
+  ui::PaintRecorder recorder(context);
   if (!clip_rect_.IsEmpty())
-    context.canvas()->ClipRect(clip_rect_);
-  context.canvas()->DrawImageInt(image_, 0, 0);
+    recorder.canvas()->ClipRect(clip_rect_);
+  recorder.canvas()->DrawImageInt(image_, 0, 0);
 }
 
 void ImageGrid::ImagePainter::OnDelegatedFrameDamage(