Delay consuming the mailbox in the resource provider until lockForRead.

cc/resource_provider.cc

 // 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.
 
 #include "cc/resource_provider.h"
 
 #include <limits.h>
 
 #include "base/debug/alias.h"
 #include "base/hash_tables.h"
@@ skipping 226 matching lines @@
     Resource resource(textureId, gfx::Size(), 0, GL_LINEAR);
     resource.external = true;
     resource.allocated = true;
     m_resources[id] = resource;
     return id;
 }
 
 ResourceProvider::ResourceId ResourceProvider::createResourceFromTextureMailbox(const std::string& mailbox, const base::Callback<void(unsigned)>& releaseCallback)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
-
-    // FIXME: As an optimization, delay consuming the mailbox
-    // and creating the texture ID until lockForRead.
-    const int8* name = reinterpret_cast<const int8*>(mailbox.data());
-    WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
-    DCHECK(context3d);
-    unsigned textureId = context3d->createTexture();
-    GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, textureId));
-    GLC(context3d, context3d->consumeTextureCHROMIUM(GL_TEXTURE_2D, name));
-
+    // Just store the infomration. Mailbox will be consumed in lockForRead().

[danakj, 2013/01/11 00:23:41]

"infomration"

     ResourceId id = m_nextId++;
+    unsigned textureId = 0;
     Resource resource(textureId, gfx::Size(), 0, GL_LINEAR);
     resource.external = true;
-    resource.mailbox.setName(name);
+    resource.allocated = true;
+    resource.mailbox.setName(reinterpret_cast<const int8*>(mailbox.data()));
     resource.mailboxReleaseCallback = releaseCallback;
     m_resources[id] = resource;
     return id;
 }
 
 void ResourceProvider::deleteResource(ResourceId id)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
@@ skipping 23 matching lines @@
         GLC(context3d, context3d->deleteQueryEXT(resource->glUploadQueryId));
     }
     if (resource->glPixelBufferId) {
         WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
         DCHECK(context3d);
         GLC(context3d, context3d->deleteBuffer(resource->glPixelBufferId));
     }
     if (!resource->mailbox.isZero() && resource->external) {
         WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
         DCHECK(context3d);
-        GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, resource->glId));
-        GLC(context3d, context3d->produceTextureCHROMIUM(GL_TEXTURE_2D, resource->mailbox.name));
-        GLC(context3d, context3d->deleteTexture(resource->glId));
-        if (!resource->mailboxReleaseCallback.is_null()) {
-            unsigned syncPoint = context3d->insertSyncPoint();
+        unsigned syncPoint = 0;
+        if (resource->glId) {
+            GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, resource->glId));
+            GLC(context3d, context3d->produceTextureCHROMIUM(GL_TEXTURE_2D, resource->mailbox.name));
+            GLC(context3d, context3d->deleteTexture(resource->glId));
+            syncPoint = context3d->insertSyncPoint();
+        }
+        if (!resource->mailboxReleaseCallback.is_null())
             resource->mailboxReleaseCallback.Run(syncPoint);
-        }
     }
     if (resource->pixels)
         delete[] resource->pixels;
     if (resource->pixelBuffer)
         delete[] resource->pixelBuffer;
 
     m_resources.erase(it);
 }
 
 ResourceProvider::ResourceType ResourceProvider::resourceType(ResourceId id)
@@ skipping 101 matching lines @@
 const ResourceProvider::Resource* ResourceProvider::lockForRead(ResourceId id)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
     DCHECK(!resource->lockedForWrite);
     DCHECK(!resource->exported);
     DCHECK(resource->allocated); // Uninitialized! Call setPixels or lockForWrite first.
 
+    if (!resource->glId && resource->external && !resource->mailbox.isZero()) {
+        WebGraphicsContext3D* context3d = m_outputSurface->Context3D();
+        DCHECK(context3d);
+        resource->glId = context3d->createTexture();
+        GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, resource->glId));
+        GLC(context3d, context3d->consumeTextureCHROMIUM(GL_TEXTURE_2D, resource->mailbox.name));
+    }
+
     resource->lockForReadCount++;
     return resource;
 }
 
 void ResourceProvider::unlockForRead(ResourceId id)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
@@ skipping 600 matching lines @@
     GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, resource->glId));
     if (m_useTextureStorageExt && isTextureFormatSupportedForStorage(format)) {
         GLenum storageFormat = textureToStorageFormat(format);
         GLC(context3d, context3d->texStorage2DEXT(GL_TEXTURE_2D, 1, storageFormat, size.width(), size.height()));
     } else
         GLC(context3d, context3d->texImage2D(GL_TEXTURE_2D, 0, format, size.width(), size.height(), 0, format, GL_UNSIGNED_BYTE, 0));
 }
 
 
 }  // namespace cc