Allow WebExternalTextureLayers to receive a bitmap along with a mailbox

cc/resources/texture_mailbox.cc

 // Copyright 2013 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/texture_mailbox.h"
 
 #include "base/logging.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
 namespace cc {
@@ skipping 58 matching lines @@
     base::SharedMemory* shared_memory,
     gfx::Size size,
     const ReleaseCallback& callback)
     : callback_(callback),
       target_(GL_TEXTURE_2D),
       sync_point_(0),
       shared_memory_(shared_memory),
       shared_memory_size_(size) {
 }
 
+TextureMailbox::TextureMailbox(
+    SkBitmap bitmap,
+    gfx::Size size,
+    const ReleaseCallback& callback)
+    : callback_(callback),
+      target_(GL_TEXTURE_2D),
+      sync_point_(0),
+      bitmap_(bitmap),
+      shared_memory_size_(size) {
+}
+
 TextureMailbox::~TextureMailbox() {
 }
 
 bool TextureMailbox::Equals(const TextureMailbox& other) const {
   if (other.IsTexture())
     return ContainsMailbox(other.name());
   else if (other.IsSharedMemory())
     return ContainsHandle(other.shared_memory_->handle());
+  else if (other.IsBitmap())
+    return other.bitmap_.getPixels() == bitmap_.getPixels();
 
   DCHECK(!other.IsValid());
   return !IsValid();
 }
 
 bool TextureMailbox::ContainsMailbox(const gpu::Mailbox& other) const {
   return IsTexture() && !memcmp(data(), other.name, sizeof(name_.name));
 }
 
 bool TextureMailbox::ContainsHandle(base::SharedMemoryHandle handle) const {
@@ skipping 16 matching lines @@
   TextureMailbox result(*this);
   result.callback_ = callback;
   return result;
 }
 
 size_t TextureMailbox::shared_memory_size_in_bytes() const {
   return 4 * shared_memory_size_.GetArea();
 }
 
 }  // namespace cc