summaryrefslogtreecommitdiffstats
path: root/cc/tiled_layer.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/tiled_layer.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/tiled_layer.cc')
-rw-r--r--cc/tiled_layer.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index e7adf54..1ea1e25 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -97,7 +97,7 @@ scoped_ptr<CCLayerImpl> TiledLayerChromium::createCCLayerImpl()
void TiledLayerChromium::updateTileSizeAndTilingOption()
{
- DCHECK(layerTreeHost());
+ ASSERT(layerTreeHost());
const IntSize& defaultTileSize = layerTreeHost()->settings().defaultTileSize;
const IntSize& maxUntiledLayerSize = layerTreeHost()->settings().maxUntiledLayerSize;
@@ -309,7 +309,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);
- DCHECK(tile);
+ ASSERT(tile);
// FIXME: This should not ever be null.
if (!tile)
continue;
@@ -379,11 +379,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);
- DCHECK(tile); // Did setTexturePriorities get skipped?
+ ASSERT(tile); // Did setTexturePriorities get skipped?
// FIXME: This should not ever be null.
if (!tile)
continue;
- DCHECK(!tile->occluded); // Did resetUpdateState get skipped? Are we doing more than one occlusion pass?
+ ASSERT(!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;
@@ -407,7 +407,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);
- DCHECK(tile); // Did setTexturePriorites get skipped?
+ ASSERT(tile); // Did setTexturePriorites get skipped?
// FIXME: This should not ever be null.
if (!tile)
continue;
@@ -434,7 +434,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);
- DCHECK(tile); // Did setTexturePriorites get skipped?
+ ASSERT(tile); // Did setTexturePriorites get skipped?
// FIXME: This should not ever be null.
if (!tile)
continue;
@@ -466,7 +466,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);
- DCHECK(tile); // Did setTexturePriorites get skipped?
+ ASSERT(tile); // Did setTexturePriorites get skipped?
// FIXME: This should not ever be null.
if (!tile)
continue;
@@ -667,7 +667,7 @@ void TiledLayerChromium::resetUpdateState()
void TiledLayerChromium::update(CCTextureUpdateQueue& queue, const CCOcclusionTracker* occlusion, CCRenderingStats& stats)
{
- DCHECK(!m_skipsDraw && !m_failedUpdate); // Did resetUpdateState get skipped?
+ ASSERT(!m_skipsDraw && !m_failedUpdate); // Did resetUpdateState get skipped?
updateBounds();
if (m_tiler->hasEmptyBounds() || !drawsContent())
return;
@@ -754,7 +754,7 @@ bool TiledLayerChromium::needsIdlePaint()
for (int j = top; j <= bottom; ++j) {
for (int i = left; i <= right; ++i) {
UpdatableTile* tile = tileAt(i, j);
- DCHECK(tile); // Did setTexturePriorities get skipped?
+ ASSERT(tile); // Did setTexturePriorities get skipped?
if (!tile)
continue;