| Index: cc/resources/picture_layer_tiling.cc
|
| diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc
|
| index 5f74b704d19fbf9ebb1eca67e5797633ab7d40b9..fd4ce836c29cfecc71e60deff61c1a757143c15b 100644
|
| --- a/cc/resources/picture_layer_tiling.cc
|
| +++ b/cc/resources/picture_layer_tiling.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "cc/resources/picture_layer_tiling.h"
|
|
|
| +#include <algorithm>
|
| #include <cmath>
|
|
|
| #include "base/debug/trace_event.h"
|
| @@ -131,7 +132,6 @@ void PictureLayerTiling::Invalidate(const Region& layer_invalidation) {
|
| for (Region::Iterator region_iter(layer_invalidation);
|
| region_iter.has_rect();
|
| region_iter.next()) {
|
| -
|
| gfx::Rect layer_invalidation = region_iter.rect();
|
| layer_invalidation.Intersect(gfx::Rect(layer_bounds_));
|
| gfx::Rect rect =
|
| @@ -395,8 +395,7 @@ void PictureLayerTiling::UpdateTilePriorities(
|
|
|
| // Fast path tile priority calculation when both transforms are translations.
|
| if (last_screen_transform.IsIdentityOrTranslation() &&
|
| - current_screen_transform.IsIdentityOrTranslation())
|
| - {
|
| + current_screen_transform.IsIdentityOrTranslation()) {
|
| gfx::Vector2dF current_offset(
|
| current_screen_transform.matrix().get(0, 3),
|
| current_screen_transform.matrix().get(1, 3));
|
| @@ -523,7 +522,7 @@ gfx::Rect PictureLayerTiling::ExpandRectEquallyToAreaBoundedBy(
|
| gfx::Rect bounding_rect) {
|
| DCHECK(!starting_rect.IsEmpty());
|
| DCHECK(!bounding_rect.IsEmpty());
|
| - DCHECK(target_area > 0);
|
| + DCHECK_GT(target_area, 0);
|
|
|
| gfx::Rect rect = IntersectRects(starting_rect, bounding_rect);
|
| if (rect.IsEmpty())
|
|
|