diff options
| author | vmpstr <vmpstr@chromium.org> | 2015-05-28 11:23:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-28 18:24:00 +0000 |
| commit | c48fd0209655108ac33716ede56109724f839bc9 (patch) | |
| tree | 85cda3e0081024c5141d21a8e59a7bc195b20bff /cc/playback | |
| parent | bc4f7fa505a2d59a434d8a164043210a960d9be9 (diff) | |
| download | chromium_src-c48fd0209655108ac33716ede56109724f839bc9.zip chromium_src-c48fd0209655108ac33716ede56109724f839bc9.tar.gz chromium_src-c48fd0209655108ac33716ede56109724f839bc9.tar.bz2 | |
cc: Move RoundUp and RoundDown out of util.h into math_util.h
This patch merges util.h into math_util.h since the only two functions
in there are math functions.
R=danakj
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1161553012
Cr-Commit-Position: refs/heads/master@{#331823}
Diffstat (limited to 'cc/playback')
| -rw-r--r-- | cc/playback/picture.cc | 1 | ||||
| -rw-r--r-- | cc/playback/pixel_ref_map.cc | 32 |
2 files changed, 17 insertions, 16 deletions
diff --git a/cc/playback/picture.cc b/cc/playback/picture.cc index e86cba6..8ce9c66 100644 --- a/cc/playback/picture.cc +++ b/cc/playback/picture.cc @@ -12,7 +12,6 @@ #include "base/trace_event/trace_event_argument.h" #include "base/values.h" #include "cc/base/math_util.h" -#include "cc/base/util.h" #include "cc/debug/picture_debug_util.h" #include "cc/debug/traced_picture.h" #include "cc/debug/traced_value.h" diff --git a/cc/playback/pixel_ref_map.cc b/cc/playback/pixel_ref_map.cc index bb5a84c..a5c8f05 100644 --- a/cc/playback/pixel_ref_map.cc +++ b/cc/playback/pixel_ref_map.cc @@ -7,7 +7,7 @@ #include <algorithm> #include <limits> -#include "cc/base/util.h" +#include "cc/base/math_util.h" #include "cc/playback/display_item_list.h" #include "cc/playback/picture.h" #include "skia/ext/pixel_ref_utils.h" @@ -33,15 +33,16 @@ void PixelRefMap::GatherPixelRefsFromPicture(SkPicture* picture) { skia::PixelRefUtils::GatherDiscardablePixelRefs(picture, &pixel_refs); for (skia::DiscardablePixelRefList::const_iterator it = pixel_refs.begin(); it != pixel_refs.end(); ++it) { - gfx::Point min( - RoundDown(static_cast<int>(it->pixel_ref_rect.x()), cell_size_.width()), - RoundDown(static_cast<int>(it->pixel_ref_rect.y()), - cell_size_.height())); - gfx::Point max( - RoundDown(static_cast<int>(std::ceil(it->pixel_ref_rect.right())), - cell_size_.width()), - RoundDown(static_cast<int>(std::ceil(it->pixel_ref_rect.bottom())), - cell_size_.height())); + gfx::Point min(MathUtil::RoundDown(static_cast<int>(it->pixel_ref_rect.x()), + cell_size_.width()), + MathUtil::RoundDown(static_cast<int>(it->pixel_ref_rect.y()), + cell_size_.height())); + gfx::Point max(MathUtil::RoundDown( + static_cast<int>(std::ceil(it->pixel_ref_rect.right())), + cell_size_.width()), + MathUtil::RoundDown( + static_cast<int>(std::ceil(it->pixel_ref_rect.bottom())), + cell_size_.height())); for (int y = min.y(); y <= max.y(); y += cell_size_.height()) { for (int x = min.x(); x <= max.x(); x += cell_size_.width()) { @@ -147,11 +148,12 @@ void PixelRefMap::Iterator::PointToFirstPixelRef(const gfx::Rect& rect) { gfx::Size cell_size(target_pixel_ref_map_->cell_size_); // We have to find a cell_size aligned point that corresponds to // query_rect. Point is a multiple of cell_size. - min_point_ = gfx::Point(RoundDown(query_rect.x(), cell_size.width()), - RoundDown(query_rect.y(), cell_size.height())); - max_point_ = - gfx::Point(RoundDown(query_rect.right() - 1, cell_size.width()), - RoundDown(query_rect.bottom() - 1, cell_size.height())); + min_point_ = + gfx::Point(MathUtil::RoundDown(query_rect.x(), cell_size.width()), + MathUtil::RoundDown(query_rect.y(), cell_size.height())); + max_point_ = gfx::Point( + MathUtil::RoundDown(query_rect.right() - 1, cell_size.width()), + MathUtil::RoundDown(query_rect.bottom() - 1, cell_size.height())); // Limit the points to known pixel ref boundaries. min_point_ = gfx::Point( |