summaryrefslogtreecommitdiffstats
path: root/cc/layer_tiling_data.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 23:02:38 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 23:02:38 +0000
commitd0f98369e69763a2eeb7ea39097bf01ef234a39c (patch)
tree943e3e20a23e54d6de23d4007828a1d35c2bf6bf /cc/layer_tiling_data.cc
parent1140046f0868117776b6df7e7c99c5bf3dd23731 (diff)
downloadchromium_src-d0f98369e69763a2eeb7ea39097bf01ef234a39c.zip
chromium_src-d0f98369e69763a2eeb7ea39097bf01ef234a39c.tar.gz
chromium_src-d0f98369e69763a2eeb7ea39097bf01ef234a39c.tar.bz2
Remove most remaining references to IntRect and FloatRect.
The remaining uses are: - Dealing with the output of Region::rects() which gives a vector of WebCore::IntRects. - Using FloatRect::isExpressibleAsIntRect. Covered by existing tests; no new behaviour. BUG=147395 R=enne Review URL: https://codereview.chromium.org/11275113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_tiling_data.cc')
-rw-r--r--cc/layer_tiling_data.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/cc/layer_tiling_data.cc b/cc/layer_tiling_data.cc
index b3ba58d..10086da 100644
--- a/cc/layer_tiling_data.cc
+++ b/cc/layer_tiling_data.cc
@@ -7,6 +7,8 @@
#include "cc/layer_tiling_data.h"
+#include "IntRect.h"
+#include "IntSize.h"
#include "base/logging.h"
using namespace std;
@@ -117,7 +119,7 @@ Region LayerTilingData::opaqueRegionInContentRect(const gfx::Rect& contentRect)
continue;
gfx::Rect tileOpaqueRect = gfx::IntersectRects(contentRect, tile->opaqueRect());
- opaqueRegion.unite(cc::IntRect(tileOpaqueRect));
+ opaqueRegion.Union(tileOpaqueRect);
}
}
return opaqueRegion;