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

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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=167317

[ccameron, 2012-11-12 22:02:31]

Removing this stuff, since it's just polluting the space now.

[enal1, 2012-11-12 22:42:43]

Are you sure you choose the correct person? I am not working on Chrome for
months, and code look unfamiliar to me anyways...

On Mon, Nov 12, 2012 at 2:02 PM, <ccameron@chromium.org> wrote:

> Reviewers: enal,
>
> Message:
> Removing this stuff, since it's just polluting the space now.
>
> Description:
> 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
>
>
> Please review this at
https://codereview.chromium.**org/11363207/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M cc/layer_tree_host.cc
>   M cc/resource_provider.h
>   M cc/resource_provider.cc
>   M cc/resource_update_controller.**cc
>   M cc/thread_proxy.cc
>
>
> Index: cc/layer_tree_host.cc
> diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
> index a186ed0ca2c7dde89d5f7ec52f7d83**da1764d6b4..**
> b969201954863467a622ac7357857c**9e1bbaf1bc 100644
> --- a/cc/layer_tree_host.cc
> +++ b/cc/layer_tree_host.cc
> @@ -249,9 +249,7 @@ void
LayerTreeHost::**finishCommitOnImplThread(**LayerTreeHostImpl*
> hostImpl)
>      DCHECK(m_proxy->isImplThread()**);
>
>      m_contentsTextureManager->**updateBackingsInDrawingImplTre**e();
> -    ResourceProvider::**debugNotifyEnterZone(**0xA000000);
>      m_contentsTextureManager->**reduceMemory(hostImpl->**
> resourceProvider());
> -    ResourceProvider::**debugNotifyLeaveZone();
>
>     
hostImpl->setRootLayer(**TreeSynchronizer::**synchronizeTrees(rootLayer(),
> hostImpl->detachLayerTree(), hostImpl));
>
> Index: cc/resource_provider.cc
> diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
> index d60d66413d2fb8a2ebd38a73345613**0dc1910965..**
> 0107e82b47123117ef99b559529582**ab0ca89df3 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
> Index: cc/resource_provider.h
> diff --git a/cc/resource_provider.h b/cc/resource_provider.h
> index b7fbcda96e31603162d5a0728af3a9**3fa056f54f..**
> e75cda6e56807310ae874131492fed**7a03a04519 100644
> --- a/cc/resource_provider.h
> +++ b/cc/resource_provider.h
> @@ -197,11 +197,6 @@ public:
>          DISALLOW_COPY_AND_ASSIGN(**ScopedWriteLockSoftware);
>      };
>
> -     // Temporary functions for debugging crashes in issue 151428 in
> canary.
> -     // Do not use these!
> -     static void debugNotifyEnterZone(unsigned int index);
> -     static void debugNotifyLeaveZone();
> -
>  private:
>      struct Resource {
>          Resource();
> Index: cc/resource_update_controller.**cc
> diff --git a/cc/resource_update_**controller.cc b/cc/resource_update_**
> controller.cc
> index 69bddb111a2a1a812d26d7aabd839b**19b22ad742..**
> 4ff729c846082cf780eb051f904998**898b362393 100644
> --- a/cc/resource_update_**controller.cc
> +++ b/cc/resource_update_**controller.cc
> @@ -217,10 +217,8 @@ void ResourceUpdateController::**finalize()
>  void ResourceUpdateController::**onTimerFired()
>  {
>      m_taskPosted = false;
> -    ResourceProvider::**debugNotifyEnterZone(**0xB000000);
>      if (!**updateMoreTexturesIfEnoughTime**Remaining())
>          m_client->**readyToFinalizeTextureUpdates(**);
> -    ResourceProvider::**debugNotifyLeaveZone();
>  }
>
>  base::TimeTicks ResourceUpdateController::now(**) const
> Index: cc/thread_proxy.cc
> diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc
> index bfff73375b426c35c77b80968604ae**c374d94f40..**
> 8a50a7780ae314022e49b91f25af4a**1dda906045 100644
> --- a/cc/thread_proxy.cc
> +++ b/cc/thread_proxy.cc
> @@ -356,9 +356,7 @@ bool
ThreadProxy::**reduceContentsTextureMemoryOnI**mplThread(size_t
> limitBytes, int
>      if (!m_layerTreeHost->**contentsTextureManager())
>          return false;
>
> -    ResourceProvider::**debugNotifyEnterZone(**0x1000000);
>      bool reduceResult = m_layerTreeHost->**contentsTextureManager()->**
> reduceMemoryOnImplThread(**limitBytes, priorityCutoff,
> m_layerTreeHostImpl->**resourceProvider());
> -    ResourceProvider::**debugNotifyLeaveZone();
>      if (!reduceResult)
>          return false;
>
> @@ -658,10 +656,8 @@ void
ThreadProxy::**beginFrameCompleteOnImplThread**(CompletionEvent*
> completion, Re
>      m_layerTreeHost->**contentsTextureManager()->**
> pushTexturePrioritiesToBacking**s();
>
>      m_**currentResourceUpdateControlle**rOnImplThread =
> ResourceUpdateController::**create(this, Proxy::implThread(),
> queue.Pass(), m_layerTreeHostImpl->**resourceProvider(), hasImplThread());
> -    ResourceProvider::**debugNotifyEnterZone(**0x2000000);
>      m_**currentResourceUpdateControlle**rOnImplThread->**
> performMoreUpdates(
>          m_schedulerOnImplThread->**anticipatedDrawTime());
> -    ResourceProvider::**debugNotifyLeaveZone();
>
>      m_**commitCompletionEventOnImplThr**ead = completion;
>  }
> @@ -684,9 +680,7 @@ void ThreadProxy::**scheduledActionCommit()
>      DCHECK(m_**currentResourceUpdateControlle**rOnImplThread);
>
>      // Complete all remaining texture updates.
> -    ResourceProvider::**debugNotifyEnterZone(**0x3000000);
>      m_**currentResourceUpdateControlle**rOnImplThread->finalize();
> -    ResourceProvider::**debugNotifyLeaveZone();
>      m_**currentResourceUpdateControlle**rOnImplThread.reset();
>
>      // If there are linked evicted backings, these backings' resources
> may be put into the
> @@ -752,9 +746,7 @@ ScheduledActionDrawAndSwapResu**lt ThreadProxy::**
> scheduledActionDrawAndSwapInte**rnal
>      // prepareToDraw(), it is guarded on canDraw() as well.
>
>      LayerTreeHostImpl::FrameData frame;
> -    ResourceProvider::**debugNotifyEnterZone(**0x4000000);
>      bool drawFrame = m_layerTreeHostImpl->canDraw() &&
> (m_layerTreeHostImpl->**prepareToDraw(frame) || forcedDraw);
> -    ResourceProvider::**debugNotifyLeaveZone();
>      if (drawFrame) {
>          m_layerTreeHostImpl->**drawLayers(frame);
>          result.didDraw = true;
> @@ -834,9 +826,7 @@ void
ThreadProxy::**didAnticipatedDrawTimeChange(**base::TimeTicks
> time)
>      if (!m_**currentResourceUpdateControlle**rOnImplThread)
>          return;
>
> -    ResourceProvider::**debugNotifyEnterZone(**0x5000000);
>      m_**currentResourceUpdateControlle**rOnImplThread->**
> performMoreUpdates(time);
> -    ResourceProvider::**debugNotifyLeaveZone();
>  }
>
>  void ThreadProxy::**readyToFinalizeTextureUpdates(**)
> @@ -937,9 +927,7 @@ void
ThreadProxy::**layerTreeHostClosedOnImplThrea**d(CompletionEvent*
> completion)
>  {
>      TRACE_EVENT0("cc", "ThreadProxy::**layerTreeHostClosedOnImplThrea**
> d");
>      DCHECK(isImplThread());
> -    ResourceProvider::**debugNotifyEnterZone(**0x6000000);
>      m_layerTreeHost->**deleteContentsTexturesOnImplTh**
> read(m_layerTreeHostImpl->**resourceProvider());
> -    ResourceProvider::**debugNotifyLeaveZone();
>      m_inputHandlerOnImplThread.**reset();
>      m_layerTreeHostImpl.reset();
>      m_schedulerOnImplThread.reset(**);
> @@ -961,9 +949,7 @@ void
ThreadProxy::**recreateContextOnImplThread(**CompletionEvent*
> completion, scope
>  {
>      TRACE_EVENT0("cc", "ThreadProxy::**recreateContextOnImplThread");
>      DCHECK(isImplThread());
> -    ResourceProvider::**debugNotifyEnterZone(**0x7000000);
>      m_layerTreeHost->**deleteContentsTexturesOnImplTh**
> read(m_layerTreeHostImpl->**resourceProvider());
> -    ResourceProvider::**debugNotifyLeaveZone();
>      *recreateSucceeded = m_layerTreeHostImpl->**
> initializeRenderer(context.**Pass());
>      if (*recreateSucceeded) {
>          *capabilities = m_layerTreeHostImpl->**rendererCapabilities();
>
>
>

[jamesr, 2012-11-12 22:44:42]

I think he meant enne@.  Anyway, LGTM

[ccameron, 2012-11-12 23:12:40]

On 2012/11/12 22:44:42, jamesr wrote:
> I think he meant enne@.  Anyway, LGTM

Oops.  Yes, was supposed to be enne (typing faster than I'm thinking).  Thanks!!

[commit-bot: I haz the power, 2012-11-12 23:13:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/ccameron@chromium.org/11363207/1

[commit-bot: I haz the power, 2012-11-13 07:07:02]

Change committed as 167317