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

cc/layers/texture_layer_impl.cc

 // Copyright 2011 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/layers/texture_layer_impl.h"
 
 #include <vector>
 
 #include "base/strings/stringprintf.h"
 #include "cc/output/renderer.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/platform_color.h"
 #include "cc/resources/scoped_resource.h"
 #include "cc/resources/single_release_callback_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/occlusion.h"
 
 namespace cc {
 
 TextureLayerImpl::TextureLayerImpl(LayerTreeImpl* tree_impl, int id)
     : LayerImpl(tree_impl, id),
       external_texture_resource_(0),
+      external_texture_allow_overlay_(false),
       premultiplied_alpha_(true),
       blend_background_color_(false),
       flipped_(true),
       nearest_neighbor_(false),
       uv_top_left_(0.f, 0.f),
       uv_bottom_right_(1.f, 1.f),
       own_mailbox_(false),
       valid_texture_copy_(false) {
   vertex_opacity_[0] = 1.0f;
   vertex_opacity_[1] = 1.0f;
@@ skipping 44 matching lines @@
     return false;
 
   if (own_mailbox_) {
     DCHECK(!external_texture_resource_);
     if ((draw_mode == DRAW_MODE_HARDWARE && texture_mailbox_.IsTexture()) ||
         (draw_mode == DRAW_MODE_SOFTWARE &&
          texture_mailbox_.IsSharedMemory())) {
       external_texture_resource_ =
           resource_provider->CreateResourceFromTextureMailbox(
               texture_mailbox_, release_callback_.Pass());
+      external_texture_resource_size_ = texture_mailbox_.size();
+      external_texture_allow_overlay_ = texture_mailbox_.allow_overlay();
       DCHECK(external_texture_resource_);
       texture_copy_ = nullptr;
       valid_texture_copy_ = false;
     }
     if (external_texture_resource_)
       own_mailbox_ = false;
   }
 
   if (!valid_texture_copy_ && draw_mode == DRAW_MODE_HARDWARE &&
       texture_mailbox_.IsSharedMemory()) {
     DCHECK(!external_texture_resource_);
     // Have to upload a copy to a texture for it to be used in a
     // hardware draw.
     if (!texture_copy_)
       texture_copy_ = ScopedResource::Create(resource_provider);
-    if (texture_copy_->size() != texture_mailbox_.shared_memory_size() ||
+    if (texture_copy_->size() != texture_mailbox_.size() ||
         resource_provider->InUseByConsumer(texture_copy_->id()))
       texture_copy_->Free();
 
     if (!texture_copy_->id()) {
-      texture_copy_->Allocate(texture_mailbox_.shared_memory_size(),
+      texture_copy_->Allocate(texture_mailbox_.size(),
                               ResourceProvider::TEXTURE_HINT_IMMUTABLE,
                               resource_provider->best_texture_format());
     }
 
     if (texture_copy_->id()) {
       std::vector<uint8> swizzled;
       uint8* pixels = texture_mailbox_.shared_bitmap()->pixels();
 
       if (!PlatformColor::SameComponentOrder(texture_copy_->format())) {
         // Swizzle colors. This is slow, but should be really uncommon.
         size_t bytes = texture_mailbox_.SharedMemorySizeInBytes();
         swizzled.resize(bytes);
         for (size_t i = 0; i < bytes; i += 4) {
           swizzled[i] = pixels[i + 2];
           swizzled[i + 1] = pixels[i + 1];
           swizzled[i + 2] = pixels[i];
           swizzled[i + 3] = pixels[i + 3];
         }
         pixels = &swizzled[0];
       }
 
       resource_provider->SetPixels(
-          texture_copy_->id(),
-          pixels,
-          gfx::Rect(texture_mailbox_.shared_memory_size()),
-          gfx::Rect(texture_mailbox_.shared_memory_size()),
-          gfx::Vector2d());
+          texture_copy_->id(), pixels, gfx::Rect(texture_mailbox_.size()),
+          gfx::Rect(texture_mailbox_.size()), gfx::Vector2d());
 
       valid_texture_copy_ = true;
     }
   }
   return (external_texture_resource_ || valid_texture_copy_) &&
          LayerImpl::WillDraw(draw_mode, resource_provider);
 }
 
 void TextureLayerImpl::AppendQuads(RenderPass* render_pass,
                                    AppendQuadsData* append_quads_data) {
@@ skipping 27 matching lines @@
                opaque_rect,
                visible_quad_rect,
                id,
                premultiplied_alpha_,
                uv_top_left_,
                uv_bottom_right_,
                bg_color,
                vertex_opacity_,
                flipped_,
                nearest_neighbor_);
+  if (!valid_texture_copy_) {
+    quad->resource_size = external_texture_resource_size_;

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

could you just pull these from the texture_mailbox_?

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

Done.

+    quad->allow_overlay = external_texture_allow_overlay_;
+  }
   ValidateQuadResources(quad);
 }
 
 SimpleEnclosedRegion TextureLayerImpl::VisibleContentOpaqueRegion() const {
   if (contents_opaque())
     return SimpleEnclosedRegion(visible_content_rect());
 
   if (blend_background_color_ && (SkColorGetA(background_color()) == 0xFF))
     return SimpleEnclosedRegion(visible_content_rect());
 
@@ skipping 65 matching lines @@
   } else if (external_texture_resource_) {
     DCHECK(!own_mailbox_);
     ResourceProvider* resource_provider =
         layer_tree_impl()->resource_provider();
     resource_provider->DeleteResource(external_texture_resource_);
     external_texture_resource_ = 0;
   }
 }
 
 }  // namespace cc