Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2759)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/scrollbar_layer_unittest.cc

Issue 2322943003: cc: Move UI Resource management out of LayerTreeHost. (Closed)
Patch Set: virtual dtor Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/painted_scrollbar_layer_impl_unittest.cc ('k') | cc/layers/ui_resource_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/scrollbar_layer_unittest.cc
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index 54ff4223fd27d9144a781540d73fc9cf778fa552..c174acde3f819c42af201df9fff8ee5520e85d34 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -16,6 +16,7 @@
#include "cc/layers/solid_color_scrollbar_layer.h"
#include "cc/layers/solid_color_scrollbar_layer_impl.h"
#include "cc/quads/solid_color_draw_quad.h"
+#include "cc/resources/ui_resource_manager.h"
#include "cc/test/fake_impl_task_runner_provider.h"
#include "cc/test/fake_layer_tree_host.h"
#include "cc/test/fake_layer_tree_host_client.h"
@@ -42,17 +43,13 @@
namespace cc {
namespace {
-class FakeResourceTrackingLayerTreeHost : public FakeLayerTreeHost {
+class FakeResourceTrackingUIResourceManager : public UIResourceManager {
public:
- FakeResourceTrackingLayerTreeHost(FakeLayerTreeHostClient* client,
- LayerTreeHost::InitParams* params)
- : FakeLayerTreeHost(client, params, CompositorMode::SINGLE_THREADED),
- next_id_(1),
+ FakeResourceTrackingUIResourceManager()
+ : next_id_(1),
total_ui_resource_created_(0),
- total_ui_resource_deleted_(0) {
- InitializeSingleThreaded(&single_thread_client_,
- base::ThreadTaskRunnerHandle::Get(), nullptr);
- }
+ total_ui_resource_deleted_(0) {}
+ ~FakeResourceTrackingUIResourceManager() override = default;
UIResourceId CreateUIResource(UIResourceClient* content) override {
total_ui_resource_created_++;
@@ -120,8 +117,17 @@ class ScrollbarLayerTest : public testing::Test {
params.animation_host =
AnimationHost::CreateForTesting(ThreadInstance::MAIN);
- layer_tree_host_.reset(
- new FakeResourceTrackingLayerTreeHost(&fake_client_, &params));
+ std::unique_ptr<FakeResourceTrackingUIResourceManager>
+ fake_ui_resource_manager =
+ base::MakeUnique<FakeResourceTrackingUIResourceManager>();
+ fake_ui_resource_manager_ = fake_ui_resource_manager.get();
+
+ layer_tree_host_.reset(new FakeLayerTreeHost(
+ &fake_client_, &params, CompositorMode::SINGLE_THREADED));
+ layer_tree_host_->SetUIResourceManagerForTesting(
+ std::move(fake_ui_resource_manager));
+ layer_tree_host_->InitializeSingleThreaded(
+ &single_thread_client_, base::ThreadTaskRunnerHandle::Get(), nullptr);
layer_tree_ = layer_tree_host_->GetLayerTree();
layer_tree_host_->SetVisible(true);
fake_client_.SetLayerTreeHost(layer_tree_host_.get());
@@ -155,10 +161,12 @@ class ScrollbarLayerTest : public testing::Test {
}
protected:
+ FakeResourceTrackingUIResourceManager* fake_ui_resource_manager_;
FakeLayerTreeHostClient fake_client_;
+ StubLayerTreeHostSingleThreadClient single_thread_client_;
TestTaskGraphRunner task_graph_runner_;
LayerTreeSettings layer_tree_settings_;
- std::unique_ptr<FakeResourceTrackingLayerTreeHost> layer_tree_host_;
+ std::unique_ptr<FakeLayerTreeHost> layer_tree_host_;
LayerTree* layer_tree_;
int scrollbar_layer_id_;
};
@@ -780,9 +788,11 @@ class ScrollbarLayerTestResourceCreationAndRelease : public ScrollbarLayerTest {
scrollbar_layer->Update();
// A non-solid-color scrollbar should have requested two textures.
- EXPECT_EQ(expected_resources, layer_tree_host_->UIResourceCount());
- EXPECT_EQ(expected_created, layer_tree_host_->TotalUIResourceCreated());
- EXPECT_EQ(expected_deleted, layer_tree_host_->TotalUIResourceDeleted());
+ EXPECT_EQ(expected_resources, fake_ui_resource_manager_->UIResourceCount());
+ EXPECT_EQ(expected_created,
+ fake_ui_resource_manager_->TotalUIResourceCreated());
+ EXPECT_EQ(expected_deleted,
+ fake_ui_resource_manager_->TotalUIResourceDeleted());
testing::Mock::VerifyAndClearExpectations(layer_tree_host_.get());
}
@@ -841,9 +851,11 @@ TEST_F(ScrollbarLayerTestResourceCreationAndRelease, TestResourceUpdate) {
EXPECT_TRUE(scrollbar_layer->Update());
EXPECT_NE(0, scrollbar_layer->track_resource_id());
EXPECT_NE(0, scrollbar_layer->thumb_resource_id());
- EXPECT_EQ(resource_count, layer_tree_host_->UIResourceCount());
- EXPECT_EQ(expected_created, layer_tree_host_->TotalUIResourceCreated());
- EXPECT_EQ(expected_deleted, layer_tree_host_->TotalUIResourceDeleted());
+ EXPECT_EQ(resource_count, fake_ui_resource_manager_->UIResourceCount());
+ EXPECT_EQ(expected_created,
+ fake_ui_resource_manager_->TotalUIResourceCreated());
+ EXPECT_EQ(expected_deleted,
+ fake_ui_resource_manager_->TotalUIResourceDeleted());
resource_count = 0;
expected_created = 2;
@@ -853,9 +865,11 @@ TEST_F(ScrollbarLayerTestResourceCreationAndRelease, TestResourceUpdate) {
EXPECT_TRUE(scrollbar_layer->Update());
EXPECT_EQ(0, scrollbar_layer->track_resource_id());
EXPECT_EQ(0, scrollbar_layer->thumb_resource_id());
- EXPECT_EQ(resource_count, layer_tree_host_->UIResourceCount());
- EXPECT_EQ(expected_created, layer_tree_host_->TotalUIResourceCreated());
- EXPECT_EQ(expected_deleted, layer_tree_host_->TotalUIResourceDeleted());
+ EXPECT_EQ(resource_count, fake_ui_resource_manager_->UIResourceCount());
+ EXPECT_EQ(expected_created,
+ fake_ui_resource_manager_->TotalUIResourceCreated());
+ EXPECT_EQ(expected_deleted,
+ fake_ui_resource_manager_->TotalUIResourceDeleted());
resource_count = 0;
expected_created = 2;
@@ -864,9 +878,11 @@ TEST_F(ScrollbarLayerTestResourceCreationAndRelease, TestResourceUpdate) {
EXPECT_FALSE(scrollbar_layer->Update());
EXPECT_EQ(0, scrollbar_layer->track_resource_id());
EXPECT_EQ(0, scrollbar_layer->thumb_resource_id());
- EXPECT_EQ(resource_count, layer_tree_host_->UIResourceCount());
- EXPECT_EQ(expected_created, layer_tree_host_->TotalUIResourceCreated());
- EXPECT_EQ(expected_deleted, layer_tree_host_->TotalUIResourceDeleted());
+ EXPECT_EQ(resource_count, fake_ui_resource_manager_->UIResourceCount());
+ EXPECT_EQ(expected_created,
+ fake_ui_resource_manager_->TotalUIResourceCreated());
+ EXPECT_EQ(expected_deleted,
+ fake_ui_resource_manager_->TotalUIResourceDeleted());
resource_count = 2;
expected_created = 4;
@@ -876,9 +892,11 @@ TEST_F(ScrollbarLayerTestResourceCreationAndRelease, TestResourceUpdate) {
EXPECT_TRUE(scrollbar_layer->Update());
EXPECT_NE(0, scrollbar_layer->track_resource_id());
EXPECT_NE(0, scrollbar_layer->thumb_resource_id());
- EXPECT_EQ(resource_count, layer_tree_host_->UIResourceCount());
- EXPECT_EQ(expected_created, layer_tree_host_->TotalUIResourceCreated());
- EXPECT_EQ(expected_deleted, layer_tree_host_->TotalUIResourceDeleted());
+ EXPECT_EQ(resource_count, fake_ui_resource_manager_->UIResourceCount());
+ EXPECT_EQ(expected_created,
+ fake_ui_resource_manager_->TotalUIResourceCreated());
+ EXPECT_EQ(expected_deleted,
+ fake_ui_resource_manager_->TotalUIResourceDeleted());
resource_count = 1;
expected_created = 5;
@@ -887,9 +905,11 @@ TEST_F(ScrollbarLayerTestResourceCreationAndRelease, TestResourceUpdate) {
EXPECT_TRUE(scrollbar_layer->Update());
EXPECT_NE(0, scrollbar_layer->track_resource_id());
EXPECT_EQ(0, scrollbar_layer->thumb_resource_id());
- EXPECT_EQ(resource_count, layer_tree_host_->UIResourceCount());
- EXPECT_EQ(expected_created, layer_tree_host_->TotalUIResourceCreated());
- EXPECT_EQ(expected_deleted, layer_tree_host_->TotalUIResourceDeleted());
+ EXPECT_EQ(resource_count, fake_ui_resource_manager_->UIResourceCount());
+ EXPECT_EQ(expected_created,
+ fake_ui_resource_manager_->TotalUIResourceCreated());
+ EXPECT_EQ(expected_deleted,
+ fake_ui_resource_manager_->TotalUIResourceDeleted());
resource_count = 0;
expected_created = 5;
@@ -899,9 +919,11 @@ TEST_F(ScrollbarLayerTestResourceCreationAndRelease, TestResourceUpdate) {
EXPECT_TRUE(scrollbar_layer->Update());
EXPECT_EQ(0, scrollbar_layer->track_resource_id());
EXPECT_EQ(0, scrollbar_layer->thumb_resource_id());
- EXPECT_EQ(resource_count, layer_tree_host_->UIResourceCount());
- EXPECT_EQ(expected_created, layer_tree_host_->TotalUIResourceCreated());
- EXPECT_EQ(expected_deleted, layer_tree_host_->TotalUIResourceDeleted());
+ EXPECT_EQ(resource_count, fake_ui_resource_manager_->UIResourceCount());
+ EXPECT_EQ(expected_created,
+ fake_ui_resource_manager_->TotalUIResourceCreated());
+ EXPECT_EQ(expected_deleted,
+ fake_ui_resource_manager_->TotalUIResourceDeleted());
resource_count = 2;
expected_created = 7;
@@ -920,9 +942,11 @@ TEST_F(ScrollbarLayerTestResourceCreationAndRelease, TestResourceUpdate) {
EXPECT_TRUE(scrollbar_layer->Update());
EXPECT_NE(0, scrollbar_layer->track_resource_id());
EXPECT_NE(0, scrollbar_layer->thumb_resource_id());
- EXPECT_EQ(resource_count, layer_tree_host_->UIResourceCount());
- EXPECT_EQ(expected_created, layer_tree_host_->TotalUIResourceCreated());
- EXPECT_EQ(expected_deleted, layer_tree_host_->TotalUIResourceDeleted());
+ EXPECT_EQ(resource_count, fake_ui_resource_manager_->UIResourceCount());
+ EXPECT_EQ(expected_created,
+ fake_ui_resource_manager_->TotalUIResourceCreated());
+ EXPECT_EQ(expected_deleted,
+ fake_ui_resource_manager_->TotalUIResourceDeleted());
resource_count = 1;
expected_created = 10;
@@ -931,20 +955,23 @@ TEST_F(ScrollbarLayerTestResourceCreationAndRelease, TestResourceUpdate) {
scrollbar_layer->fake_scrollbar()->set_has_thumb(false);
scrollbar_layer->SetBounds(gfx::Size(90, 15));
EXPECT_TRUE(scrollbar_layer->Update());
- EXPECT_EQ(resource_count, layer_tree_host_->UIResourceCount());
- EXPECT_EQ(expected_created, layer_tree_host_->TotalUIResourceCreated());
- EXPECT_EQ(expected_deleted, layer_tree_host_->TotalUIResourceDeleted());
- EXPECT_EQ(
- gfx::Size(90, 15),
- layer_tree_host_->ui_resource_size(scrollbar_layer->track_resource_id()));
+ EXPECT_EQ(resource_count, fake_ui_resource_manager_->UIResourceCount());
+ EXPECT_EQ(expected_created,
+ fake_ui_resource_manager_->TotalUIResourceCreated());
+ EXPECT_EQ(expected_deleted,
+ fake_ui_resource_manager_->TotalUIResourceDeleted());
+ EXPECT_EQ(gfx::Size(90, 15), fake_ui_resource_manager_->ui_resource_size(
+ scrollbar_layer->track_resource_id()));
scrollbar_layer->ResetNeedsDisplayForTesting();
EXPECT_FALSE(scrollbar_layer->Update());
EXPECT_NE(0, scrollbar_layer->track_resource_id());
EXPECT_EQ(0, scrollbar_layer->thumb_resource_id());
- EXPECT_EQ(resource_count, layer_tree_host_->UIResourceCount());
- EXPECT_EQ(expected_created, layer_tree_host_->TotalUIResourceCreated());
- EXPECT_EQ(expected_deleted, layer_tree_host_->TotalUIResourceDeleted());
+ EXPECT_EQ(resource_count, fake_ui_resource_manager_->UIResourceCount());
+ EXPECT_EQ(expected_created,
+ fake_ui_resource_manager_->TotalUIResourceCreated());
+ EXPECT_EQ(expected_deleted,
+ fake_ui_resource_manager_->TotalUIResourceDeleted());
testing::Mock::VerifyAndClearExpectations(layer_tree_host_.get());
}
@@ -981,9 +1008,9 @@ class ScaledScrollbarLayerTestResourceCreation : public ScrollbarLayerTest {
// Verify that we have not generated any content uploads that are larger
// than their destination textures.
- gfx::Size track_size = layer_tree_host_->ui_resource_size(
+ gfx::Size track_size = fake_ui_resource_manager_->ui_resource_size(
scrollbar_layer->track_resource_id());
- gfx::Size thumb_size = layer_tree_host_->ui_resource_size(
+ gfx::Size thumb_size = fake_ui_resource_manager_->ui_resource_size(
scrollbar_layer->thumb_resource_id());
EXPECT_LE(track_size.width(),
@@ -1044,7 +1071,7 @@ class ScaledScrollbarLayerTestScaledRasterization : public ScrollbarLayerTest {
scrollbar_layer->Update();
- UIResourceBitmap* bitmap = layer_tree_host_->ui_resource_bitmap(
+ UIResourceBitmap* bitmap = fake_ui_resource_manager_->ui_resource_bitmap(
scrollbar_layer->track_resource_id());
DCHECK(bitmap);
« no previous file with comments | « cc/layers/painted_scrollbar_layer_impl_unittest.cc ('k') | cc/layers/ui_resource_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698