Revert 277964 "cc: In SyncFromActiveLayer, drop all tiles not in..."

trunk/src/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 121 matching lines @@
 
   src_position -= tiling_rect_.y();
 
   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::ExpandRectToTileBoundsWithBorders(
-    const gfx::Rect& rect) const {
+    const gfx::Rect rect) const {
   if (!rect.Intersects(tiling_rect_) || has_empty_bounds())
     return gfx::Rect();
   int index_x = FirstBorderTileXIndexFromSrcCoord(rect.x());
   int index_y = FirstBorderTileYIndexFromSrcCoord(rect.y());
-  int index_right = LastBorderTileXIndexFromSrcCoord(rect.right() - 1);
-  int index_bottom = LastBorderTileYIndexFromSrcCoord(rect.bottom() - 1);
+  int index_right = LastBorderTileXIndexFromSrcCoord(rect.right());
+  int index_bottom = LastBorderTileYIndexFromSrcCoord(rect.bottom());
 
   gfx::Rect rect_top_left(TileBoundsWithBorder(index_x, index_y));
   gfx::Rect rect_bottom_right(TileBoundsWithBorder(index_right, index_bottom));
 
-  return gfx::UnionRects(rect_top_left, rect_bottom_right);
-}
-
-gfx::Rect TilingData::ExpandRectToTileBounds(const gfx::Rect& rect) const {
-  if (!rect.Intersects(tiling_rect_) || has_empty_bounds())
-    return gfx::Rect();
-  int index_x = FirstBorderTileXIndexFromSrcCoord(rect.x());
-  int index_y = FirstBorderTileYIndexFromSrcCoord(rect.y());
-  int index_right = LastBorderTileXIndexFromSrcCoord(rect.right() - 1);
-  int index_bottom = LastBorderTileYIndexFromSrcCoord(rect.bottom() - 1);
-
-  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 expanded(rect_top_left);
+  expanded.Union(rect_bottom_right);
+  return expanded;
 }
 
 gfx::Rect TilingData::TileBounds(int i, int j) const {
   AssertTile(i, j);
   int max_texture_size_x = max_texture_size_.width() - 2 * border_texels_;
   int max_texture_size_y = max_texture_size_.height() - 2 * border_texels_;
 
   int lo_x = tiling_rect_.x() + max_texture_size_x * i;
   if (i != 0)
     lo_x += border_texels_;
@@ skipping 503 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