Cosmetic cleanup to texture_layer mailboxes.

cc/texture_layer_impl.cc

 // Copyright 2011 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/texture_layer_impl.h"
 
 #include "base/stringprintf.h"
 #include "cc/layer_tree_impl.h"
 #include "cc/quad_sink.h"
 #include "cc/renderer.h"
@@ skipping 18 matching lines @@
   m_vertexOpacity[3] = 1.0f;
 }
 
 TextureLayerImpl::~TextureLayerImpl()
 {
     if (m_externalTextureResource) {
         DCHECK(m_usesMailbox);
         ResourceProvider* provider = layerTreeImpl()->resource_provider();
         provider->deleteResource(m_externalTextureResource);
     }
-    if (m_hasPendingMailbox && !m_pendingMailboxName.empty())
-        m_pendingMailboxReleaseCallback.Run(0);
+    if (m_hasPendingMailbox)
+        m_pendingTextureMailbox.RunReleaseCallback(0);
 }
 
-void TextureLayerImpl::setTextureMailbox(const std::string& mailboxName, const base::Callback<void(unsigned)>& releaseCallback)
+void TextureLayerImpl::setTextureMailbox(const TextureMailbox& mailbox)
 {
     DCHECK(m_usesMailbox);
     // Same mailbox name was commited, nothing to do.
-    if (m_pendingMailboxName.compare(mailboxName) == 0)
+    if (m_pendingTextureMailbox.Equals(mailbox))
         return;
     // Two commits without a draw, ack the previous mailbox.
-    if (m_hasPendingMailbox && !m_pendingMailboxReleaseCallback.is_null())
-        m_pendingMailboxReleaseCallback.Run(0);
+    if (m_hasPendingMailbox)
+        m_pendingTextureMailbox.RunReleaseCallback(0);
 
-    m_pendingMailboxName = mailboxName;
+    m_pendingTextureMailbox = mailbox;
     m_hasPendingMailbox = true;
-    m_pendingMailboxReleaseCallback = releaseCallback;
 }
 
 void TextureLayerImpl::willDraw(ResourceProvider* resourceProvider)
 {
     if (!m_usesMailbox) {
         if (!m_textureId)
             return;
         DCHECK(!m_externalTextureResource);
         m_externalTextureResource = resourceProvider->createResourceFromExternalTexture(m_textureId);
         return;
     }
 
     if (!m_hasPendingMailbox)
         return;
 
     if (m_externalTextureResource) {
         resourceProvider->deleteResource(m_externalTextureResource);
         m_externalTextureResource = 0;
     }
-    if (!m_pendingMailboxName.empty())
-        m_externalTextureResource = resourceProvider->createResourceFromTextureMailbox(m_pendingMailboxName, m_pendingMailboxReleaseCallback);
+    if (!m_pendingTextureMailbox.IsEmpty())
+        m_externalTextureResource = resourceProvider->createResourceFromTextureMailbox(m_pendingTextureMailbox);
     m_hasPendingMailbox = false;
 }
 
 void TextureLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuadsData)
 {
     if (!m_externalTextureResource)
         return;
 
     SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState());
     appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData);
@@ skipping 48 matching lines @@
 {
     return "TextureLayer";
 }
 
 bool TextureLayerImpl::canClipSelf() const
 {
     return true;
 }
 
 }  // namespace cc