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

ui/snapshot/snapshot_aura_unittest.cc

 // Copyright (c) 2013 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/snapshot/snapshot.h"
 
 #include "base/bind.h"
 #include "base/test/test_simple_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
+#include "ui/compositor/paint_context.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/compositor/test/draw_waiter_for_test.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/transform.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/wm/core/default_activation_client.h"
 
 namespace ui {
 namespace {
 
 SkColor GetExpectedColorForPoint(int x, int y) {
   return SkColorSetRGB(std::min(x, 255), std::min(y, 255), 0);
 }
 
 // Paint simple rectangle on the specified aura window.
 class TestPaintingWindowDelegate : public aura::test::TestWindowDelegate {
  public:
   explicit TestPaintingWindowDelegate(const gfx::Size& window_size)
       : window_size_(window_size) {
   }
 
   ~TestPaintingWindowDelegate() override {}
 
-  void OnPaint(gfx::Canvas* canvas) override {
+  void OnPaint(const ui::PaintContext& context) override {
     for (int y = 0; y < window_size_.height(); ++y) {
-      for (int x = 0; x < window_size_.width(); ++x)
-        canvas->FillRect(gfx::Rect(x, y, 1, 1), GetExpectedColorForPoint(x, y));
+      for (int x = 0; x < window_size_.width(); ++x) {
+        context.canvas()->FillRect(gfx::Rect(x, y, 1, 1),
+                                   GetExpectedColorForPoint(x, y));
+      }
     }
   }
 
  private:
   gfx::Size window_size_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPaintingWindowDelegate);
 };
 
 size_t GetFailedPixelsCountWithScaleFactor(const gfx::Image& image,
@@ skipping 225 matching lines @@
   gfx::SizeF snapshot_size(test_bounds.size());
   snapshot_size.Scale(2.0f);
 
   gfx::Image snapshot = GrabSnapshotForTestWindow();
   EXPECT_EQ(gfx::ToRoundedSize(snapshot_size).ToString(),
             snapshot.Size().ToString());
   EXPECT_EQ(0u, GetFailedPixelsCountWithScaleFactor(snapshot, 2));
 }
 
 }  // namespace ui