Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Side by Side Diff: cc/test/fake_content_layer_client.h

Issue 1314943008: cc: Remove implicit conversions from Rect to RectF in src/cc/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifndef CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_ 5 #ifndef CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_
6 #define CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_ 6 #define CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "cc/layers/content_layer_client.h" 12 #include "cc/layers/content_layer_client.h"
13 #include "third_party/skia/include/core/SkBitmap.h" 13 #include "third_party/skia/include/core/SkBitmap.h"
14 #include "third_party/skia/include/core/SkPaint.h" 14 #include "third_party/skia/include/core/SkPaint.h"
15 #include "ui/gfx/geometry/rect.h" 15 #include "ui/gfx/geometry/rect.h"
16 #include "ui/gfx/geometry/rect_f.h"
16 #include "ui/gfx/transform.h" 17 #include "ui/gfx/transform.h"
17 18
18 namespace cc { 19 namespace cc {
19 20
20 class FakeContentLayerClient : public ContentLayerClient { 21 class FakeContentLayerClient : public ContentLayerClient {
21 public: 22 public:
22 struct BitmapData { 23 struct BitmapData {
23 BitmapData(const SkBitmap& bitmap, 24 BitmapData(const SkBitmap& bitmap,
24 const gfx::Point& point, 25 const gfx::Point& point,
25 const SkPaint& paint); 26 const SkPaint& paint);
(...skipping 17 matching lines...) Expand all
43 scoped_refptr<DisplayItemList> PaintContentsToDisplayList( 44 scoped_refptr<DisplayItemList> PaintContentsToDisplayList(
44 const gfx::Rect& clip, 45 const gfx::Rect& clip,
45 PaintingControlSetting painting_control) override; 46 PaintingControlSetting painting_control) override;
46 bool FillsBoundsCompletely() const override; 47 bool FillsBoundsCompletely() const override;
47 size_t GetApproximateUnsharedMemoryUsage() const override; 48 size_t GetApproximateUnsharedMemoryUsage() const override;
48 49
49 void set_fill_with_nonsolid_color(bool nonsolid) { 50 void set_fill_with_nonsolid_color(bool nonsolid) {
50 fill_with_nonsolid_color_ = nonsolid; 51 fill_with_nonsolid_color_ = nonsolid;
51 } 52 }
52 53
53 void add_draw_rect(const gfx::RectF& rect, const SkPaint& paint) { 54 void add_draw_rect(const gfx::Rect& rect, const SkPaint& paint) {
55 draw_rects_.push_back(std::make_pair(gfx::RectF(rect), paint));
56 }
57
58 void add_draw_rectf(const gfx::RectF& rect, const SkPaint& paint) {
54 draw_rects_.push_back(std::make_pair(rect, paint)); 59 draw_rects_.push_back(std::make_pair(rect, paint));
55 } 60 }
56 61
57 void add_draw_bitmap(const SkBitmap& bitmap, 62 void add_draw_bitmap(const SkBitmap& bitmap,
58 const gfx::Point& point, 63 const gfx::Point& point,
59 const SkPaint& paint) { 64 const SkPaint& paint) {
60 BitmapData data(bitmap, point, paint); 65 BitmapData data(bitmap, point, paint);
61 draw_bitmaps_.push_back(data); 66 draw_bitmaps_.push_back(data);
62 } 67 }
63 68
(...skipping 22 matching lines...) Expand all
86 RectPaintVector draw_rects_; 91 RectPaintVector draw_rects_;
87 BitmapVector draw_bitmaps_; 92 BitmapVector draw_bitmaps_;
88 SkCanvas* last_canvas_; 93 SkCanvas* last_canvas_;
89 PaintingControlSetting last_painting_control_; 94 PaintingControlSetting last_painting_control_;
90 size_t reported_memory_usage_; 95 size_t reported_memory_usage_;
91 }; 96 };
92 97
93 } // namespace cc 98 } // namespace cc
94 99
95 #endif // CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_ 100 #endif // CC_TEST_FAKE_CONTENT_LAYER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698