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 d63772014ae7b9712258929c2a4b4d01b13d535b..521087c3ec8b6156aeb1d2397cf60bc01f642370 100644 |
--- a/cc/trees/layer_tree_host_impl_unittest.cc |
+++ b/cc/trees/layer_tree_host_impl_unittest.cc |
@@ -1509,6 +1509,7 @@ class MissingTextureAnimatingLayer : public DidDrawCheckLayer { |
ResourceProvider::ResourceId resource = |
resource_provider->CreateResource(gfx::Size(1, 1), |
GL_RGBA, |
+ GL_CLAMP_TO_EDGE, |
ResourceProvider::TextureUsageAny); |
resource_provider->AllocateForTesting(resource); |
PushTileProperties(0, 0, resource, gfx::Rect(), false); |
@@ -2600,6 +2601,7 @@ class BlendStateCheckLayer : public LayerImpl { |
resource_id_(resource_provider->CreateResource( |
gfx::Size(1, 1), |
GL_RGBA, |
+ GL_CLAMP_TO_EDGE, |
ResourceProvider::TextureUsageAny)) { |
resource_provider->AllocateForTesting(resource_id_); |
SetAnchorPoint(gfx::PointF()); |
@@ -2993,18 +2995,21 @@ class LayerTreeHostImplViewportCoveredTest : public LayerTreeHostImplTest { |
if (quad_list[i]->material == DrawQuad::TEXTURE_CONTENT) { |
TextureDrawQuad* quad = reinterpret_cast<TextureDrawQuad*>( |
quad_list[i]); |
- EXPECT_EQ(quad->uv_top_left.x(), |
- quad->rect.x() / |
- static_cast<float>(gutter_texture_size_.width())); |
- EXPECT_EQ(quad->uv_top_left.y(), |
- quad->rect.y() / |
- static_cast<float>(gutter_texture_size_.height())); |
- EXPECT_EQ(quad->uv_bottom_right.x(), |
- (quad->rect.x() + quad->rect.width()) / |
- static_cast<float>(gutter_texture_size_.width())); |
- EXPECT_EQ(quad->uv_bottom_right.y(), |
- (quad->rect.y() + quad->rect.height()) / |
- static_cast<float>(gutter_texture_size_.height())); |
+ EXPECT_EQ(quad->rect.x() / |
+ static_cast<float>(gutter_texture_size_.width()), |
+ quad->uv_top_left.x()); |
+ EXPECT_EQ(quad->rect.y() / |
+ static_cast<float>(gutter_texture_size_.height()), |
+ quad->uv_top_left.y()); |
+ EXPECT_EQ((quad->rect.x() + quad->rect.width()) / |
+ static_cast<float>(gutter_texture_size_.width()), |
+ quad->uv_bottom_right.x()); |
+ EXPECT_EQ((quad->rect.y() + quad->rect.height()) / |
+ static_cast<float>(gutter_texture_size_.height()), |
+ quad->uv_bottom_right.y()); |
+ EXPECT_EQ(GL_REPEAT, |
+ host_impl_->resource_provider()->WrapModeForTesting( |
+ quad->resource_id)); |
} |
} |
} |
@@ -3037,7 +3042,10 @@ TEST_F(LayerTreeHostImplViewportCoveredTest, ViewportCoveredOverhangBitmap) { |
// Specify an overhang bitmap to use. |
scoped_refptr<UIResourceBitmap> ui_resource_bitmap(UIResourceBitmap::Create( |
- new uint8_t[4], UIResourceBitmap::RGBA8, gfx::Size(1, 1))); |
+ new uint8_t[4], |
+ UIResourceBitmap::RGBA8, |
+ UIResourceBitmap::REPEAT, |
+ gfx::Size(1, 1))); |
UIResourceId ui_resource_id = 12345; |
host_impl_->CreateUIResource(ui_resource_id, ui_resource_bitmap); |
host_impl_->SetOverhangUIResource(ui_resource_id, gfx::Size(32, 32)); |
@@ -6410,7 +6418,10 @@ TEST_F(LayerTreeHostImplTest, UIResourceManagement) { |
UIResourceId ui_resource_id = 1; |
scoped_refptr<UIResourceBitmap> bitmap = UIResourceBitmap::Create( |
- new uint8_t[1], UIResourceBitmap::RGBA8, gfx::Size(1, 1)); |
+ new uint8_t[1], |
+ UIResourceBitmap::RGBA8, |
+ UIResourceBitmap::CLAMP_TO_EDGE, |
+ gfx::Size(1, 1)); |
host_impl_->CreateUIResource(ui_resource_id, bitmap); |
EXPECT_EQ(1u, context3d->NumTextures()); |
ResourceProvider::ResourceId id1 = |