| Index: cc/layer_tiling_data.cc
|
| diff --git a/cc/layer_tiling_data.cc b/cc/layer_tiling_data.cc
|
| index 2e6eaab8b7758f3580b7c3c3e8cd4a72bdbf2343..63750b1e30b6ff0c0f85a6cfd2aef1ca88821260 100644
|
| --- a/cc/layer_tiling_data.cc
|
| +++ b/cc/layer_tiling_data.cc
|
| @@ -7,6 +7,8 @@
|
|
|
| #include "CCLayerTilingData.h"
|
|
|
| +#include "base/logging.h"
|
| +
|
| using namespace std;
|
|
|
| namespace cc {
|
| @@ -60,7 +62,7 @@ const CCLayerTilingData& CCLayerTilingData::operator=(const CCLayerTilingData& t
|
|
|
| void CCLayerTilingData::addTile(scoped_ptr<Tile> tile, int i, int j)
|
| {
|
| - ASSERT(!tileAt(i, j));
|
| + DCHECK(!tileAt(i, j));
|
| tile->moveTo(i, j);
|
| m_tiles.add(make_pair(i, j), tile.Pass());
|
| }
|
| @@ -85,7 +87,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.
|
| - ASSERT(!contentRect.isEmpty());
|
| + DCHECK(!contentRect.isEmpty());
|
|
|
| left = m_tilingData.tileXIndexFromSrcCoord(contentRect.x());
|
| top = m_tilingData.tileYIndexFromSrcCoord(contentRect.y());
|
|
|