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

Side by Side Diff: cc/layers/painted_scrollbar_layer_impl_unittest.cc

Issue 1458703010: Mac: Don't repaint scrollbars every frame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master2
Patch Set: Rebase and resolve Created 5 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/painted_scrollbar_layer_impl.h" 5 #include "cc/layers/painted_scrollbar_layer_impl.h"
6 6
7 #include "cc/quads/draw_quad.h" 7 #include "cc/quads/draw_quad.h"
8 #include "cc/quads/texture_draw_quad.h"
8 #include "cc/test/layer_test_common.h" 9 #include "cc/test/layer_test_common.h"
9 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
10 11
11 namespace cc { 12 namespace cc {
12 namespace { 13 namespace {
13 14
14 TEST(PaintedScrollbarLayerImplTest, Occlusion) { 15 TEST(PaintedScrollbarLayerImplTest, Occlusion) {
15 gfx::Size layer_size(10, 1000); 16 gfx::Size layer_size(10, 1000);
16 float scale = 2.f; 17 float scale = 2.f;
17 gfx::Size scaled_layer_size(20, 2000); 18 gfx::Size scaled_layer_size(20, 2000);
18 gfx::Size viewport_size(1000, 1000); 19 gfx::Size viewport_size(1000, 1000);
20 float thumb_opacity = 0.2f;
19 21
20 LayerTestCommon::LayerImplTest impl; 22 LayerTestCommon::LayerImplTest impl;
21 23
22 SkBitmap thumb_sk_bitmap; 24 SkBitmap thumb_sk_bitmap;
23 thumb_sk_bitmap.allocN32Pixels(10, 10); 25 thumb_sk_bitmap.allocN32Pixels(10, 10);
24 thumb_sk_bitmap.setImmutable(); 26 thumb_sk_bitmap.setImmutable();
25 UIResourceId thumb_uid = 5; 27 UIResourceId thumb_uid = 5;
26 UIResourceBitmap thumb_bitmap(thumb_sk_bitmap); 28 UIResourceBitmap thumb_bitmap(thumb_sk_bitmap);
27 impl.host_impl()->CreateUIResource(thumb_uid, thumb_bitmap); 29 impl.host_impl()->CreateUIResource(thumb_uid, thumb_bitmap);
28 30
(...skipping 14 matching lines...) Expand all
43 scale, scaled_layer_size); 45 scale, scaled_layer_size);
44 scrollbar_layer_impl->SetDrawsContent(true); 46 scrollbar_layer_impl->SetDrawsContent(true);
45 scrollbar_layer_impl->SetThumbThickness(layer_size.width()); 47 scrollbar_layer_impl->SetThumbThickness(layer_size.width());
46 scrollbar_layer_impl->SetThumbLength(500); 48 scrollbar_layer_impl->SetThumbLength(500);
47 scrollbar_layer_impl->SetTrackLength(layer_size.height()); 49 scrollbar_layer_impl->SetTrackLength(layer_size.height());
48 scrollbar_layer_impl->SetCurrentPos(100.f / 4); 50 scrollbar_layer_impl->SetCurrentPos(100.f / 4);
49 scrollbar_layer_impl->SetClipLayerLength(100.f); 51 scrollbar_layer_impl->SetClipLayerLength(100.f);
50 scrollbar_layer_impl->SetScrollLayerLength(200.f); 52 scrollbar_layer_impl->SetScrollLayerLength(200.f);
51 scrollbar_layer_impl->set_track_ui_resource_id(track_uid); 53 scrollbar_layer_impl->set_track_ui_resource_id(track_uid);
52 scrollbar_layer_impl->set_thumb_ui_resource_id(thumb_uid); 54 scrollbar_layer_impl->set_thumb_ui_resource_id(thumb_uid);
55 scrollbar_layer_impl->set_thumb_opacity(thumb_opacity);
53 56
54 impl.CalcDrawProps(viewport_size); 57 impl.CalcDrawProps(viewport_size);
55 58
56 gfx::Rect thumb_rect = scrollbar_layer_impl->ComputeThumbQuadRect(); 59 gfx::Rect thumb_rect = scrollbar_layer_impl->ComputeThumbQuadRect();
57 EXPECT_EQ(gfx::Rect(0, 500 / 4, 10, layer_size.height() / 2).ToString(), 60 EXPECT_EQ(gfx::Rect(0, 500 / 4, 10, layer_size.height() / 2).ToString(),
58 thumb_rect.ToString()); 61 thumb_rect.ToString());
59 62
60 { 63 {
61 SCOPED_TRACE("No occlusion"); 64 SCOPED_TRACE("No occlusion");
62 gfx::Rect occluded; 65 gfx::Rect occluded;
63 impl.AppendQuadsWithOcclusion(scrollbar_layer_impl, occluded); 66 impl.AppendQuadsWithOcclusion(scrollbar_layer_impl, occluded);
64 67
65 size_t partially_occluded_count = 0; 68 size_t partially_occluded_count = 0;
66 LayerTestCommon::VerifyQuadsAreOccluded( 69 LayerTestCommon::VerifyQuadsAreOccluded(
67 impl.quad_list(), occluded, &partially_occluded_count); 70 impl.quad_list(), occluded, &partially_occluded_count);
68 EXPECT_EQ(2u, impl.quad_list().size()); 71 EXPECT_EQ(2u, impl.quad_list().size());
69 EXPECT_EQ(0u, partially_occluded_count); 72 EXPECT_EQ(0u, partially_occluded_count);
70 73
71 // Note: this is also testing that the thumb and track are both 74 // Note: this is also testing that the thumb and track are both
72 // scaled by the internal contents scale. It's not occlusion-related 75 // scaled by the internal contents scale. It's not occlusion-related
73 // but is easy to verify here. 76 // but is easy to verify here.
74 const DrawQuad* thumb_quad = impl.quad_list().ElementAt(0); 77 const DrawQuad* thumb_draw_quad = impl.quad_list().ElementAt(0);
75 const DrawQuad* track_quad = impl.quad_list().ElementAt(1); 78 const DrawQuad* track_draw_quad = impl.quad_list().ElementAt(1);
79
80 EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, thumb_draw_quad->material);
81 EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, track_draw_quad->material);
82
83 const TextureDrawQuad* thumb_quad =
84 TextureDrawQuad::MaterialCast(thumb_draw_quad);
85 const TextureDrawQuad* track_quad =
86 TextureDrawQuad::MaterialCast(track_draw_quad);
76 87
77 gfx::Rect scaled_thumb_rect = gfx::ScaleToEnclosingRect(thumb_rect, scale); 88 gfx::Rect scaled_thumb_rect = gfx::ScaleToEnclosingRect(thumb_rect, scale);
78 EXPECT_EQ(track_quad->rect.ToString(), 89 EXPECT_EQ(track_quad->rect.ToString(),
79 gfx::Rect(scaled_layer_size).ToString()); 90 gfx::Rect(scaled_layer_size).ToString());
80 EXPECT_EQ(track_quad->opaque_rect.ToString(), 91 EXPECT_EQ(track_quad->opaque_rect.ToString(),
81 gfx::Rect(scaled_layer_size).ToString()); 92 gfx::Rect(scaled_layer_size).ToString());
82 EXPECT_EQ(track_quad->visible_rect.ToString(), 93 EXPECT_EQ(track_quad->visible_rect.ToString(),
83 gfx::Rect(scaled_layer_size).ToString()); 94 gfx::Rect(scaled_layer_size).ToString());
84 EXPECT_EQ(thumb_quad->rect.ToString(), scaled_thumb_rect.ToString()); 95 EXPECT_EQ(thumb_quad->rect.ToString(), scaled_thumb_rect.ToString());
85 EXPECT_EQ(thumb_quad->visible_rect.ToString(), 96 EXPECT_EQ(thumb_quad->visible_rect.ToString(),
86 scaled_thumb_rect.ToString()); 97 scaled_thumb_rect.ToString());
98 EXPECT_EQ(thumb_quad->visible_rect.ToString(),
99 scaled_thumb_rect.ToString());
100 for (size_t i = 0; i < 4; ++i) {
101 EXPECT_EQ(thumb_opacity, thumb_quad->vertex_opacity[i]);
102 EXPECT_EQ(1.f, track_quad->vertex_opacity[i]);
103 }
87 } 104 }
88 105
89 { 106 {
90 SCOPED_TRACE("Full occlusion"); 107 SCOPED_TRACE("Full occlusion");
91 gfx::Rect occluded(scrollbar_layer_impl->visible_layer_rect()); 108 gfx::Rect occluded(scrollbar_layer_impl->visible_layer_rect());
92 impl.AppendQuadsWithOcclusion(scrollbar_layer_impl, occluded); 109 impl.AppendQuadsWithOcclusion(scrollbar_layer_impl, occluded);
93 110
94 LayerTestCommon::VerifyQuadsExactlyCoverRect(impl.quad_list(), gfx::Rect()); 111 LayerTestCommon::VerifyQuadsExactlyCoverRect(impl.quad_list(), gfx::Rect());
95 EXPECT_EQ(impl.quad_list().size(), 0u); 112 EXPECT_EQ(impl.quad_list().size(), 0u);
96 } 113 }
97 114
98 { 115 {
99 SCOPED_TRACE("Partial occlusion"); 116 SCOPED_TRACE("Partial occlusion");
100 gfx::Rect occluded(0, 0, 5, 1000); 117 gfx::Rect occluded(0, 0, 5, 1000);
101 impl.AppendQuadsWithOcclusion(scrollbar_layer_impl, occluded); 118 impl.AppendQuadsWithOcclusion(scrollbar_layer_impl, occluded);
102 119
103 size_t partially_occluded_count = 0; 120 size_t partially_occluded_count = 0;
104 LayerTestCommon::VerifyQuadsAreOccluded( 121 LayerTestCommon::VerifyQuadsAreOccluded(
105 impl.quad_list(), occluded, &partially_occluded_count); 122 impl.quad_list(), occluded, &partially_occluded_count);
106 // The layer outputs two quads, which is partially occluded. 123 // The layer outputs two quads, which is partially occluded.
107 EXPECT_EQ(2u, impl.quad_list().size()); 124 EXPECT_EQ(2u, impl.quad_list().size());
108 EXPECT_EQ(2u, partially_occluded_count); 125 EXPECT_EQ(2u, partially_occluded_count);
109 } 126 }
110 } 127 }
111 128
112 } // namespace 129 } // namespace
113 } // namespace cc 130 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/painted_scrollbar_layer_impl.cc ('k') | cc/layers/painted_scrollbar_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698