cc: Defer texture allocation (to allow async allocations).

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 57 matching lines @@
     void setDefaultResourceType(ResourceType type) { m_defaultResourceType = type; }
     ResourceType defaultResourceType() const { return m_defaultResourceType; }
     ResourceType resourceType(ResourceId);
 
     // Creates a resource of the default resource type.
     ResourceId createResource(const gfx::Size&, GLenum format, TextureUsageHint);
 
     // Creates a resource which is tagged as being managed for GPU memory accounting purposes.
     ResourceId createManagedResource(const gfx::Size&, GLenum format, TextureUsageHint);
 
+    // For tests only! Otherwise, implicitly allocate via lockForWrite or setPixels variant.
+    ResourceId createAllocatedResource(const gfx::Size&, GLenum format, TextureUsageHint);
+    ResourceId createAllocatedManagedResource(const gfx::Size&, GLenum format, TextureUsageHint);

[piman, 2012/12/18 22:41:38]

How about one explicit allocateResourceForTest(ResourceId) instead of 2 extra
entrypoints?

+
     // You can also explicitly create a specific resource type.
     ResourceId createGLTexture(const gfx::Size&, GLenum format, GLenum texturePool, TextureUsageHint);
 
     ResourceId createBitmap(const gfx::Size&);
     // Wraps an external texture into a GL resource.
     ResourceId createResourceFromExternalTexture(unsigned textureId);
 
     void deleteResource(ResourceId);
 
     // Update pixels from image, copying sourceRect (in image) into destRect (in the resource).
@@ skipping 155 matching lines @@
         unsigned glUploadQueryId;
         Mailbox mailbox;
         uint8_t* pixels;
         uint8_t* pixelBuffer;
         int lockForReadCount;
         bool lockedForWrite;
         bool external;
         bool exported;
         bool markedForDeletion;
         bool pendingSetPixels;
+        bool allocated;
         gfx::Size size;
         GLenum format;
         // TODO(skyostil): Use a separate sampler object for filter state.
         GLenum filter;
         ResourceType type;
     };
     typedef base::hash_map<ResourceId, Resource> ResourceMap;
     struct Child {
         Child();
         ~Child();
 
         ResourceIdMap childToParentMap;
         ResourceIdMap parentToChildMap;
     };
     typedef base::hash_map<int, Child> ChildMap;
 
     explicit ResourceProvider(OutputSurface*);
     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 deleteResourceInternal(ResourceMap::iterator it);
+    void lazyAllocate(ResourceId);
+    void lazyAllocate(Resource*);
 
     OutputSurface* m_outputSurface;
     ResourceId m_nextId;
     ResourceMap m_resources;
     int m_nextChild;
     ChildMap m_children;
 
     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;
     GLenum m_bestTextureFormat;
 
     base::ThreadChecker m_threadChecker;
 
     DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 }
 
 #endif  // CC_RESOURCE_PROVIDER_H_