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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 1024633002: cc: Keep tilings texture size in sync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address vmp's comments Created 5 years, 9 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 68a1f587aa68dfaec95c50d9588beda55e2a9ac7..aaa71fa706e7b3972ecab24690a596e7366035fb 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -475,6 +475,86 @@ class LayerTreeHostTestSetNeedsRedrawRect : public LayerTreeHostTest {
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestSetNeedsRedrawRect);
+// Ensure the texture size of the pending and active trees are identical when a
+// layer is not in the viewport and a resize happens on the viewport
+class LayerTreeHostTestGpuRasterDeviceSizeChanged : public LayerTreeHostTest {
+ public:
+ LayerTreeHostTestGpuRasterDeviceSizeChanged()
+ : num_draws_(0), bounds_(500, 64), invalid_rect_(10, 10, 20, 20) {}
+
+ void BeginTest() override {
+ client_.set_fill_with_nonsolid_color(true);
+ root_layer_ = FakePictureLayer::Create(&client_);
+ root_layer_->SetIsDrawable(true);
+ gfx::Transform transform;
+ // Translate the layer out of the viewport to force it to not update its
+ // tile size via PushProperties.
+ transform.Translate(10000.0, 10000.0);
+ root_layer_->SetTransform(transform);
+ root_layer_->SetBounds(bounds_);
+ layer_tree_host()->SetRootLayer(root_layer_);
+ layer_tree_host()->SetViewportSize(bounds_);
+
+ PostSetNeedsCommitToMainThread();
+ }
+
+ void InitializeSettings(LayerTreeSettings* settings) override {
+ settings->gpu_rasterization_enabled = true;
+ settings->gpu_rasterization_forced = true;
+ }
+
+ void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
+ // Perform 2 commits.
+ if (!num_draws_) {
+ PostSetNeedsRedrawRectToMainThread(invalid_rect_);
+ } else {
+ EndTest();
+ }
+ num_draws_++;
+ }
+
+ void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
+ if (num_draws_ == 2) {
+ auto pending_tree = host_impl->pending_tree();
+ auto pending_layer_impl =
+ static_cast<FakePictureLayerImpl*>(pending_tree->root_layer());
+ EXPECT_NE(pending_layer_impl, nullptr);
+
+ auto active_tree = host_impl->pending_tree();
+ auto active_layer_impl =
+ static_cast<FakePictureLayerImpl*>(active_tree->root_layer());
+ EXPECT_NE(pending_layer_impl, nullptr);
+
+ auto active_tiling_set = active_layer_impl->picture_layer_tiling_set();
+ auto active_tiling = active_tiling_set->tiling_at(0);
+ auto pending_tiling_set = pending_layer_impl->picture_layer_tiling_set();
+ auto pending_tiling = pending_tiling_set->tiling_at(0);
+ EXPECT_EQ(
+ pending_tiling->TilingDataForTesting().max_texture_size().width(),
+ active_tiling->TilingDataForTesting().max_texture_size().width());
+ }
+ }
+
+ void DidCommitAndDrawFrame() override {
+ // On the second commit, resize the viewport.
+ if (num_draws_ == 1) {
+ layer_tree_host()->SetViewportSize(gfx::Size(400, 64));
+ }
+ }
+
+ void AfterTest() override {}
+
+ private:
+ int num_draws_;
+ const gfx::Size bounds_;
+ const gfx::Rect invalid_rect_;
+ FakeContentLayerClient client_;
+ scoped_refptr<FakePictureLayer> root_layer_;
+};
+
+SINGLE_AND_MULTI_THREAD_IMPL_TEST_F(
+ LayerTreeHostTestGpuRasterDeviceSizeChanged);
+
class LayerTreeHostTestNoExtraCommitFromInvalidate : public LayerTreeHostTest {
public:
void InitializeSettings(LayerTreeSettings* settings) override {
« cc/layers/picture_layer_impl.h ('K') | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698