summaryrefslogtreecommitdiffstats
path: root/cc/layer_tiling_data.cc
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 01:25:18 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 01:25:18 +0000
commite7f87cfba8e6f916dd88359ed9abf6ec6884d65d (patch)
tree289b3ec335cf58e6924f5a6fccd8e17ea1c6585a /cc/layer_tiling_data.cc
parentbc3847a1ba39db7adec20aa9e0565f6e868e8480 (diff)
downloadchromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.zip
chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.gz
chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.bz2
Revert "cc: Switch to Chromium DCHECKs LOGs"
This reverts commit 162296. (https://chromiumcodereview.appspot.com/11048044) TBR=danakj@chromium.org Review URL: https://codereview.chromium.org/11196014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_tiling_data.cc')
-rw-r--r--cc/layer_tiling_data.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/cc/layer_tiling_data.cc b/cc/layer_tiling_data.cc
index 63750b1..2e6eaab 100644
--- a/cc/layer_tiling_data.cc
+++ b/cc/layer_tiling_data.cc
@@ -7,8 +7,6 @@
#include "CCLayerTilingData.h"
-#include "base/logging.h"
-
using namespace std;
namespace cc {
@@ -62,7 +60,7 @@ const CCLayerTilingData& CCLayerTilingData::operator=(const CCLayerTilingData& t
void CCLayerTilingData::addTile(scoped_ptr<Tile> tile, int i, int j)
{
- DCHECK(!tileAt(i, j));
+ ASSERT(!tileAt(i, j));
tile->moveTo(i, j);
m_tiles.add(make_pair(i, j), tile.Pass());
}
@@ -87,7 +85,7 @@ void CCLayerTilingData::contentRectToTileIndices(const IntRect& contentRect, int
// An empty rect doesn't result in an empty set of tiles, so don't pass an empty rect.
// FIXME: Possibly we should fill a vector of tiles instead,
// since the normal use of this function is to enumerate some tiles.
- DCHECK(!contentRect.isEmpty());
+ ASSERT(!contentRect.isEmpty());
left = m_tilingData.tileXIndexFromSrcCoord(contentRect.x());
top = m_tilingData.tileYIndexFromSrcCoord(contentRect.y());