Don't free non-tile resources on GPU rasterization toggle

cc/layers/picture_layer_impl_unittest.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/layers/picture_layer_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 214 matching lines @@
         animating_transform);
 
     SetupDrawPropertiesAndUpdateTiles(
         active_layer(), contents_scale, device_scale_factor, page_scale_factor,
         maximum_animation_contents_scale, starting_animation_contents_scale,
         animating_transform);
   }
 
   void ResetTilingsAndRasterScales() {
     if (pending_layer()) {
-      pending_layer()->ReleaseResources();
+      pending_layer()->ReleaseTileResources();
       EXPECT_FALSE(pending_layer()->tilings());
-      pending_layer()->RecreateResources();
+      pending_layer()->RecreateTileResources();
       EXPECT_EQ(0u, pending_layer()->tilings()->num_tilings());
     }
 
     if (active_layer()) {
-      active_layer()->ReleaseResources();
+      active_layer()->ReleaseTileResources();
       EXPECT_FALSE(active_layer()->tilings());
-      active_layer()->RecreateResources();
+      active_layer()->RecreateTileResources();
       EXPECT_EQ(0u, active_layer()->tilings()->num_tilings());
     }
   }
 
   size_t NumberOfTilesRequired(PictureLayerTiling* tiling) {
     size_t num_required = 0;
     std::vector<Tile*> tiles = tiling->AllTilesForTesting();
     for (size_t i = 0; i < tiles.size(); ++i) {
       if (tiles[i]->required_for_activation())
         num_required++;
@@ skipping 327 matching lines @@
   }
 }
 
 TEST_F(PictureLayerImplTest, UpdateTilesCreatesTilings) {
   gfx::Size layer_bounds(1300, 1900);
   SetupDefaultTrees(layer_bounds);
 
   float low_res_factor = host_impl()->settings().low_res_contents_scale_factor;
   EXPECT_LT(low_res_factor, 1.f);
 
-  active_layer()->ReleaseResources();
+  active_layer()->ReleaseTileResources();
   EXPECT_FALSE(active_layer()->tilings());
-  active_layer()->RecreateResources();
+  active_layer()->RecreateTileResources();
   EXPECT_EQ(0u, active_layer()->tilings()->num_tilings());
 
   SetupDrawPropertiesAndUpdateTiles(active_layer(),
                                     6.f,  // ideal contents scale
                                     3.f,  // device scale
                                     2.f,  // page scale
                                     1.f,  // maximum animation scale
                                     0.f,  // starting animation scale
                                     false);
   ASSERT_EQ(2u, active_layer()->tilings()->num_tilings());
@@ skipping 46 matching lines @@
                   active_layer()->tilings()->tiling_at(3)->contents_scale());
 }
 
 TEST_F(PictureLayerImplTest, PendingLayerOnlyHasHighResTiling) {
   gfx::Size layer_bounds(1300, 1900);
   SetupDefaultTrees(layer_bounds);
 
   float low_res_factor = host_impl()->settings().low_res_contents_scale_factor;
   EXPECT_LT(low_res_factor, 1.f);
 
-  pending_layer()->ReleaseResources();
+  pending_layer()->ReleaseTileResources();
   EXPECT_FALSE(pending_layer()->tilings());
-  pending_layer()->RecreateResources();
+  pending_layer()->RecreateTileResources();
   EXPECT_EQ(0u, pending_layer()->tilings()->num_tilings());
 
   SetupDrawPropertiesAndUpdateTiles(pending_layer(),
                                     6.f,  // ideal contents scale
                                     3.f,  // device scale
                                     2.f,  // page scale
                                     1.f,  // maximum animation scale
                                     0.f,  // starting animation scale
                                     false);
   ASSERT_EQ(1u, pending_layer()->tilings()->num_tilings());
@@ skipping 533 matching lines @@
   mask->SetDrawsContent(true);
   pending_layer()->test_properties()->SetMaskLayer(std::move(mask));
   pending_layer()->SetHasRenderSurface(true);
   RebuildPropertyTreesOnPendingTree();
   host_impl()->pending_tree()->UpdateDrawProperties(false);
 
   FakePictureLayerImpl* mask_raw = static_cast<FakePictureLayerImpl*>(
       pending_layer()->test_properties()->mask_layer);
   // We did an UpdateDrawProperties above, which will set a contents scale on
   // the mask layer, so allow us to reset the contents scale.
-  mask_raw->ReleaseResources();
-  mask_raw->RecreateResources();
+  mask_raw->ReleaseTileResources();
+  mask_raw->RecreateTileResources();
 
   SetupDrawPropertiesAndUpdateTiles(
       mask_raw, contents_scale, device_scale, page_scale,
       maximum_animation_scale, starting_animation_scale, animating_transform);
   EXPECT_EQ(mask_raw->HighResTiling()->contents_scale(), contents_scale);
   EXPECT_EQ(mask_raw->num_tilings(), 1u);
 }
 
 TEST_F(PictureLayerImplTest, HugeMasksGetScaledDown) {
   host_impl()->AdvanceToNextFrame(base::TimeDelta::FromMilliseconds(1));
@@ skipping 34 matching lines @@
   // Mask layers have a tiling with a single tile in it.
   EXPECT_EQ(1u, active_mask->HighResTiling()->AllTilesForTesting().size());
   // The mask resource exists.
   ResourceId mask_resource_id;
   gfx::Size mask_texture_size;
   active_mask->GetContentsResourceId(&mask_resource_id, &mask_texture_size);
   EXPECT_NE(0u, mask_resource_id);
   EXPECT_EQ(active_mask->bounds(), mask_texture_size);
 
   // Drop resources and recreate them, still the same.
-  pending_mask->ReleaseResources();
-  active_mask->ReleaseResources();
-  pending_mask->RecreateResources();
-  active_mask->RecreateResources();
+  pending_mask->ReleaseTileResources();
+  active_mask->ReleaseTileResources();
+  pending_mask->RecreateTileResources();
+  active_mask->RecreateTileResources();
   SetupDrawPropertiesAndUpdateTiles(active_mask, 1.f, 1.f, 1.f, 1.f, 0.f,
                                     false);
   active_mask->HighResTiling()->CreateAllTilesForTesting();
   EXPECT_EQ(1u, active_mask->HighResTiling()->AllTilesForTesting().size());
   EXPECT_NE(0u, mask_resource_id);
   EXPECT_EQ(active_mask->bounds(), mask_texture_size);
 
   // Resize larger than the max texture size.
   int max_texture_size = host_impl()->resource_provider()->max_texture_size();
   gfx::Size huge_bounds(max_texture_size + 1, 10);
@@ skipping 19 matching lines @@
   // Mask layers have a tiling with a single tile in it.
   EXPECT_EQ(1u, active_mask->HighResTiling()->AllTilesForTesting().size());
   // The mask resource exists.
   active_mask->GetContentsResourceId(&mask_resource_id, &mask_texture_size);
   EXPECT_NE(0u, mask_resource_id);
   gfx::Size expected_size = active_mask->bounds();
   expected_size.SetToMin(gfx::Size(max_texture_size, max_texture_size));
   EXPECT_EQ(expected_size, mask_texture_size);
 
   // Drop resources and recreate them, still the same.
-  pending_mask->ReleaseResources();
-  active_mask->ReleaseResources();
-  pending_mask->RecreateResources();
-  active_mask->RecreateResources();
+  pending_mask->ReleaseTileResources();
+  active_mask->ReleaseTileResources();
+  pending_mask->RecreateTileResources();
+  active_mask->RecreateTileResources();
   SetupDrawPropertiesAndUpdateTiles(active_mask, 1.f, 1.f, 1.f, 1.f, 0.f,
                                     false);
   active_mask->HighResTiling()->CreateAllTilesForTesting();
   EXPECT_EQ(1u, active_mask->HighResTiling()->AllTilesForTesting().size());
   EXPECT_NE(0u, mask_resource_id);
   EXPECT_EQ(expected_size, mask_texture_size);
 
   // Do another activate, the same holds.
   SetupPendingTree(huge_raster_source);
   ActivateTree();
@@ skipping 65 matching lines @@
   // The mask resource exists.
   ResourceId mask_resource_id;
   gfx::Size mask_texture_size;
   active_mask->GetContentsResourceId(&mask_resource_id, &mask_texture_size);
   EXPECT_NE(0u, mask_resource_id);
   gfx::Size expected_mask_texture_size =
       gfx::ScaleToCeiledSize(active_mask->bounds(), 1.3f);
   EXPECT_EQ(mask_texture_size, expected_mask_texture_size);
 }
 
-TEST_F(PictureLayerImplTest, ReleaseResources) {
+TEST_F(PictureLayerImplTest, ReleaseTileResources) {
   gfx::Size layer_bounds(1300, 1900);
   SetupDefaultTrees(layer_bounds);
   EXPECT_EQ(1u, pending_layer()->tilings()->num_tilings());
 
   // All tilings should be removed when losing output surface.
-  active_layer()->ReleaseResources();
+  active_layer()->ReleaseTileResources();
   EXPECT_FALSE(active_layer()->tilings());
-  active_layer()->RecreateResources();
+  active_layer()->RecreateTileResources();
   EXPECT_EQ(0u, active_layer()->tilings()->num_tilings());
-  pending_layer()->ReleaseResources();
+  pending_layer()->ReleaseTileResources();
   EXPECT_FALSE(pending_layer()->tilings());
-  pending_layer()->RecreateResources();
+  pending_layer()->RecreateTileResources();
   EXPECT_EQ(0u, pending_layer()->tilings()->num_tilings());
 
   // This should create new tilings.
   SetupDrawPropertiesAndUpdateTiles(pending_layer(),
                                     1.f,  // ideal contents scale
                                     1.f,  // device scale
                                     1.f,  // page scale
                                     1.f,  // maximum animation scale
                                     0.f,  // starting animation_scale
                                     false);
   EXPECT_EQ(1u, pending_layer()->tilings()->num_tilings());
 }
 
+// ReleaseResources should behave identically to ReleaseTileResources.
+TEST_F(PictureLayerImplTest, ReleaseResources) {
+  gfx::Size layer_bounds(1300, 1900);
+  SetupDefaultTrees(layer_bounds);
+  EXPECT_EQ(1u, pending_layer()->tilings()->num_tilings());
+
+  // All tilings should be removed when losing output surface.
+  active_layer()->ReleaseResources();
+  EXPECT_FALSE(active_layer()->tilings());
+  active_layer()->RecreateTileResources();
+  EXPECT_EQ(0u, active_layer()->tilings()->num_tilings());
+  pending_layer()->ReleaseResources();
+  EXPECT_FALSE(pending_layer()->tilings());
+  pending_layer()->RecreateTileResources();
+  EXPECT_EQ(0u, pending_layer()->tilings()->num_tilings());
+}
+
 TEST_F(PictureLayerImplTest, ClampTilesToMaxTileSize) {
   gfx::Size layer_bounds(5000, 5000);
 
   scoped_refptr<FakeRasterSource> pending_raster_source =
       FakeRasterSource::CreateFilled(layer_bounds);
 
   SetupPendingTree(pending_raster_source);
   EXPECT_GE(pending_layer()->tilings()->num_tilings(), 1u);
 
   pending_layer()->tilings()->tiling_at(0)->CreateAllTilesForTesting();
@@ skipping 885 matching lines @@
   scoped_refptr<FakeRasterSource> active_raster_source =
       FakeRasterSource::CreateFilled(layer_bounds);
 
   SetupTrees(pending_raster_source, active_raster_source);
 
   EXPECT_TRUE(pending_layer()->tilings()->FindTilingWithScale(1.f));
   EXPECT_TRUE(active_layer()->tilings()->FindTilingWithScale(1.f));
 
   // Gpu rasterization is disabled by default.
   EXPECT_FALSE(host_impl()->use_gpu_rasterization());
+  EXPECT_EQ(0u, pending_layer()->release_tile_resources_count());
+  EXPECT_EQ(0u, active_layer()->release_tile_resources_count());
   EXPECT_EQ(0u, pending_layer()->release_resources_count());
   EXPECT_EQ(0u, active_layer()->release_resources_count());
   // Toggling the gpu rasterization clears all tilings on both trees.
   host_impl()->SetHasGpuRasterizationTrigger(true);
   host_impl()->SetContentIsSuitableForGpuRasterization(true);
   host_impl()->CommitComplete();
+  EXPECT_EQ(1u, pending_layer()->release_tile_resources_count());
+  EXPECT_EQ(1u, active_layer()->release_tile_resources_count());
   EXPECT_EQ(1u, pending_layer()->release_resources_count());
   EXPECT_EQ(1u, active_layer()->release_resources_count());
 
   // But the pending layer gets a tiling back, and can activate it.
   EXPECT_TRUE(pending_layer()->tilings()->FindTilingWithScale(1.f));
   EXPECT_EQ(0u, active_layer()->tilings()->num_tilings());
 
   ActivateTree();
   EXPECT_TRUE(active_layer()->tilings()->FindTilingWithScale(1.f));
 
   SetupPendingTree(pending_raster_source);
   EXPECT_TRUE(pending_layer()->tilings()->FindTilingWithScale(1.f));
 
   // Toggling the gpu rasterization clears all tilings on both trees.
   EXPECT_TRUE(host_impl()->use_gpu_rasterization());
   host_impl()->SetHasGpuRasterizationTrigger(false);
   host_impl()->CommitComplete();
   EXPECT_EQ(GpuRasterizationStatus::OFF_VIEWPORT,
             host_impl()->gpu_rasterization_status());
+  EXPECT_EQ(2u, pending_layer()->release_tile_resources_count());
+  EXPECT_EQ(2u, active_layer()->release_tile_resources_count());
   EXPECT_EQ(2u, pending_layer()->release_resources_count());
   EXPECT_EQ(2u, active_layer()->release_resources_count());
 
   host_impl()->SetHasGpuRasterizationTrigger(true);
   host_impl()->SetContentIsSuitableForGpuRasterization(false);
   host_impl()->CommitComplete();
   EXPECT_EQ(GpuRasterizationStatus::OFF_CONTENT,
             host_impl()->gpu_rasterization_status());
 }
 
@@ skipping 1142 matching lines @@
   active_layer()->CleanUpTilingsOnActiveLayer(used_tilings);
   ASSERT_EQ(2u, active_layer()->tilings()->num_tilings());
 
   // If we remove it from our used tilings set, it is outside the range to keep
   // so it is deleted.
   used_tilings.clear();
   active_layer()->CleanUpTilingsOnActiveLayer(used_tilings);
   ASSERT_EQ(1u, active_layer()->tilings()->num_tilings());
 }
 
-TEST_F(NoLowResPictureLayerImplTest, ReleaseResources) {
+TEST_F(NoLowResPictureLayerImplTest, ReleaseTileResources) {
   gfx::Size layer_bounds(1300, 1900);
   SetupDefaultTrees(layer_bounds);
   EXPECT_EQ(1u, pending_layer()->tilings()->num_tilings());
   EXPECT_EQ(1u, active_layer()->tilings()->num_tilings());
 
   // All tilings should be removed when losing output surface.
-  active_layer()->ReleaseResources();
+  active_layer()->ReleaseTileResources();
   EXPECT_FALSE(active_layer()->tilings());
-  active_layer()->RecreateResources();
+  active_layer()->RecreateTileResources();
   EXPECT_EQ(0u, active_layer()->tilings()->num_tilings());
-  pending_layer()->ReleaseResources();
+  pending_layer()->ReleaseTileResources();
   EXPECT_FALSE(pending_layer()->tilings());
-  pending_layer()->RecreateResources();
+  pending_layer()->RecreateTileResources();
   EXPECT_EQ(0u, pending_layer()->tilings()->num_tilings());
 
   // This should create new tilings.
   SetupDrawPropertiesAndUpdateTiles(pending_layer(),
                                     1.3f,  // ideal contents scale
                                     2.7f,  // device scale
                                     3.2f,  // page scale
                                     1.f,   // maximum animation scale
                                     0.f,   // starting animation scale
                                     false);
@@ skipping 1425 matching lines @@
     EXPECT_FLOAT_EQ(expected_contents_scale,
                     pending_layer_ptr->picture_layer_tiling_set()
                         ->FindTilingWithResolution(HIGH_RESOLUTION)
                         ->contents_scale())
         << "ideal_contents_scale: " << ideal_contents_scale;
   }
 }
 
 }  // namespace
 }  // namespace cc