cc: Rework overlays to not use the ResourceProvider and pass texture size

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 "cc/resources/shared_bitmap.h"
 
 namespace cc {
@@ skipping 10 matching lines @@
 
 TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
                                uint32 target,
                                uint32 sync_point)
     : mailbox_holder_(mailbox, target, sync_point),
       shared_bitmap_(NULL),
       allow_overlay_(false),
       nearest_neighbor_(false) {
 }
 
+TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
+                               uint32 target,
+                               uint32 sync_point,
+                               const gfx::Size& size,
+                               bool allow_overlay)
+    : mailbox_holder_(mailbox, target, sync_point),
+      shared_bitmap_(NULL),

[danakj, 2015/05/29 20:04:15]

nullptr

[achaulk, 2015/06/01 15:43:10]

Done.

+      size_(size),
+      allow_overlay_(allow_overlay),
+      nearest_neighbor_(false) {
+}

[danakj, 2015/05/29 20:04:15]

can you DCHECK_IMPLIES(allow_overlay, !size.IsEmpty()); ?

[achaulk, 2015/06/01 15:43:10]

Done.

+
 TextureMailbox::TextureMailbox(SharedBitmap* shared_bitmap,
                                const gfx::Size& size)
     : shared_bitmap_(shared_bitmap),
-      shared_memory_size_(size),
+      size_(size),
       allow_overlay_(false),
       nearest_neighbor_(false) {
   // If an embedder of cc gives an invalid TextureMailbox, we should crash
   // here to identify the offender.
-  CHECK(SharedBitmap::VerifySizeInBytes(shared_memory_size_));
+  CHECK(SharedBitmap::VerifySizeInBytes(size_));
 }
 
 TextureMailbox::~TextureMailbox() {}
 
 bool TextureMailbox::Equals(const TextureMailbox& other) const {
   if (other.IsTexture()) {
     return IsTexture() && !memcmp(mailbox_holder_.mailbox.name,
                                   other.mailbox_holder_.mailbox.name,
                                   sizeof(mailbox_holder_.mailbox.name));
   } else if (other.IsSharedMemory()) {
     return IsSharedMemory() && (shared_bitmap_ == other.shared_bitmap_);
   }
 
   DCHECK(!other.IsValid());
   return !IsValid();
 }
 
 size_t TextureMailbox::SharedMemorySizeInBytes() const {
   // UncheckedSizeInBytes is okay because we VerifySizeInBytes in the
   // constructor and the field is immutable.
-  return SharedBitmap::UncheckedSizeInBytes(shared_memory_size_);
+  return SharedBitmap::UncheckedSizeInBytes(size_);
 }
 
 }  // namespace cc