Mac Overlays: Allow SolidColor and Tile quads to be candidates for overlays.

cc/layers/picture_layer_impl.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/layers/picture_layer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <set>
@@ skipping 285 matching lines @@
           // the best the layer can promise in the future, consider those as
           // complete. But if a tile is ideal scale, we don't want to consider
           // it incomplete and trying to replace it with a tile at a worse
           // scale.
           if (iter->contents_scale() != raster_contents_scale_ &&
               iter->contents_scale() != ideal_contents_scale_ &&
               geometry_rect.Intersects(scaled_viewport_for_tile_priority)) {
             append_quads_data->num_incomplete_tiles++;
           }
 
+          ResourceProvider::ScopedReadLockGpuMemoryBuffer lock(
+              layer_tree_impl()->resource_provider(), draw_info.resource_id());

[Andre, 2015/10/02 18:10:15]

Here we want allow_overlay to be set if the resource has a GLImage.
I created ScopedReadLockGpuMemoryBuffer but not sure if it's right.
Seems like it should call ResourceProvider:;LockForRead(), but if I do that I
hit this exported_count assert.
https://code.google.com/p/chromium/codesearch#chromium/src/cc/resources/resou...

Daniele, WDYT?

+
           TileDrawQuad* quad =
               render_pass->CreateAndAppendDrawQuad<TileDrawQuad>();
           quad->SetNew(shared_quad_state, geometry_rect, opaque_rect,
                        visible_geometry_rect, draw_info.resource_id(),
                        texture_rect, draw_info.resource_size(),
-                       draw_info.contents_swizzled(), nearest_neighbor_);
+                       draw_info.contents_swizzled(), nearest_neighbor_,
+                       lock.image_id() != 0);
           ValidateQuadResources(quad);
           iter->draw_info().set_was_ever_used_to_draw();
           has_draw_quad = true;
           break;
         }
         case TileDrawInfo::SOLID_COLOR_MODE: {
           SolidColorDrawQuad* quad =
               render_pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
           quad->SetNew(shared_quad_state, geometry_rect, visible_geometry_rect,
                        draw_info.solid_color(), false);
@@ skipping 924 matching lines @@
 
 bool PictureLayerImpl::IsOnActiveOrPendingTree() const {
   return !layer_tree_impl()->IsRecycleTree();
 }
 
 bool PictureLayerImpl::HasValidTilePriorities() const {
   return IsOnActiveOrPendingTree() && IsDrawnRenderSurfaceLayerListMember();
 }
 
 }  // namespace cc