Index: cc/layers/painted_scrollbar_layer_impl_unittest.cc |
diff --git a/cc/layers/painted_scrollbar_layer_impl_unittest.cc b/cc/layers/painted_scrollbar_layer_impl_unittest.cc |
index 68f24afface887b3d8309c01a0118fbf9a93296f..3edc450a25dc68e0c878bf7dcffbf63c9eaa2389 100644 |
--- a/cc/layers/painted_scrollbar_layer_impl_unittest.cc |
+++ b/cc/layers/painted_scrollbar_layer_impl_unittest.cc |
@@ -5,6 +5,7 @@ |
#include "cc/layers/painted_scrollbar_layer_impl.h" |
#include "cc/quads/draw_quad.h" |
+#include "cc/quads/texture_draw_quad.h" |
#include "cc/test/layer_test_common.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -16,6 +17,7 @@ TEST(PaintedScrollbarLayerImplTest, Occlusion) { |
float scale = 2.f; |
gfx::Size scaled_layer_size(20, 2000); |
gfx::Size viewport_size(1000, 1000); |
+ float thumb_opacity = 0.2f; |
LayerTestCommon::LayerImplTest impl; |
@@ -50,6 +52,7 @@ TEST(PaintedScrollbarLayerImplTest, Occlusion) { |
scrollbar_layer_impl->SetScrollLayerLength(200.f); |
scrollbar_layer_impl->set_track_ui_resource_id(track_uid); |
scrollbar_layer_impl->set_thumb_ui_resource_id(thumb_uid); |
+ scrollbar_layer_impl->set_thumb_opacity(thumb_opacity); |
impl.CalcDrawProps(viewport_size); |
@@ -71,8 +74,16 @@ TEST(PaintedScrollbarLayerImplTest, Occlusion) { |
// Note: this is also testing that the thumb and track are both |
// scaled by the internal contents scale. It's not occlusion-related |
// but is easy to verify here. |
- const DrawQuad* thumb_quad = impl.quad_list().ElementAt(0); |
- const DrawQuad* track_quad = impl.quad_list().ElementAt(1); |
+ const DrawQuad* thumb_draw_quad = impl.quad_list().ElementAt(0); |
+ const DrawQuad* track_draw_quad = impl.quad_list().ElementAt(1); |
+ |
+ EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, thumb_draw_quad->material); |
+ EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, track_draw_quad->material); |
+ |
+ const TextureDrawQuad* thumb_quad = |
+ TextureDrawQuad::MaterialCast(thumb_draw_quad); |
+ const TextureDrawQuad* track_quad = |
+ TextureDrawQuad::MaterialCast(track_draw_quad); |
gfx::Rect scaled_thumb_rect = gfx::ScaleToEnclosingRect(thumb_rect, scale); |
EXPECT_EQ(track_quad->rect.ToString(), |
@@ -84,6 +95,12 @@ TEST(PaintedScrollbarLayerImplTest, Occlusion) { |
EXPECT_EQ(thumb_quad->rect.ToString(), scaled_thumb_rect.ToString()); |
EXPECT_EQ(thumb_quad->visible_rect.ToString(), |
scaled_thumb_rect.ToString()); |
+ EXPECT_EQ(thumb_quad->visible_rect.ToString(), |
+ scaled_thumb_rect.ToString()); |
+ for (size_t i = 0; i < 4; ++i) { |
+ EXPECT_EQ(thumb_opacity, thumb_quad->vertex_opacity[i]); |
+ EXPECT_EQ(1.f, track_quad->vertex_opacity[i]); |
+ } |
} |
{ |