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

Unified Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_host_pixeltest_masks.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 8e7fa0f27a9b2b056c3959fe182f2ffa54faf263..7d39b9dda5f5dcbb3c17e9b3538a013f65f9eff4 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -2370,28 +2370,6 @@ class LayerTreeHostImplTopControlsTest : public LayerTreeHostImplTest {
LayerTreeSettings settings_;
}; // class LayerTreeHostImplTopControlsTest
-TEST_F(LayerTreeHostImplTopControlsTest,
- TopControlsDeltaOnlySentWithRootLayer) {
- CreateHostImpl(settings_, CreateOutputSurface());
-
- host_impl_->active_tree()->set_top_controls_delta(-20.f);
-
- // Because LTH::ApplyScrollAndScale doesn't know what to do with a scroll
- // delta packet when the root layer doesn't exist yet, make sure not to set
- // sent_top_controls_delta either to avoid the delta getting clobbered on the
- // next commit.
- scoped_ptr<ScrollAndScaleSet> scroll_info = host_impl_->ProcessScrollDeltas();
- EXPECT_EQ(scroll_info->top_controls_delta, 0.f);
- EXPECT_EQ(host_impl_->active_tree()->sent_top_controls_delta(), 0.f);
-
- SetupTopControlsAndScrollLayer();
-
- // After the root layer exists, it should be set normally.
- scroll_info = host_impl_->ProcessScrollDeltas();
- EXPECT_EQ(scroll_info->top_controls_delta, -20.f);
- EXPECT_EQ(host_impl_->active_tree()->sent_top_controls_delta(), -20.f);
-}
-
TEST_F(LayerTreeHostImplTopControlsTest, ScrollTopControlsByFractionalAmount) {
SetupTopControlsAndScrollLayerWithVirtualViewport(
gfx::Size(10, 10), gfx::Size(10, 10), gfx::Size(10, 10));
@@ -4423,7 +4401,7 @@ class LayerTreeHostImplViewportCoveredTest : public LayerTreeHostImplTest {
size_t CountGutterQuads(const QuadList& quad_list) {
size_t num_gutter_quads = 0;
for (const auto& quad : quad_list) {
- num_gutter_quads += (quad.material == gutter_quad_material_) ? 1 : 0;
+ num_gutter_quads += (quad->material == gutter_quad_material_) ? 1 : 0;
}
return num_gutter_quads;
}
@@ -4436,10 +4414,9 @@ class LayerTreeHostImplViewportCoveredTest : public LayerTreeHostImplTest {
// Make sure that the texture coordinates match their expectations.
void ValidateTextureDrawQuads(const QuadList& quad_list) {
for (const auto& quad : quad_list) {
- if (quad.material != DrawQuad::TEXTURE_CONTENT)
+ if (quad->material != DrawQuad::TEXTURE_CONTENT)
continue;
- const TextureDrawQuad* texture_quad =
- TextureDrawQuad::MaterialCast(&quad);
+ const TextureDrawQuad* texture_quad = TextureDrawQuad::MaterialCast(quad);
gfx::SizeF gutter_texture_size_pixels = gfx::ScaleSize(
gutter_texture_size_, host_impl_->device_scale_factor());
EXPECT_EQ(texture_quad->uv_top_left.x(),
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_host_pixeltest_masks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698