| 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 d3867954548ecd8cbb2ca9b1d6c183608d6274d6..c184c67df9d9467996328090e9a43b5d4266b894 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -3075,12 +3075,13 @@ TEST_F(LayerTreeHostImplViewportCoveredTest, ViewportCoveredOverhangBitmap) {
|
| host_impl_->SetViewportSize(DipSizeToPixelSize(viewport_size_));
|
| SetupActiveTreeLayers();
|
|
|
| + SkBitmap skbitmap;
|
| + skbitmap.setConfig(SkBitmap::kARGB_8888_Config, 2, 2);
|
| + skbitmap.allocPixels();
|
| + skbitmap.setImmutable();
|
| +
|
| // Specify an overhang bitmap to use.
|
| - scoped_refptr<UIResourceBitmap> ui_resource_bitmap(UIResourceBitmap::Create(
|
| - new uint8_t[4],
|
| - UIResourceBitmap::RGBA8,
|
| - UIResourceBitmap::REPEAT,
|
| - gfx::Size(1, 1)));
|
| + UIResourceBitmap ui_resource_bitmap(skbitmap, UIResourceBitmap::REPEAT);
|
| UIResourceId ui_resource_id = 12345;
|
| host_impl_->CreateUIResource(ui_resource_id, ui_resource_bitmap);
|
| host_impl_->SetOverhangUIResource(ui_resource_id, gfx::Size(32, 32));
|
| @@ -6547,12 +6548,13 @@ TEST_F(LayerTreeHostImplTest, UIResourceManagement) {
|
|
|
| EXPECT_EQ(0u, context3d->NumTextures());
|
|
|
| + SkBitmap skbitmap;
|
| + skbitmap.setConfig(SkBitmap::kARGB_8888_Config, 1, 1);
|
| + skbitmap.allocPixels();
|
| + skbitmap.setImmutable();
|
| +
|
| UIResourceId ui_resource_id = 1;
|
| - scoped_refptr<UIResourceBitmap> bitmap = UIResourceBitmap::Create(
|
| - new uint8_t[1],
|
| - UIResourceBitmap::RGBA8,
|
| - UIResourceBitmap::CLAMP_TO_EDGE,
|
| - gfx::Size(1, 1));
|
| + UIResourceBitmap bitmap(skbitmap);
|
| host_impl_->CreateUIResource(ui_resource_id, bitmap);
|
| EXPECT_EQ(1u, context3d->NumTextures());
|
| ResourceProvider::ResourceId id1 =
|
|
|