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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 2322943003: cc: Move UI Resource management out of LayerTreeHost. (Closed)
Patch Set: format 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
Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index e2e67b8067ba7ffe28658436310a0d29f498d70f..72733086bf4b77f690a88e203ecd588e9ce78209 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -33,6 +33,7 @@
#include "cc/quads/draw_quad.h"
#include "cc/quads/render_pass_draw_quad.h"
#include "cc/quads/tile_draw_quad.h"
+#include "cc/resources/ui_resource_manager.h"
#include "cc/test/fake_content_layer_client.h"
#include "cc/test/fake_layer_tree_host_client.h"
#include "cc/test/fake_output_surface.h"
@@ -3015,12 +3016,14 @@ class LayerTreeHostTestUIResource : public LayerTreeHostTest {
// Usually ScopedUIResource are deleted from the manager in their
// destructor. Here we just want to test that a direct call to
// DeleteUIResource works.
- layer_tree_host()->DeleteUIResource(ui_resources_[0]->id());
+ layer_tree_host()->GetUIResourceManager()->DeleteUIResource(
+ ui_resources_[0]->id());
PostSetNeedsCommitToMainThread();
break;
case 3:
// DeleteUIResource can be called with an invalid id.
- layer_tree_host()->DeleteUIResource(ui_resources_[0]->id());
+ layer_tree_host()->GetUIResourceManager()->DeleteUIResource(
+ ui_resources_[0]->id());
PostSetNeedsCommitToMainThread();
break;
case 4:
@@ -3077,7 +3080,7 @@ class LayerTreeHostTestUIResource : public LayerTreeHostTest {
void CreateResource() {
ui_resources_[num_ui_resources_++] =
- FakeScopedUIResource::Create(layer_tree_host());
+ FakeScopedUIResource::Create(layer_tree_host()->GetUIResourceManager());
}
std::unique_ptr<FakeScopedUIResource> ui_resources_[5];
@@ -5009,7 +5012,8 @@ class LayerTreeHostTestHighResRequiredAfterEvictingUIResources
protected:
void SetupTree() override {
LayerTreeHostTest::SetupTree();
- ui_resource_ = FakeScopedUIResource::Create(layer_tree_host());
+ ui_resource_ =
+ FakeScopedUIResource::Create(layer_tree_host()->GetUIResourceManager());
client_.set_bounds(layer_tree()->root_layer()->bounds());
}

Powered by Google App Engine
This is Rietveld 408576698