Commit 68239f6a authored by Etienne Bergeron's avatar Etienne Bergeron Committed by Commit Bot

Remove deprecated RangeF rounding APIs

The rounding APIs on a Range are not used anymore.

We fixed the use cases where the call to Round was incorrect.
Typically, the code was looking for an "enclosing-range" or
and "enclosed-range".

It is preferable to remove the API since it's misleading the devs.

R=rsesek@chromium.org

Bug: 1111044
Change-Id: I7f11c9c28c2a5c93d3fe8cfcbd38a6b077e90105
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339713Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Commit-Queue: Etienne Bergeron <etienneb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795570}
parent 1c47f925
...@@ -19,24 +19,6 @@ RangeF RangeF::Intersect(const Range& range) const { ...@@ -19,24 +19,6 @@ RangeF RangeF::Intersect(const Range& range) const {
return Intersect(range_f); return Intersect(range_f);
} }
Range RangeF::Floor() const {
uint32_t start = start_ > 0 ? static_cast<uint32_t>(std::floor(start_)) : 0;
uint32_t end = end_ > 0 ? static_cast<uint32_t>(std::floor(end_)) : 0;
return Range(start, end);
}
Range RangeF::Ceil() const {
uint32_t start = start_ > 0 ? static_cast<uint32_t>(std::ceil(start_)) : 0;
uint32_t end = end_ > 0 ? static_cast<uint32_t>(std::ceil(end_)) : 0;
return Range(start, end);
}
Range RangeF::Round() const {
uint32_t start = start_ > 0 ? static_cast<uint32_t>(std::round(start_)) : 0;
uint32_t end = end_ > 0 ? static_cast<uint32_t>(std::round(end_)) : 0;
return Range(start, end);
}
std::string RangeF::ToString() const { std::string RangeF::ToString() const {
return base::StringPrintf("{%f,%f}", start(), end()); return base::StringPrintf("{%f,%f}", start(), end());
} }
......
...@@ -225,36 +225,6 @@ TYPED_TEST(RangeTest, ContainAndIntersect) { ...@@ -225,36 +225,6 @@ TYPED_TEST(RangeTest, ContainAndIntersect) {
EXPECT_FALSE(r1.Intersects(invalid)); EXPECT_FALSE(r1.Intersects(invalid));
} }
TEST(RangeTest, RangeFConverterTest) {
gfx::RangeF range_f(1.2f, 3.9f);
gfx::Range range = range_f.Floor();
EXPECT_EQ(1U, range.start());
EXPECT_EQ(3U, range.end());
range = range_f.Ceil();
EXPECT_EQ(2U, range.start());
EXPECT_EQ(4U, range.end());
range = range_f.Round();
EXPECT_EQ(1U, range.start());
EXPECT_EQ(4U, range.end());
// Test for negative values.
range_f.set_start(-1.2f);
range_f.set_end(-3.8f);
range = range_f.Floor();
EXPECT_EQ(0U, range.start());
EXPECT_EQ(0U, range.end());
range = range_f.Ceil();
EXPECT_EQ(0U, range.start());
EXPECT_EQ(0U, range.end());
range = range_f.Round();
EXPECT_EQ(0U, range.start());
EXPECT_EQ(0U, range.end());
}
TEST(RangeTest, RangeOperations) { TEST(RangeTest, RangeOperations) {
constexpr gfx::Range invalid_range = gfx::Range::InvalidRange(); constexpr gfx::Range invalid_range = gfx::Range::InvalidRange();
constexpr gfx::Range ranges[] = {{0, 0}, {0, 1}, {0, 2}, {1, 0}, {1, 1}, constexpr gfx::Range ranges[] = {{0, 0}, {0, 1}, {0, 2}, {1, 0}, {1, 1},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment