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

ui/aura/window_unittest.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/aura/window.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/test/window_test_api.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
-#include "ui/compositor/paint_context.h"
+#include "ui/compositor/paint_recorder.h"

[sadrul, 2015/04/07 21:10:13]

Perhaps this include isn't necessary at all?

[danakj, 2015/04/07 21:11:48]

Oh, seems not!

 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/compositor/test/test_layers.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/vector2d.h"
@@ skipping 2789 matching lines @@
     o.ValidateState(index++, params);
 
     w1.reset();
     w2.reset();
   }
 
 }
 
 namespace {
 
-// Tracks the number of times paint is invoked along with what the clip and
-// translate was.
-class PaintWindowDelegate : public TestWindowDelegate {
- public:
-  PaintWindowDelegate() : paint_count_(0) {}
-  ~PaintWindowDelegate() override {}
-
-  const gfx::Rect& most_recent_paint_clip_bounds() const {
-    return most_recent_paint_clip_bounds_;
-  }
-
-  const gfx::Vector2d& most_recent_paint_matrix_offset() const {
-    return most_recent_paint_matrix_offset_;
-  }
-
-  void clear_paint_count() { paint_count_ = 0; }
-  int paint_count() const { return paint_count_; }
-
-  // TestWindowDelegate::
-  void OnPaint(const ui::PaintContext& context) override {
-    gfx::Canvas* canvas = context.canvas();
-    paint_count_++;
-    canvas->GetClipBounds(&most_recent_paint_clip_bounds_);
-    const SkMatrix& matrix = canvas->sk_canvas()->getTotalMatrix();
-    most_recent_paint_matrix_offset_ = gfx::Vector2d(
-        SkScalarFloorToInt(matrix.getTranslateX()),
-        SkScalarFloorToInt(matrix.getTranslateY()));
-  }
-
- private:
-  int paint_count_;
-  gfx::Rect most_recent_paint_clip_bounds_;
-  gfx::Vector2d most_recent_paint_matrix_offset_;
-
-  DISALLOW_COPY_AND_ASSIGN(PaintWindowDelegate);
-};
-
-}  // namespace
-
-namespace {
-
 class TestLayerAnimationObserver : public ui::LayerAnimationObserver {
  public:
   TestLayerAnimationObserver()
       : animation_completed_(false),
         animation_aborted_(false) {}
   ~TestLayerAnimationObserver() override {}
 
   bool animation_completed() const { return animation_completed_; }
   bool animation_aborted() const { return animation_aborted_; }
 
@@ skipping 67 matching lines @@
 
   EXPECT_TRUE(animator.get());
   EXPECT_FALSE(animator->is_animating());
   EXPECT_TRUE(observer.animation_completed());
   EXPECT_FALSE(observer.animation_aborted());
   animator->RemoveObserver(&observer);
 }
 
 }  // namespace test
 }  // namespace aura