Allow WebExternalTextureLayers to receive a bitmap along with a mailbox

cc/resources/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/resources/resource_provider.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/containers/hash_tables.h"
@@ skipping 257 matching lines @@
   return id;
 }
 
 ResourceProvider::ResourceId ResourceProvider::CreateResourceFromTextureMailbox(
     const TextureMailbox& mailbox) {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Just store the information. Mailbox will be consumed in LockForRead().
   ResourceId id = next_id_++;
   DCHECK(mailbox.IsValid());
   Resource& resource = resources_[id];
-  if (mailbox.IsTexture()) {
+  if (mailbox.IsBitmap()) {
+    SkBitmap bitmap = mailbox.bitmap();
+    SkAutoLockPixels bitmapLock(bitmap);

[tfarina, 2013/06/26 16:27:38]

minornit: bitmap_lock

+    uint8_t* pixels = reinterpret_cast<uint8_t*>(bitmap.getPixels());
+    resource = Resource(pixels, mailbox.shared_memory_size(),
+                        GL_RGBA, GL_LINEAR);
+  } else if (mailbox.IsTexture()) {
     resource = Resource(0, gfx::Size(), 0, GL_LINEAR, 0, TextureUsageAny);
   } else {
     DCHECK(mailbox.IsSharedMemory());
     base::SharedMemory* shared_memory = mailbox.shared_memory();
     DCHECK(shared_memory->memory());
     uint8_t* pixels = reinterpret_cast<uint8_t*>(shared_memory->memory());
     resource = Resource(pixels, mailbox.shared_memory_size(),
                         GL_RGBA, GL_LINEAR);
   }
   resource.external = true;
@@ skipping 58 matching lines @@
         GLC(context3d, context3d->bindTexture(
             resource->mailbox.target(), resource->gl_id));
         GLC(context3d, context3d->produceTextureCHROMIUM(
             resource->mailbox.target(), resource->mailbox.data()));
       }
       if (resource->gl_id)
         GLC(context3d, context3d->deleteTexture(resource->gl_id));
       if (!lost_resource && resource->gl_id)
         sync_point = context3d->insertSyncPoint();
     } else {
-      DCHECK(resource->mailbox.IsSharedMemory());
+      DCHECK(resource->mailbox.IsSharedMemory() ||
+             resource->mailbox.IsBitmap());
       base::SharedMemory* shared_memory = resource->mailbox.shared_memory();
-      if (resource->pixels && shared_memory) {
-        DCHECK(shared_memory->memory() == resource->pixels);
+      if (resource->pixels) {
+        DCHECK(!shared_memory || shared_memory->memory() == resource->pixels);
         resource->pixels = NULL;
       }
     }
     resource->mailbox.RunReleaseCallback(sync_point, lost_resource);
   }
   if (resource->pixels)
     delete[] resource->pixels;
   if (resource->pixel_buffer)
     delete[] resource->pixel_buffer;
 
@@ skipping 1036 matching lines @@
 
   WebGraphicsContext3D* context3d = output_surface_->context3d();
   DCHECK(context3d);
   int stride = 0;
   context3d->getImageParameterivCHROMIUM(
       resource->image_id, GL_IMAGE_ROWBYTES_CHROMIUM, &stride);
   return stride;
 }
 
 }  // namespace cc