cc: Remove and Create the correct tiles when resizing live tiles rect

cc/base/tiling_data.cc

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/base/tiling_data.h"
 
 #include <algorithm>
 
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
@@ skipping 108 matching lines @@
 int TilingData::LastBorderTileYIndexFromSrcCoord(int src_position) const {
   if (num_tiles_y_ <= 1)
     return 0;
 
   DCHECK_GT(max_texture_size_.height() - 2 * border_texels_, 0);
   int inner_tile_size = max_texture_size_.height() - 2 * border_texels_;
   int y = src_position / inner_tile_size;
   return std::min(std::max(y, 0), num_tiles_y_ - 1);
 }
 
-gfx::Rect TilingData::ExpandRectIgnoringBordersToTileBoundsWithBorders(
+gfx::Rect TilingData::ExpandRectIgnoringBordersToTileBounds(
     const gfx::Rect& rect) const {
   if (rect.IsEmpty() || has_empty_bounds())
     return gfx::Rect();
   if (rect.x() > tiling_size_.width() || rect.y() > tiling_size_.height())
     return gfx::Rect();
   int index_x = TileXIndexFromSrcCoord(rect.x());
   int index_y = TileYIndexFromSrcCoord(rect.y());
   int index_right = TileXIndexFromSrcCoord(rect.right() - 1);
   int index_bottom = TileYIndexFromSrcCoord(rect.bottom() - 1);
 
-  gfx::Rect rect_top_left(TileBoundsWithBorder(index_x, index_y));
-  gfx::Rect rect_bottom_right(TileBoundsWithBorder(index_right, index_bottom));
+  gfx::Rect rect_top_left(TileBounds(index_x, index_y));
+  gfx::Rect rect_bottom_right(TileBounds(index_right, index_bottom));
 
   return gfx::UnionRects(rect_top_left, rect_bottom_right);
 }
 
 gfx::Rect TilingData::ExpandRectToTileBounds(const gfx::Rect& rect) const {
   if (rect.IsEmpty() || has_empty_bounds())
     return gfx::Rect();
   if (rect.x() > tiling_size_.width() || rect.y() > tiling_size_.height())
     return gfx::Rect();
   int index_x = FirstBorderTileXIndexFromSrcCoord(rect.x());
@@ skipping 220 matching lines @@
   gfx::Rect tiling_bounds_rect(tiling_data_->tiling_size());
   gfx::Rect consider(consider_rect);
   gfx::Rect ignore(ignore_rect);
   consider.Intersect(tiling_bounds_rect);
   ignore.Intersect(tiling_bounds_rect);
   if (consider.IsEmpty()) {
     done();
     return;
   }
 
-  consider_left_ =
-      tiling_data_->FirstBorderTileXIndexFromSrcCoord(consider.x());
-  consider_top_ =
-      tiling_data_->FirstBorderTileYIndexFromSrcCoord(consider.y());
-  consider_right_ =
-      tiling_data_->LastBorderTileXIndexFromSrcCoord(consider.right() - 1);
+  consider_left_ = tiling_data_->TileXIndexFromSrcCoord(consider.x());
+  consider_top_ = tiling_data_->TileYIndexFromSrcCoord(consider.y());
+  consider_right_ = tiling_data_->TileXIndexFromSrcCoord(consider.right() - 1);
   consider_bottom_ =
-      tiling_data_->LastBorderTileYIndexFromSrcCoord(consider.bottom() - 1);
+      tiling_data_->TileYIndexFromSrcCoord(consider.bottom() - 1);
 
   if (!ignore.IsEmpty()) {
-    ignore_left_ =
-        tiling_data_->FirstBorderTileXIndexFromSrcCoord(ignore.x());
-    ignore_top_ =
-        tiling_data_->FirstBorderTileYIndexFromSrcCoord(ignore.y());
-    ignore_right_ =
-        tiling_data_->LastBorderTileXIndexFromSrcCoord(ignore.right() - 1);
-    ignore_bottom_ =
-        tiling_data_->LastBorderTileYIndexFromSrcCoord(ignore.bottom() - 1);
+    ignore_left_ = tiling_data_->TileXIndexFromSrcCoord(ignore.x());
+    ignore_top_ = tiling_data_->TileYIndexFromSrcCoord(ignore.y());
+    ignore_right_ = tiling_data_->TileXIndexFromSrcCoord(ignore.right() - 1);
+    ignore_bottom_ = tiling_data_->TileYIndexFromSrcCoord(ignore.bottom() - 1);
 
     // Clamp ignore indices to consider indices.
     ignore_left_ = std::max(ignore_left_, consider_left_);
     ignore_top_ = std::max(ignore_top_, consider_top_);
     ignore_right_ = std::min(ignore_right_, consider_right_);
     ignore_bottom_ = std::min(ignore_bottom_, consider_bottom_);
   }
 
   if (ignore_left_ == consider_left_ && ignore_right_ == consider_right_ &&
       ignore_top_ == consider_top_ && ignore_bottom_ == consider_bottom_) {
@@ skipping 71 matching lines @@
   gfx::Rect consider(consider_rect);
   gfx::Rect ignore(ignore_rect);
   gfx::Rect center(center_rect);
   consider.Intersect(tiling_bounds_rect);
   ignore.Intersect(tiling_bounds_rect);
   if (consider.IsEmpty()) {
     done();
     return;
   }
 
-  consider_left_ =
-      tiling_data_->FirstBorderTileXIndexFromSrcCoord(consider.x());
-  consider_top_ = tiling_data_->FirstBorderTileYIndexFromSrcCoord(consider.y());
-  consider_right_ =
-      tiling_data_->LastBorderTileXIndexFromSrcCoord(consider.right() - 1);
+  consider_left_ = tiling_data_->TileXIndexFromSrcCoord(consider.x());
+  consider_top_ = tiling_data_->TileYIndexFromSrcCoord(consider.y());
+  consider_right_ = tiling_data_->TileXIndexFromSrcCoord(consider.right() - 1);
   consider_bottom_ =
-      tiling_data_->LastBorderTileYIndexFromSrcCoord(consider.bottom() - 1);
+      tiling_data_->TileYIndexFromSrcCoord(consider.bottom() - 1);
 
   if (!ignore.IsEmpty()) {
-    ignore_left_ = tiling_data_->FirstBorderTileXIndexFromSrcCoord(ignore.x());
-    ignore_top_ = tiling_data_->FirstBorderTileYIndexFromSrcCoord(ignore.y());
-    ignore_right_ =
-        tiling_data_->LastBorderTileXIndexFromSrcCoord(ignore.right() - 1);
-    ignore_bottom_ =
-        tiling_data_->LastBorderTileYIndexFromSrcCoord(ignore.bottom() - 1);
+    ignore_left_ = tiling_data_->TileXIndexFromSrcCoord(ignore.x());
+    ignore_top_ = tiling_data_->TileYIndexFromSrcCoord(ignore.y());
+    ignore_right_ = tiling_data_->TileXIndexFromSrcCoord(ignore.right() - 1);
+    ignore_bottom_ = tiling_data_->TileYIndexFromSrcCoord(ignore.bottom() - 1);
 
     // Clamp ignore indices to consider indices.
     ignore_left_ = std::max(ignore_left_, consider_left_);
     ignore_top_ = std::max(ignore_top_, consider_top_);
     ignore_right_ = std::min(ignore_right_, consider_right_);
     ignore_bottom_ = std::min(ignore_bottom_, consider_bottom_);
   }
 
   if (ignore_left_ == consider_left_ && ignore_right_ == consider_right_ &&
       ignore_top_ == consider_top_ && ignore_bottom_ == consider_bottom_) {
     done();
     return;
   }
 
   // Determine around left, such that it is between -1 and num_tiles_x.
   int around_left = 0;
   if (center.x() < 0 || center.IsEmpty())
     around_left = -1;
   else if (center.x() > tiling_data->tiling_size().width())
     around_left = tiling_data->num_tiles_x();
   else
-    around_left = tiling_data->FirstBorderTileXIndexFromSrcCoord(center.x());
+    around_left = tiling_data->TileXIndexFromSrcCoord(center.x());
 
   // Determine around top, such that it is between -1 and num_tiles_y.
   int around_top = 0;
   if (center.y() < 0 || center.IsEmpty())
     around_top = -1;
   else if (center.y() > tiling_data->tiling_size().height())
     around_top = tiling_data->num_tiles_y();
   else
-    around_top = tiling_data->FirstBorderTileYIndexFromSrcCoord(center.y());
+    around_top = tiling_data->TileYIndexFromSrcCoord(center.y());
 
   // Determine around right, such that it is between -1 and num_tiles_x.
   int right_src_coord = center.right() - 1;
   int around_right = 0;
   if (right_src_coord < 0 || center.IsEmpty()) {
     around_right = -1;
   } else if (right_src_coord > tiling_data->tiling_size().width()) {
     around_right = tiling_data->num_tiles_x();
   } else {
-    around_right =
-        tiling_data->LastBorderTileXIndexFromSrcCoord(right_src_coord);
+    around_right = tiling_data->TileXIndexFromSrcCoord(right_src_coord);
   }
 
   // Determine around bottom, such that it is between -1 and num_tiles_y.
   int bottom_src_coord = center.bottom() - 1;
   int around_bottom = 0;
   if (bottom_src_coord < 0 || center.IsEmpty()) {
     around_bottom = -1;
   } else if (bottom_src_coord > tiling_data->tiling_size().height()) {
     around_bottom = tiling_data->num_tiles_y();
   } else {
-    around_bottom =
-        tiling_data->LastBorderTileYIndexFromSrcCoord(bottom_src_coord);
+    around_bottom = tiling_data->TileYIndexFromSrcCoord(bottom_src_coord);
   }
 
   vertical_step_count_ = around_bottom - around_top + 1;
   horizontal_step_count_ = around_right - around_left + 1;
   current_step_ = horizontal_step_count_ - 1;
 
   index_x_ = around_right;
   index_y_ = around_bottom;
 
   // The current index is the bottom right of the around rect, which is also
@@ skipping 102 matching lines @@
   current_step_ = 0;
   direction_ = static_cast<Direction>((direction_ + 1) % 4);
 
   if (direction_ == RIGHT || direction_ == LEFT) {
     ++vertical_step_count_;
     ++horizontal_step_count_;
   }
 }
 
 }  // namespace cc