OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/test/fake_content_layer_client.h" | 5 #include "cc/test/fake_content_layer_client.h" |
6 | 6 |
7 #include "third_party/skia/include/core/SkCanvas.h" | 7 #include "third_party/skia/include/core/SkCanvas.h" |
8 #include "ui/gfx/skia_util.h" | 8 #include "ui/gfx/skia_util.h" |
9 | 9 |
10 namespace cc { | 10 namespace cc { |
11 | 11 |
12 FakeContentLayerClient::FakeContentLayerClient() | 12 FakeContentLayerClient::FakeContentLayerClient() |
13 : paint_all_opaque_(false) { | 13 : paint_all_opaque_(false) { |
14 } | 14 } |
15 | 15 |
16 FakeContentLayerClient::~FakeContentLayerClient() { | 16 FakeContentLayerClient::~FakeContentLayerClient() { |
17 } | 17 } |
18 | 18 |
19 void FakeContentLayerClient::PaintContents(SkCanvas* canvas, | 19 void FakeContentLayerClient::PaintContents(SkCanvas* canvas, |
20 gfx::Rect rect, gfx::RectF* opaque_rect) { | 20 gfx::Rect paint_rect, gfx::RectF* opaque_rect) { |
21 if (paint_all_opaque_) | 21 if (paint_all_opaque_) |
22 *opaque_rect = rect; | 22 *opaque_rect = paint_rect; |
23 | 23 |
24 canvas->clipRect(gfx::RectToSkRect(rect)); | 24 canvas->clipRect(gfx::RectToSkRect(paint_rect)); |
25 for (RectPaintVector::const_iterator it = draw_rects_.begin(); | 25 for (RectPaintVector::const_iterator it = draw_rects_.begin(); |
26 it != draw_rects_.end(); ++it) { | 26 it != draw_rects_.end(); ++it) { |
27 gfx::Rect rect = it->first; | 27 const gfx::RectF& draw_rect = it->first; |
28 const SkPaint& paint = it->second; | 28 const SkPaint& paint = it->second; |
29 SkRect draw_rect = SkRect::MakeXYWH( | 29 canvas->drawRectCoords(draw_rect.x(), |
30 rect.x(), | 30 draw_rect.y(), |
31 rect.y(), | 31 draw_rect.right(), |
32 rect.width(), | 32 draw_rect.bottom(), |
33 rect.height()); | 33 paint); |
34 canvas->drawRect(draw_rect, paint); | |
35 } | 34 } |
36 | 35 |
37 for (BitmapVector::const_iterator it = draw_bitmaps_.begin(); | 36 for (BitmapVector::const_iterator it = draw_bitmaps_.begin(); |
38 it != draw_bitmaps_.end(); ++it) { | 37 it != draw_bitmaps_.end(); ++it) { |
39 canvas->drawBitmap(it->first, it->second.x(), it->second.y()); | 38 canvas->drawBitmap(it->first, it->second.x(), it->second.y()); |
40 } | 39 } |
41 } | 40 } |
42 | 41 |
43 } // namespace cc | 42 } // namespace cc |
OLD | NEW |