Partial raster for GPU

cc/tiles/tile_manager_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 <stddef.h>
 #include <stdint.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 1313 matching lines @@
   EXPECT_FALSE(host_impl()->is_likely_to_require_a_draw());
   host_impl()->tile_manager()->PrepareTiles(host_impl()->global_tile_state());
   EXPECT_TRUE(host_impl()->is_likely_to_require_a_draw());
 
   Resource* resource = host_impl()->resource_pool()->AcquireResource(
       gfx::Size(256, 256), RGBA_8888);
 
   host_impl()->tile_manager()->CheckIfMoreTilesNeedToBePreparedForTesting();
   EXPECT_FALSE(host_impl()->is_likely_to_require_a_draw());
 
-  host_impl()->resource_pool()->ReleaseResource(resource, 0);
+  host_impl()->resource_pool()->ReleaseResource(resource);
 }
 
 TEST_F(TileManagerTilePriorityQueueTest, DefaultMemoryPolicy) {
   const gfx::Size layer_bounds(1000, 1000);
   host_impl()->SetViewportSize(layer_bounds);
   SetupDefaultTrees(layer_bounds);
 
   host_impl()->tile_manager()->PrepareTiles(host_impl()->global_tile_state());
 
   // 64MB is the default mem limit.
@@ skipping 431 matching lines @@
   EXPECT_FALSE(queue->IsEmpty());
   queue->Top().tile()->SetInvalidated(gfx::Rect(), kInvalidatedId);
 
   // PrepareTiles to schedule tasks. Due to the FakeTileTaskManagerImpl,
   // these tasks will immediately be canceled.
   host_impl()->tile_manager()->PrepareTiles(host_impl()->global_tile_state());
 
   // Make sure that the tile we invalidated above was not returned to the pool
   // with its invalidated resource ID.
   host_impl()->resource_pool()->CheckBusyResources();
-  EXPECT_FALSE(host_impl()->resource_pool()->TryAcquireResourceWithContentId(
-      kInvalidatedId));
+  gfx::Rect total_invalidated_rect;
+  EXPECT_FALSE(host_impl()->resource_pool()->TryAcquireResourceForPartialRaster(
+      kInvalidatedId + 1, gfx::Rect(), kInvalidatedId,
+      &total_invalidated_rect));
+  EXPECT_EQ(gfx::Rect(), total_invalidated_rect);
 
   // Free our host_impl_ before the tile_task_manager we passed it, as it
   // will use that class in clean up.
   TakeHostImpl();
 }
 
 // FakeRasterBufferProviderImpl that verifies the resource content ID of raster
 // tasks.
 class VerifyResourceContentIdRasterBufferProvider
     : public FakeRasterBufferProviderImpl {
@@ skipping 31 matching lines @@
   // raster task we see is created with |kExpectedId|.
   FakeTileTaskManagerImpl tile_task_manager;
   host_impl->tile_manager()->SetTileTaskManagerForTesting(&tile_task_manager);
 
   VerifyResourceContentIdRasterBufferProvider raster_buffer_provider(
       kExpectedId);
   host_impl->tile_manager()->SetRasterBufferProviderForTesting(
       &raster_buffer_provider);
 
   // Ensure there's a resource with our |kInvalidatedId| in the resource pool.
-  host_impl->resource_pool()->ReleaseResource(
-      host_impl->resource_pool()->AcquireResource(kTileSize, RGBA_8888),
-      kInvalidatedId);
+  auto* resource =
+      host_impl->resource_pool()->AcquireResource(kTileSize, RGBA_8888);
+  host_impl->resource_pool()->OnContentReplaced(resource->id(), kInvalidatedId);
+  host_impl->resource_pool()->ReleaseResource(resource);
   host_impl->resource_pool()->CheckBusyResources();
 
   scoped_refptr<FakeRasterSource> pending_raster_source =
       FakeRasterSource::CreateFilled(kTileSize);
   host_impl->CreatePendingTree();
   LayerTreeImpl* pending_tree = host_impl->pending_tree();
 
   // Steal from the recycled tree.
   std::unique_ptr<FakePictureLayerImpl> pending_layer =
       FakePictureLayerImpl::CreateWithRasterSource(pending_tree, kLayerId,
@@ skipping 32 matching lines @@
 }
 
 // Ensures that the tile manager does not attempt to reuse tiles when partial
 // raster is disabled.
 TEST_F(TileManagerTest, PartialRasterSuccessfullyDisabled) {
   RunPartialRasterCheck(TakeHostImpl(), false /* partial_raster_enabled */);
 }
 
 }  // namespace
 }  // namespace cc