| Index: cc/tiled_layer.cc
|
| diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
|
| index 6e2689278faee9cce423fa528e23905109febf8f..b5e7aaecf10fe57e8931db52536e20278d3ad012 100644
|
| --- a/cc/tiled_layer.cc
|
| +++ b/cc/tiled_layer.cc
|
| @@ -96,7 +96,7 @@ scoped_ptr<CCLayerImpl> TiledLayerChromium::createCCLayerImpl()
|
|
|
| void TiledLayerChromium::updateTileSizeAndTilingOption()
|
| {
|
| - ASSERT(layerTreeHost());
|
| + CC_DCHECK(layerTreeHost());
|
|
|
| const IntSize& defaultTileSize = layerTreeHost()->settings().defaultTileSize;
|
| const IntSize& maxUntiledLayerSize = layerTreeHost()->settings().maxUntiledLayerSize;
|
| @@ -308,7 +308,7 @@ void TiledLayerChromium::invalidateContentRect(const IntRect& contentRect)
|
|
|
| for (CCLayerTilingData::TileMap::const_iterator iter = m_tiler->tiles().begin(); iter != m_tiler->tiles().end(); ++iter) {
|
| UpdatableTile* tile = static_cast<UpdatableTile*>(iter->second);
|
| - ASSERT(tile);
|
| + CC_DCHECK(tile);
|
| // FIXME: This should not ever be null.
|
| if (!tile)
|
| continue;
|
| @@ -378,11 +378,11 @@ void TiledLayerChromium::markOcclusionsAndRequestTextures(int left, int top, int
|
| for (int j = top; j <= bottom; ++j) {
|
| for (int i = left; i <= right; ++i) {
|
| UpdatableTile* tile = tileAt(i, j);
|
| - ASSERT(tile); // Did setTexturePriorities get skipped?
|
| + CC_DCHECK(tile); // Did setTexturePriorities get skipped?
|
| // FIXME: This should not ever be null.
|
| if (!tile)
|
| continue;
|
| - ASSERT(!tile->occluded); // Did resetUpdateState get skipped? Are we doing more than one occlusion pass?
|
| + CC_DCHECK(!tile->occluded); // Did resetUpdateState get skipped? Are we doing more than one occlusion pass?
|
| IntRect visibleTileRect = intersection(m_tiler->tileBounds(i, j), visibleContentRect());
|
| if (occlusion && occlusion->occluded(this, visibleTileRect)) {
|
| tile->occluded = true;
|
| @@ -406,7 +406,7 @@ bool TiledLayerChromium::haveTexturesForTiles(int left, int top, int right, int
|
| for (int j = top; j <= bottom; ++j) {
|
| for (int i = left; i <= right; ++i) {
|
| UpdatableTile* tile = tileAt(i, j);
|
| - ASSERT(tile); // Did setTexturePriorites get skipped?
|
| + CC_DCHECK(tile); // Did setTexturePriorites get skipped?
|
| // FIXME: This should not ever be null.
|
| if (!tile)
|
| continue;
|
| @@ -433,7 +433,7 @@ IntRect TiledLayerChromium::markTilesForUpdate(int left, int top, int right, int
|
| for (int j = top; j <= bottom; ++j) {
|
| for (int i = left; i <= right; ++i) {
|
| UpdatableTile* tile = tileAt(i, j);
|
| - ASSERT(tile); // Did setTexturePriorites get skipped?
|
| + CC_DCHECK(tile); // Did setTexturePriorites get skipped?
|
| // FIXME: This should not ever be null.
|
| if (!tile)
|
| continue;
|
| @@ -465,7 +465,7 @@ void TiledLayerChromium::updateTileTextures(const IntRect& paintRect, int left,
|
| for (int j = top; j <= bottom; ++j) {
|
| for (int i = left; i <= right; ++i) {
|
| UpdatableTile* tile = tileAt(i, j);
|
| - ASSERT(tile); // Did setTexturePriorites get skipped?
|
| + CC_DCHECK(tile); // Did setTexturePriorites get skipped?
|
| // FIXME: This should not ever be null.
|
| if (!tile)
|
| continue;
|
| @@ -666,7 +666,7 @@ void TiledLayerChromium::resetUpdateState()
|
|
|
| void TiledLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusionTracker* occlusion, CCRenderingStats& stats)
|
| {
|
| - ASSERT(!m_skipsDraw && !m_failedUpdate); // Did resetUpdateState get skipped?
|
| + CC_DCHECK(!m_skipsDraw && !m_failedUpdate); // Did resetUpdateState get skipped?
|
| updateBounds();
|
| if (m_tiler->hasEmptyBounds() || !drawsContent())
|
| return;
|
| @@ -753,7 +753,7 @@ bool TiledLayerChromium::needsIdlePaint()
|
| for (int j = top; j <= bottom; ++j) {
|
| for (int i = left; i <= right; ++i) {
|
| UpdatableTile* tile = tileAt(i, j);
|
| - ASSERT(tile); // Did setTexturePriorities get skipped?
|
| + CC_DCHECK(tile); // Did setTexturePriorities get skipped?
|
| if (!tile)
|
| continue;
|
|
|
|
|