summaryrefslogtreecommitdiffstats
path: root/cc/layers
diff options
context:
space:
mode:
authordongseong.hwang@intel.com <dongseong.hwang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-15 22:04:42 +0000
committerdongseong.hwang@intel.com <dongseong.hwang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-15 22:04:42 +0000
commit2b374d7d1c715e423ebb601b62f5f7ce45f4341e (patch)
tree462f43208ddb539f971360c7aa2dbe80fcc54565 /cc/layers
parent14ac41ff40ef4eb1c9369ac2fe590f67336084fe (diff)
downloadchromium_src-2b374d7d1c715e423ebb601b62f5f7ce45f4341e.zip
chromium_src-2b374d7d1c715e423ebb601b62f5f7ce45f4341e.tar.gz
chromium_src-2b374d7d1c715e423ebb601b62f5f7ce45f4341e.tar.bz2
Revert "cc: Temporary diagnostics."
This reverts commit d96fe727ec06c9adb8a474464fcca23867373f86. The commit is not needed as well as causes crash with --single-process. BUG=160485, 307545 Review URL: https://codereview.chromium.org/27326003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228780 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers')
-rw-r--r--cc/layers/tiled_layer_impl.cc21
1 files changed, 0 insertions, 21 deletions
diff --git a/cc/layers/tiled_layer_impl.cc b/cc/layers/tiled_layer_impl.cc
index b34f71b..88797c2 100644
--- a/cc/layers/tiled_layer_impl.cc
+++ b/cc/layers/tiled_layer_impl.cc
@@ -21,17 +21,12 @@
namespace cc {
-// Temporary diagnostic.
-static bool s_safe_to_delete_drawable_tile = false;
-
class DrawableTile : public LayerTilingData::Tile {
public:
static scoped_ptr<DrawableTile> Create() {
return make_scoped_ptr(new DrawableTile());
}
- virtual ~DrawableTile() { CHECK(s_safe_to_delete_drawable_tile); }
-
ResourceProvider::ResourceId resource_id() const { return resource_id_; }
void set_resource_id(ResourceProvider::ResourceId resource_id) {
resource_id_ = resource_id;
@@ -54,10 +49,6 @@ TiledLayerImpl::TiledLayerImpl(LayerTreeImpl* tree_impl, int id)
: LayerImpl(tree_impl, id), skips_draw_(true) {}
TiledLayerImpl::~TiledLayerImpl() {
- s_safe_to_delete_drawable_tile = true;
- if (tiler_)
- tiler_->reset();
- s_safe_to_delete_drawable_tile = false;
}
ResourceProvider::ResourceId TiledLayerImpl::ContentsResourceId() const {
@@ -88,10 +79,6 @@ DrawableTile* TiledLayerImpl::CreateTile(int i, int j) {
DrawableTile* added_tile = tile.get();
tiler_->AddTile(tile.PassAs<LayerTilingData::Tile>(), i, j);
- // Temporary diagnostic checks.
- CHECK(added_tile);
- CHECK(TileAt(i, j));
-
return added_tile;
}
@@ -261,8 +248,6 @@ void TiledLayerImpl::AppendQuads(QuadSink* quad_sink,
}
void TiledLayerImpl::SetTilingData(const LayerTilingData& tiler) {
- s_safe_to_delete_drawable_tile = true;
-
if (tiler_) {
tiler_->reset();
} else {
@@ -272,8 +257,6 @@ void TiledLayerImpl::SetTilingData(const LayerTilingData& tiler) {
: LayerTilingData::NO_BORDER_TEXELS);
}
*tiler_ = tiler;
-
- s_safe_to_delete_drawable_tile = false;
}
void TiledLayerImpl::PushTileProperties(
@@ -308,11 +291,7 @@ Region TiledLayerImpl::VisibleContentOpaqueRegion() const {
}
void TiledLayerImpl::DidLoseOutputSurface() {
- s_safe_to_delete_drawable_tile = true;
- // Temporary diagnostic check.
- CHECK(tiler_);
tiler_->reset();
- s_safe_to_delete_drawable_tile = false;
}
const char* TiledLayerImpl::LayerTypeAsString() const {