Uber Comp: never change mailbox name associated with a texture object.

cc/resource_provider.h

 // 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.
 
 #ifndef CC_RESOURCE_PROVIDER_H_
 #define CC_RESOURCE_PROVIDER_H_
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 113 matching lines @@
     // NOTE: if the syncPoint filed in TransferableResourceList is set, this
     // will wait on it.
     void receiveFromChild(int child, const TransferableResourceList&);
 
     // Receives resources from the parent, moving them from mailboxes. Resource IDs
     // passed are in the child namespace.
     // NOTE: if the syncPoint filed in TransferableResourceList is set, this
     // will wait on it.
     void receiveFromParent(const TransferableResourceList&);
 
-    // Only for testing
-    size_t mailboxCount() const { return m_mailboxes.size(); }
-
     // The following lock classes are part of the ResourceProvider API and are
     // needed to read and write the resource contents. The user must ensure
     // that they only use GL locks on GL resources, etc, and this is enforced
     // by assertions.
     class CC_EXPORT ScopedReadLockGL {
     public:
         ScopedReadLockGL(ResourceProvider*, ResourceProvider::ResourceId);
         ~ScopedReadLockGL();
 
         unsigned textureId() const { return m_textureId; }
@@ skipping 53 matching lines @@
     };
 
      // 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();
-        Resource(unsigned textureId, int pool, const gfx::Size& size, GLenum format);
+        Resource(unsigned textureId, const Mailbox& mailbox, int pool,
+                 const gfx::Size& size, GLenum format);
         Resource(uint8_t* pixels, int pool, const gfx::Size& size, GLenum format);
 
         unsigned glId;
+        Mailbox mailbox;
         uint8_t* pixels;
         int pool;
         int lockForReadCount;
         bool lockedForWrite;
         bool external;
         bool exported;
         bool markedForDeletion;
         gfx::Size size;
         GLenum format;
         ResourceType type;
@@ skipping 12 matching lines @@
     explicit ResourceProvider(GraphicsContext*);
     bool initialize();
 
     const Resource* lockForRead(ResourceId);
     void unlockForRead(ResourceId);
     const Resource* lockForWrite(ResourceId);
     void unlockForWrite(ResourceId);
     static void populateSkBitmapWithResource(SkBitmap*, const Resource*);
 
     bool transferResource(WebKit::WebGraphicsContext3D*, ResourceId, TransferableResource*);
-    void trimMailboxDeque();
     void deleteResourceInternal(ResourceMap::iterator it);
 
     GraphicsContext* m_context;
     ResourceId m_nextId;
     ResourceMap m_resources;
     int m_nextChild;
     ChildMap m_children;
 
-    std::deque<Mailbox> m_mailboxes;
-
     ResourceType m_defaultResourceType;
     bool m_useTextureStorageExt;
     bool m_useTextureUsageHint;
     bool m_useShallowFlush;
     scoped_ptr<TextureUploader> m_textureUploader;
     scoped_ptr<AcceleratedTextureCopier> m_textureCopier;
     int m_maxTextureSize;
 
     DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 }
 
 #endif  // CC_RESOURCE_PROVIDER_H_