Index: ui/views/border_unittest.cc |
diff --git a/ui/views/border_unittest.cc b/ui/views/border_unittest.cc |
index ab428df65e6871d2835e3674e095315c6b51e6c5..51b43ab1fabcf6260f3f7e5168bc95317eee6ecd 100644 |
--- a/ui/views/border_unittest.cc |
+++ b/ui/views/border_unittest.cc |
@@ -72,6 +72,10 @@ class MockCanvas : public SkCanvas { |
draw_rrect_calls_.end()); |
} |
+ int draw_paint_call_count() const { return draw_paint_call_count_; } |
+ |
+ const SkRect& last_clip_bounds() const { return last_clip_bounds_; } |
+ |
// SkCanvas overrides: |
void onDrawRect(const SkRect& rect, const SkPaint& paint) override { |
draw_rect_calls_.insert(DrawRectCall(rect, paint)); |
@@ -81,10 +85,20 @@ class MockCanvas : public SkCanvas { |
draw_rrect_calls_.insert(DrawRRectCall(rrect, paint)); |
} |
+ void onDrawPaint(const SkPaint& paint) override { ++draw_paint_call_count_; } |
Matt Giuca
2017/02/21 23:18:51
Can we record the SkPaint object into a set like d
Evan Stade
2017/02/22 01:34:55
done
|
+ |
+ void onClipRect(const SkRect& rect, |
+ SkClipOp op, |
+ ClipEdgeStyle edge_style) override { |
+ last_clip_bounds_ = rect; |
+ } |
+ |
private: |
// Stores all the calls for querying by the test, in sorted order. |
std::set<DrawRectCall> draw_rect_calls_; |
std::set<DrawRRectCall> draw_rrect_calls_; |
+ int draw_paint_call_count_ = 0; |
+ SkRect last_clip_bounds_; |
DISALLOW_COPY_AND_ASSIGN(MockCanvas); |
}; |
@@ -160,19 +174,12 @@ TEST_F(BorderTest, SolidBorder) { |
EXPECT_EQ(gfx::Insets(3, 3, 3, 3), border->GetInsets()); |
border->Paint(*view_, canvas_.get()); |
- std::vector<MockCanvas::DrawRectCall> draw_rect_calls = |
- sk_canvas_->draw_rect_calls(); |
- ASSERT_EQ(4u, draw_rect_calls.size()); |
- EXPECT_EQ(SkRect::MakeLTRB(0, 0, 100, 3), draw_rect_calls[0].rect); |
- EXPECT_EQ(SK_ColorBLUE, draw_rect_calls[0].paint.getColor()); |
- EXPECT_EQ(SkRect::MakeLTRB(0, 3, 3, 47), draw_rect_calls[1].rect); |
- EXPECT_EQ(SK_ColorBLUE, draw_rect_calls[1].paint.getColor()); |
- EXPECT_EQ(SkRect::MakeLTRB(0, 47, 100, 50), draw_rect_calls[2].rect); |
- EXPECT_EQ(SK_ColorBLUE, draw_rect_calls[2].paint.getColor()); |
- EXPECT_EQ(SkRect::MakeLTRB(97, 3, 100, 47), draw_rect_calls[3].rect); |
- EXPECT_EQ(SK_ColorBLUE, draw_rect_calls[3].paint.getColor()); |
- |
- EXPECT_TRUE(sk_canvas_->draw_rrect_calls().empty()); |
+ gfx::Rect bounds = view_->GetLocalBounds(); |
+ bounds.Inset(border->GetInsets()); |
+ |
+ EXPECT_EQ(1, sk_canvas_->draw_paint_call_count()); |
Matt Giuca
2017/02/21 23:18:51
Expect that the size of the draw_paint_calls set i
Evan Stade
2017/02/22 01:34:55
Done.
|
+ EXPECT_EQ(gfx::RectF(bounds), |
+ gfx::SkRectToRectF(sk_canvas_->last_clip_bounds())); |
} |
TEST_F(BorderTest, RoundedRectBorder) { |
@@ -219,19 +226,12 @@ TEST_F(BorderTest, SolidSidedBorder) { |
EXPECT_EQ(kInsets, border->GetInsets()); |
border->Paint(*view_, canvas_.get()); |
- std::vector<MockCanvas::DrawRectCall> draw_rect_calls = |
- sk_canvas_->draw_rect_calls(); |
- ASSERT_EQ(4u, draw_rect_calls.size()); |
- EXPECT_EQ(SkRect::MakeLTRB(0, 0, 100, 1), draw_rect_calls[0].rect); |
- EXPECT_EQ(SK_ColorBLUE, draw_rect_calls[0].paint.getColor()); |
- EXPECT_EQ(SkRect::MakeLTRB(0, 1, 2, 47), draw_rect_calls[1].rect); |
- EXPECT_EQ(SK_ColorBLUE, draw_rect_calls[1].paint.getColor()); |
- EXPECT_EQ(SkRect::MakeLTRB(0, 47, 100, 50), draw_rect_calls[2].rect); |
- EXPECT_EQ(SK_ColorBLUE, draw_rect_calls[2].paint.getColor()); |
- EXPECT_EQ(SkRect::MakeLTRB(96, 1, 100, 47), draw_rect_calls[3].rect); |
- EXPECT_EQ(SK_ColorBLUE, draw_rect_calls[3].paint.getColor()); |
- |
- EXPECT_TRUE(sk_canvas_->draw_rrect_calls().empty()); |
+ gfx::Rect bounds = view_->GetLocalBounds(); |
+ bounds.Inset(border->GetInsets()); |
+ |
+ EXPECT_EQ(1, sk_canvas_->draw_paint_call_count()); |
+ EXPECT_EQ(gfx::RectF(bounds), |
+ gfx::SkRectToRectF(sk_canvas_->last_clip_bounds())); |
} |
TEST_F(BorderTest, BorderPainter) { |