summaryrefslogtreecommitdiffstats
path: root/cc/resource_provider.cc
diff options
context:
space:
mode:
authorccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 07:07:00 +0000
committerccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 07:07:00 +0000
commitdb7776922a4f631052a61b1d67c637acfb524bd1 (patch)
tree2508f7a2dc113e768d164574ca95bb518119b1d6 /cc/resource_provider.cc
parentb02e7ec861ec98ef21ee5447a06fa1ef2e37b328 (diff)
downloadchromium_src-db7776922a4f631052a61b1d67c637acfb524bd1.zip
chromium_src-db7776922a4f631052a61b1d67c637acfb524bd1.tar.gz
chromium_src-db7776922a4f631052a61b1d67c637acfb524bd1.tar.bz2
Remove crash instrumentation, since we haven't seen a crash in
a long time (Canary just got some with single-threaded proxy, but that's a different issue). BUG=151428 Review URL: https://chromiumcodereview.appspot.com/11363207 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resource_provider.cc')
-rw-r--r--cc/resource_provider.cc39
1 files changed, 1 insertions, 38 deletions
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index d60d664..0107e82 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -23,15 +23,6 @@
using WebKit::WebGraphicsContext3D;
-namespace {
- // Temporary variables for debugging crashes in issue 151428 in canary.
- // Do not use these!
- const int g_debugMaxResourcesTracked = 64;
- unsigned int g_debugZone = 0;
- int64 g_debugResDestroyedCount = 0;
- cc::ResourceProvider::ResourceId g_debugResDestroyed[g_debugMaxResourcesTracked] = { 0 };
-}
-
namespace cc {
static GLenum textureToStorageFormat(GLenum textureFormat)
@@ -233,7 +224,6 @@ void ResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
if (resource->pixels)
delete[] resource->pixels;
- g_debugResDestroyed[g_debugResDestroyedCount % g_debugMaxResourcesTracked] = (*it).first | g_debugZone;
m_resources.erase(it);
}
@@ -352,23 +342,7 @@ const ResourceProvider::Resource* ResourceProvider::lockForRead(ResourceId id)
{
DCHECK(m_threadChecker.CalledOnValidThread());
ResourceMap::iterator it = m_resources.find(id);
-
- if (it == m_resources.end()) {
- int resourceCount = m_resources.size();
- int64 resDestroyedCount = g_debugResDestroyedCount;
- ResourceId resDestroyed[g_debugMaxResourcesTracked];
- for (int64 i = 0; i < g_debugMaxResourcesTracked; ++i)
- resDestroyed[i] = g_debugResDestroyed[i];
- ResourceId resToDestroy = id;
-
- base::debug::Alias(&resourceCount);
- base::debug::Alias(&resDestroyedCount);
- for (int64 i = 0; i < g_debugMaxResourcesTracked; ++i)
- base::debug::Alias(&resDestroyed[i]);
- base::debug::Alias(&resToDestroy);
- CHECK(it != m_resources.end());
- }
-
+ CHECK(it != m_resources.end());
Resource* resource = &it->second;
DCHECK(!resource->lockedForWrite);
DCHECK(!resource->exported);
@@ -678,15 +652,4 @@ bool ResourceProvider::transferResource(WebGraphicsContext3D* context, ResourceI
return true;
}
-void ResourceProvider::debugNotifyEnterZone(unsigned int zone)
-{
- g_debugZone = zone;
-}
-
-void ResourceProvider::debugNotifyLeaveZone()
-{
- g_debugZone = 0;
-}
-
-
} // namespace cc