Revert "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 212 matching lines @@
     uint8_t* mapPixelBuffer(ResourceId id);
     void unmapPixelBuffer(ResourceId id);
 
     // Update pixels from acquired pixel buffer.
     void setPixelsFromBuffer(ResourceId id);
 
     // Asynchronously update pixels from acquired pixel buffer.
     void beginSetPixels(ResourceId id);
     bool didSetPixelsComplete(ResourceId id);
 
-    // For tests only! This prevents detecting uninitialized reads.
-    // Use setPixels or lockForWrite to allocate implicitly.
-    void allocateForTesting(ResourceId id);
-
 private:
     struct Resource {
         Resource();
         Resource(unsigned textureId, const gfx::Size& size, GLenum format, GLenum filter);
         Resource(uint8_t* pixels, const gfx::Size& size, GLenum format, GLenum filter);
 
         unsigned glId;
         // Pixel buffer used for set pixels without unnecessary copying.
         unsigned glPixelBufferId;
         // Query used to determine when asynchronous set pixels complete.
         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(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_