summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cc/base/rtree.cc5
-rw-r--r--cc/base/rtree.h10
-rw-r--r--cc/base/rtree_unittest.cc18
-rw-r--r--cc/playback/discardable_image_map.cc14
-rw-r--r--cc/playback/discardable_image_map.h3
-rw-r--r--cc/playback/discardable_image_map_unittest.cc30
6 files changed, 40 insertions, 40 deletions
diff --git a/cc/base/rtree.cc b/cc/base/rtree.cc
index ca64e87..79a4bcd 100644
--- a/cc/base/rtree.cc
+++ b/cc/base/rtree.cc
@@ -89,14 +89,13 @@ RTree::Branch RTree::BuildRecursive(std::vector<Branch>* branches, int level) {
return BuildRecursive(branches, level + 1);
}
-void RTree::Search(const gfx::RectF& query,
- std::vector<size_t>* results) const {
+void RTree::Search(const gfx::Rect& query, std::vector<size_t>* results) const {
if (num_data_elements_ > 0 && query.Intersects(root_.bounds))
SearchRecursive(root_.subtree, query, results);
}
void RTree::SearchRecursive(Node* node,
- const gfx::RectF& query,
+ const gfx::Rect& query,
std::vector<size_t>* results) const {
for (uint16_t i = 0; i < node->num_children; ++i) {
if (query.Intersects(node->children[i].bounds)) {
diff --git a/cc/base/rtree.h b/cc/base/rtree.h
index f765c353..63f7d14 100644
--- a/cc/base/rtree.h
+++ b/cc/base/rtree.h
@@ -46,7 +46,7 @@ class CC_EXPORT RTree {
branches.reserve(items.size());
for (size_t i = 0; i < items.size(); i++) {
- const gfx::RectF& bounds = bounds_getter(items[i]);
+ const gfx::Rect& bounds = bounds_getter(items[i]);
if (bounds.IsEmpty())
continue;
@@ -70,10 +70,10 @@ class CC_EXPORT RTree {
template <typename Container>
void Build(const Container& items) {
- Build(items, [](const gfx::RectF& bounds) { return bounds; });
+ Build(items, [](const gfx::Rect& bounds) { return bounds; });
}
- void Search(const gfx::RectF& query, std::vector<size_t>* results) const;
+ void Search(const gfx::Rect& query, std::vector<size_t>* results) const;
private:
// These values were empirically determined to produce reasonable performance
@@ -90,7 +90,7 @@ class CC_EXPORT RTree {
Node* subtree;
size_t index;
};
- gfx::RectF bounds;
+ gfx::Rect bounds;
};
struct Node {
@@ -100,7 +100,7 @@ class CC_EXPORT RTree {
};
void SearchRecursive(Node* root,
- const gfx::RectF& query,
+ const gfx::Rect& query,
std::vector<size_t>* results) const;
// Consumes the input array.
diff --git a/cc/base/rtree_unittest.cc b/cc/base/rtree_unittest.cc
index b703a17..e58c9f6 100644
--- a/cc/base/rtree_unittest.cc
+++ b/cc/base/rtree_unittest.cc
@@ -9,10 +9,10 @@
namespace cc {
TEST(RTreeTest, NoOverlap) {
- std::vector<gfx::RectF> rects;
+ std::vector<gfx::Rect> rects;
for (int y = 0; y < 50; ++y) {
for (int x = 0; x < 50; ++x) {
- rects.push_back(gfx::RectF(x, y, 1.f, 1.f));
+ rects.push_back(gfx::Rect(x, y, 1, 1));
}
}
@@ -20,30 +20,30 @@ TEST(RTreeTest, NoOverlap) {
rtree.Build(rects);
std::vector<size_t> results;
- rtree.Search(gfx::RectF(0.f, 0.f, 50.f, 50.f), &results);
+ rtree.Search(gfx::Rect(0, 0, 50, 50), &results);
ASSERT_EQ(2500u, results.size());
for (size_t i = 0; i < 2500; ++i) {
ASSERT_EQ(results[i], i);
}
results.clear();
- rtree.Search(gfx::RectF(0.f, 0.f, 50.f, 49.f), &results);
+ rtree.Search(gfx::Rect(0, 0, 50, 49), &results);
ASSERT_EQ(2450u, results.size());
for (size_t i = 0; i < 2450; ++i) {
ASSERT_EQ(results[i], i);
}
results.clear();
- rtree.Search(gfx::RectF(5.2f, 6.3f, 0.1f, 0.2f), &results);
+ rtree.Search(gfx::Rect(5, 6, 1, 1), &results);
ASSERT_EQ(1u, results.size());
EXPECT_EQ(6u * 50 + 5u, results[0]);
}
TEST(RTreeTest, Overlap) {
- std::vector<gfx::RectF> rects;
+ std::vector<gfx::Rect> rects;
for (int h = 1; h <= 50; ++h) {
for (int w = 1; w <= 50; ++w) {
- rects.push_back(gfx::RectF(0, 0, w, h));
+ rects.push_back(gfx::Rect(0, 0, w, h));
}
}
@@ -51,14 +51,14 @@ TEST(RTreeTest, Overlap) {
rtree.Build(rects);
std::vector<size_t> results;
- rtree.Search(gfx::RectF(0.f, 0.f, 1.f, 1.f), &results);
+ rtree.Search(gfx::Rect(0, 0, 1, 1), &results);
ASSERT_EQ(2500u, results.size());
for (size_t i = 0; i < 2500; ++i) {
ASSERT_EQ(results[i], i);
}
results.clear();
- rtree.Search(gfx::RectF(0.f, 49.f, 1.f, 1.f), &results);
+ rtree.Search(gfx::Rect(0, 49, 1, 1), &results);
ASSERT_EQ(50u, results.size());
for (size_t i = 0; i < 50; ++i) {
EXPECT_EQ(results[i], 2450u + i);
diff --git a/cc/playback/discardable_image_map.cc b/cc/playback/discardable_image_map.cc
index 1333475..e109e2b 100644
--- a/cc/playback/discardable_image_map.cc
+++ b/cc/playback/discardable_image_map.cc
@@ -39,7 +39,7 @@ class DiscardableImagesMetadataCanvas : public SkNWayCanvas {
DiscardableImagesMetadataCanvas(
int width,
int height,
- std::vector<std::pair<DrawImage, gfx::RectF>>* image_set)
+ std::vector<std::pair<DrawImage, gfx::Rect>>* image_set)
: SkNWayCanvas(width, height),
image_set_(image_set),
canvas_bounds_(SkRect::MakeIWH(width, height)) {}
@@ -99,11 +99,11 @@ class DiscardableImagesMetadataCanvas : public SkNWayCanvas {
}
image_set_->push_back(
std::make_pair(DrawImage(image, ExtractScale(matrix), filter_quality),
- gfx::SkRectToRectF(rect)));
+ gfx::ToEnclosingRect(gfx::SkRectToRectF(rect))));
}
}
- std::vector<std::pair<DrawImage, gfx::RectF>>* image_set_;
+ std::vector<std::pair<DrawImage, gfx::Rect>>* image_set_;
const SkRect canvas_bounds_;
};
@@ -121,8 +121,10 @@ scoped_ptr<SkCanvas> DiscardableImageMap::BeginGeneratingMetadata(
}
void DiscardableImageMap::EndGeneratingMetadata() {
- images_rtree_.Build(
- all_images_, [](const PositionDrawImage& image) { return image.second; });
+ images_rtree_.Build(all_images_,
+ [](const std::pair<DrawImage, gfx::Rect>& image) {
+ return image.second;
+ });
}
void DiscardableImageMap::GetDiscardableImagesInRect(
@@ -130,7 +132,7 @@ void DiscardableImageMap::GetDiscardableImagesInRect(
float raster_scale,
std::vector<DrawImage>* images) const {
std::vector<size_t> indices;
- images_rtree_.Search(gfx::RectF(rect), &indices);
+ images_rtree_.Search(rect, &indices);
for (size_t index : indices)
images->push_back(all_images_[index].first.ApplyScale(raster_scale));
}
diff --git a/cc/playback/discardable_image_map.h b/cc/playback/discardable_image_map.h
index db6b17f..0306e1b 100644
--- a/cc/playback/discardable_image_map.h
+++ b/cc/playback/discardable_image_map.h
@@ -49,12 +49,11 @@ class CC_EXPORT DiscardableImageMap {
private:
friend class ScopedMetadataGenerator;
friend class DiscardableImageMapTest;
- using PositionDrawImage = std::pair<DrawImage, gfx::RectF>;
scoped_ptr<SkCanvas> BeginGeneratingMetadata(const gfx::Size& bounds);
void EndGeneratingMetadata();
- std::vector<PositionDrawImage> all_images_;
+ std::vector<std::pair<DrawImage, gfx::Rect>> all_images_;
RTree images_rtree_;
};
diff --git a/cc/playback/discardable_image_map_unittest.cc b/cc/playback/discardable_image_map_unittest.cc
index f68b696..70253caa 100644
--- a/cc/playback/discardable_image_map_unittest.cc
+++ b/cc/playback/discardable_image_map_unittest.cc
@@ -21,10 +21,10 @@ namespace cc {
namespace {
struct PositionDrawImage {
- PositionDrawImage(const SkImage* image, const gfx::RectF& image_rect)
+ PositionDrawImage(const SkImage* image, const gfx::Rect& image_rect)
: image(image), image_rect(image_rect) {}
const SkImage* image;
- gfx::RectF image_rect;
+ gfx::Rect image_rect;
};
} // namespace
@@ -38,7 +38,7 @@ class DiscardableImageMapTest : public testing::Test {
image_map.GetDiscardableImagesInRect(rect, 1.f, &draw_images);
std::vector<size_t> indices;
- image_map.images_rtree_.Search(gfx::RectF(rect), &indices);
+ image_map.images_rtree_.Search(rect, &indices);
std::vector<PositionDrawImage> position_draw_images;
for (size_t index : indices) {
position_draw_images.push_back(
@@ -104,7 +104,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectTest) {
EXPECT_EQ(1u, images.size()) << x << " " << y;
EXPECT_TRUE(images[0].image == discardable_image[y][x].get())
<< x << " " << y;
- EXPECT_EQ(gfx::RectF(x * 512 + 6, y * 512 + 6, 500, 500),
+ EXPECT_EQ(gfx::Rect(x * 512 + 6, y * 512 + 6, 500, 500),
images[0].image_rect);
} else {
EXPECT_EQ(0u, images.size()) << x << " " << y;
@@ -117,14 +117,14 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectTest) {
GetDiscardableImagesInRect(image_map, gfx::Rect(512, 512, 2048, 2048));
EXPECT_EQ(4u, images.size());
EXPECT_TRUE(images[0].image == discardable_image[1][2].get());
- EXPECT_EQ(gfx::RectF(2 * 512 + 6, 512 + 6, 500, 500), images[0].image_rect);
+ EXPECT_EQ(gfx::Rect(2 * 512 + 6, 512 + 6, 500, 500), images[0].image_rect);
EXPECT_TRUE(images[1].image == discardable_image[2][1].get());
- EXPECT_EQ(gfx::RectF(512 + 6, 2 * 512 + 6, 500, 500), images[1].image_rect);
+ EXPECT_EQ(gfx::Rect(512 + 6, 2 * 512 + 6, 500, 500), images[1].image_rect);
EXPECT_TRUE(images[2].image == discardable_image[2][3].get());
- EXPECT_EQ(gfx::RectF(3 * 512 + 6, 2 * 512 + 6, 500, 500),
+ EXPECT_EQ(gfx::Rect(3 * 512 + 6, 2 * 512 + 6, 500, 500),
images[2].image_rect);
EXPECT_TRUE(images[3].image == discardable_image[3][2].get());
- EXPECT_EQ(gfx::RectF(2 * 512 + 6, 3 * 512 + 6, 500, 500),
+ EXPECT_EQ(gfx::Rect(2 * 512 + 6, 3 * 512 + 6, 500, 500),
images[3].image_rect);
}
@@ -181,7 +181,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectNonZeroLayer) {
EXPECT_EQ(1u, images.size()) << x << " " << y;
EXPECT_TRUE(images[0].image == discardable_image[y][x].get())
<< x << " " << y;
- EXPECT_EQ(gfx::RectF(1024 + x * 512 + 6, y * 512 + 6, 500, 500),
+ EXPECT_EQ(gfx::Rect(1024 + x * 512 + 6, y * 512 + 6, 500, 500),
images[0].image_rect);
} else {
EXPECT_EQ(0u, images.size()) << x << " " << y;
@@ -194,16 +194,16 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectNonZeroLayer) {
image_map, gfx::Rect(1024 + 512, 512, 2048, 2048));
EXPECT_EQ(4u, images.size());
EXPECT_TRUE(images[0].image == discardable_image[1][2].get());
- EXPECT_EQ(gfx::RectF(1024 + 2 * 512 + 6, 512 + 6, 500, 500),
+ EXPECT_EQ(gfx::Rect(1024 + 2 * 512 + 6, 512 + 6, 500, 500),
images[0].image_rect);
EXPECT_TRUE(images[1].image == discardable_image[2][1].get());
- EXPECT_EQ(gfx::RectF(1024 + 512 + 6, 2 * 512 + 6, 500, 500),
+ EXPECT_EQ(gfx::Rect(1024 + 512 + 6, 2 * 512 + 6, 500, 500),
images[1].image_rect);
EXPECT_TRUE(images[2].image == discardable_image[2][3].get());
- EXPECT_EQ(gfx::RectF(1024 + 3 * 512 + 6, 2 * 512 + 6, 500, 500),
+ EXPECT_EQ(gfx::Rect(1024 + 3 * 512 + 6, 2 * 512 + 6, 500, 500),
images[2].image_rect);
EXPECT_TRUE(images[3].image == discardable_image[3][2].get());
- EXPECT_EQ(gfx::RectF(1024 + 2 * 512 + 6, 3 * 512 + 6, 500, 500),
+ EXPECT_EQ(gfx::Rect(1024 + 2 * 512 + 6, 3 * 512 + 6, 500, 500),
images[3].image_rect);
}
@@ -281,7 +281,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectOnePixelQuery) {
EXPECT_EQ(1u, images.size()) << x << " " << y;
EXPECT_TRUE(images[0].image == discardable_image[y][x].get())
<< x << " " << y;
- EXPECT_EQ(gfx::RectF(x * 512 + 6, y * 512 + 6, 500, 500),
+ EXPECT_EQ(gfx::Rect(x * 512 + 6, y * 512 + 6, 500, 500),
images[0].image_rect);
} else {
EXPECT_EQ(0u, images.size()) << x << " " << y;
@@ -319,7 +319,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectMassiveImage) {
GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1, 1));
EXPECT_EQ(1u, images.size());
EXPECT_TRUE(images[0].image == discardable_image.get());
- EXPECT_EQ(gfx::RectF(0, 0, 1 << 25, 1 << 25), images[0].image_rect);
+ EXPECT_EQ(gfx::Rect(0, 0, 1 << 25, 1 << 25), images[0].image_rect);
}
} // namespace cc
generated by cgit v1.1 at 2024-06-24 07:31:37 +0000