cc: Rework how picture layer tiling set gets into raster queues.

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 36 matching lines @@
 const int kMinHeightForGpuRasteredTile = 256;
 
 // When making odd-sized tiles, round them up to increase the chances
 // of using the same tile size.
 const int kTileRoundUp = 64;
 
 }  // namespace
 
 namespace cc {
 
-PictureLayerImpl::Pair::Pair() : active(nullptr), pending(nullptr) {
-}
-
-PictureLayerImpl::Pair::Pair(PictureLayerImpl* active_layer,
-                             PictureLayerImpl* pending_layer)
-    : active(active_layer), pending(pending_layer) {
-}
-
-PictureLayerImpl::Pair::~Pair() {
-}
-
 PictureLayerImpl::PictureLayerImpl(
     LayerTreeImpl* tree_impl,
     int id,
     bool is_mask,
     scoped_refptr<SyncedScrollOffset> scroll_offset)
     : LayerImpl(tree_impl, id, scroll_offset),
       twin_layer_(nullptr),
       tilings_(CreatePictureLayerTilingSet()),
       ideal_page_scale_(0.f),
       ideal_device_scale_(0.f),
       ideal_source_scale_(0.f),
       ideal_contents_scale_(0.f),
       raster_page_scale_(0.f),
       raster_device_scale_(0.f),
       raster_source_scale_(0.f),
       raster_contents_scale_(0.f),
       low_res_raster_contents_scale_(0.f),
       raster_source_scale_is_fixed_(false),
       was_screen_space_transform_animating_(false),
       only_used_low_res_last_append_quads_(false),
       is_mask_(is_mask),
       nearest_neighbor_(false) {
-  layer_tree_impl()->RegisterPictureLayerImpl(this);
+  // If this layer is created while we have no tile manager, then we will get a
+  // call to ReleaseResources and RecreateResources when we get a tile manager,
+  // so we will be able to register a tiling set into it at that time.
+  // Otherwise, if tile manager already exists, then register the tiling set
+  // right now.
+  if (tree_impl->tile_manager()) {
+    WhichTree tree = tree_impl->IsActiveTree() ? ACTIVE_TREE : PENDING_TREE;
+    tree_impl->tile_manager()->RegisterPictureLayerTilingSet(id, tree,
+                                                             tilings_.get());
+  }
 }
 
 PictureLayerImpl::~PictureLayerImpl() {
   if (twin_layer_)
     twin_layer_->twin_layer_ = nullptr;
-  layer_tree_impl()->UnregisterPictureLayerImpl(this);
+
+  if (layer_tree_impl()->tile_manager()) {
+    layer_tree_impl()->tile_manager()->UnregisterPictureLayerTilingSet(
+        id(), GetTree());
+  }
 }
 
 const char* PictureLayerImpl::LayerTypeAsString() const {
   return "cc::PictureLayerImpl";
 }
 
 scoped_ptr<LayerImpl> PictureLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return PictureLayerImpl::Create(tree_impl, id(), is_mask_,
                                   synced_scroll_offset());
@@ skipping 486 matching lines @@
         gfx::ScaleRect(tile->content_rect(), 1.f / tile->contents_scale());
     AddDamageRect(layer_damage_rect);
   }
 }
 
 void PictureLayerImpl::DidBeginTracing() {
   raster_source_->DidBeginTracing();
 }
 
 void PictureLayerImpl::ReleaseResources() {
-  // Recreate tilings with new settings, since some of those might change when
-  // we release resources.
+  if (layer_tree_impl()->tile_manager()) {

[enne (OOO), 2015/02/10 21:28:31]

When can you not have a TileManager during this call?

[vmpstr, 2015/02/11 21:37:16]

Several unittests aren't too happy without this if. I think the reason is that
we can call ReleaseResources/delete tile manager during InitializeRenderer, but
then fail to bind the surface to the client and early out. This means we never
RecreatedResources or create a new tile manager, but then later we try again to
set a new output surface, which would again call ReleaseResources (and crash
here).

TLDR: we can call ReleaseResources multiple times before calling
RecreateResources, depending on how smoothly everything goes in LTHI.

[enne (OOO), 2015/02/11 21:46:16]

Ok! Thanks for the explanation.

+    layer_tree_impl()->tile_manager()->UnregisterPictureLayerTilingSet(
+        id(), GetTree());
+  }
   tilings_ = nullptr;
   ResetRasterScale();
 }
 
 void PictureLayerImpl::RecreateResources() {
+  DCHECK(!tilings_);
+  DCHECK(layer_tree_impl()->tile_manager());
   tilings_ = CreatePictureLayerTilingSet();
+  layer_tree_impl()->tile_manager()->RegisterPictureLayerTilingSet(
+      id(), GetTree(), tilings_.get());
 
   // To avoid an edge case after lost context where the tree is up to date but
   // the tilings have not been managed, request an update draw properties
   // to force tilings to get managed.
   layer_tree_impl()->set_needs_update_draw_properties();
 }
 
 skia::RefPtr<SkPicture> PictureLayerImpl::GetPicture() {
   return raster_source_->GetFlattenedPicture();
 }
@@ skipping 611 matching lines @@
 
 bool PictureLayerImpl::IsOnActiveOrPendingTree() const {
   return !layer_tree_impl()->IsRecycleTree();
 }
 
 bool PictureLayerImpl::HasValidTilePriorities() const {
   return IsOnActiveOrPendingTree() && IsDrawnRenderSurfaceLayerListMember();
 }
 
 }  // namespace cc