Remove crash instrumentation, since we haven't seen a crash in

cc/resource_provider.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resource_provider.h"
 
 #include <limits.h>
 
 #include "base/debug/alias.h"
 #include "base/hash_tables.h"
 #include "base/stl_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "cc/gl_renderer.h" // For the GLC() macro.
 #include "cc/texture_uploader.h"
 #include "cc/transferable_resource.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d.h"
 
 #include <public/WebGraphicsContext3D.h>
 
 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)
 {
     GLenum storageFormat = GL_RGBA8_OES;
     switch (textureFormat) {
     case GL_RGBA:
         break;
     case GL_BGRA_EXT:
         storageFormat = GL_BGRA8_EXT;
@@ skipping 181 matching lines @@
 {
     Resource* resource = &it->second;
     if (resource->glId && !resource->external) {
         WebGraphicsContext3D* context3d = m_context->context3D();
         DCHECK(context3d);
         GLC(context3d, context3d->deleteTexture(resource->glId));
     }
     if (resource->pixels)
         delete[] resource->pixels;
 
-    g_debugResDestroyed[g_debugResDestroyedCount % g_debugMaxResourcesTracked] = (*it).first | g_debugZone;
     m_resources.erase(it);
 }
 
 void ResourceProvider::deleteOwnedResources(int pool)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
     ResourceIdArray toDelete;
     for (ResourceMap::iterator it = m_resources.begin(); it != m_resources.end(); ++it) {
         if (it->second.pool == pool && !it->second.external && !it->second.markedForDeletion)
             toDelete.push_back(it->first);
@@ skipping 98 matching lines @@
         return false;
 
     context3d->shallowFlushCHROMIUM();
     return true;
 }
 
 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);
     resource->lockForReadCount++;
     return resource;
 }
 
 void ResourceProvider::unlockForRead(ResourceId id)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
@@ skipping 289 matching lines @@
       GLC(context3d, context3d->genMailboxCHROMIUM(name));
       source->mailbox.setName(name);
     }
 
     resource->mailbox = source->mailbox;
     GLC(context, context->bindTexture(GL_TEXTURE_2D, source->glId));
     GLC(context, context->produceTextureCHROMIUM(GL_TEXTURE_2D, resource->mailbox.name));
     return true;
 }
 
-void ResourceProvider::debugNotifyEnterZone(unsigned int zone)
-{
-    g_debugZone = zone;
-}
-
-void ResourceProvider::debugNotifyLeaveZone()
-{
-    g_debugZone = 0;
-}
-
-
 }  // namespace cc