cc: Make ResourceProvider correctly handle transferring mailbox-created resources

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 742 matching lines @@
     }
     if (resources.sync_point)
         GLC(context3d, context3d->waitSyncPoint(resources.sync_point));
     for (TransferableResourceArray::const_iterator it = resources.resources.begin(); it != resources.resources.end(); ++it) {
         ResourceMap::iterator mapIterator = m_resources.find(it->id);
         DCHECK(mapIterator != m_resources.end());
         Resource* resource = &mapIterator->second;
         DCHECK(resource->exported);
         resource->exported = false;
         DCHECK(resource->mailbox.Equals(it->mailbox));
-        GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, resource->glId));
-        GLC(context3d, context3d->consumeTextureCHROMIUM(GL_TEXTURE_2D, it->mailbox.name));
+        if (resource->glId) {
+          GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, resource->glId));
+          GLC(context3d, context3d->consumeTextureCHROMIUM(GL_TEXTURE_2D, it->mailbox.name));
+        } else {
+          resource->mailbox = TextureMailbox(resource->mailbox.name(), resource->mailbox.callback(), resources.sync_point);
+        }
         if (resource->markedForDeletion)
             deleteResourceInternal(mapIterator);
     }
 }
 
 bool ResourceProvider::transferResource(WebGraphicsContext3D* context, ResourceId id, TransferableResource* resource)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
     WebGraphicsContext3D* context3d = m_outputSurface->context3d();
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* source = &it->second;
     DCHECK(!source->lockedForWrite);
     DCHECK(!source->lockForReadCount);
     DCHECK(!source->external || (source->external && !source->mailbox.IsEmpty()));
     DCHECK(source->allocated);
     if (source->exported)
         return false;
     resource->id = id;
     resource->format = source->format;
     resource->filter = source->filter;
     resource->size = source->size;
 
     if (source->mailbox.IsEmpty()) {
         GLC(context3d, context3d->genMailboxCHROMIUM(resource->mailbox.name));
         source->mailbox.SetName(resource->mailbox);
     } else
         resource->mailbox = source->mailbox.name();
 
-    GLC(context, context->bindTexture(GL_TEXTURE_2D, source->glId));
-    GLC(context, context->produceTextureCHROMIUM(GL_TEXTURE_2D, resource->mailbox.name));
+    if (source->glId) {
+        GLC(context, context->bindTexture(GL_TEXTURE_2D, source->glId));
+        GLC(context, context->produceTextureCHROMIUM(GL_TEXTURE_2D, resource->mailbox.name));
+    } else if (source->mailbox.sync_point()) {
+        GLC(context3d, context3d->waitSyncPoint(source->mailbox.sync_point()));
+        source->mailbox.ResetSyncPoint();
+    }
     return true;
 }
 
 void ResourceProvider::acquirePixelBuffer(ResourceId id)
 {
     DCHECK(m_threadChecker.CalledOnValidThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
     DCHECK(!resource->external);
@@ skipping 312 matching lines @@
 
 void ResourceProvider::enableReadLockFences(ResourceProvider::ResourceId id, bool enable) {
     DCHECK(m_threadChecker.CalledOnValidThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
     resource->enableReadLockFences = enable;
 }
 
 }  // namespace cc