| 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 e62c532196229f2c2786e462f794286ea0fdd106..0475fdf50feb9be46ab8d549ee2bf1ba7181f1be 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -3685,13 +3685,8 @@ 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.
|
| - UIResourceBitmap ui_resource_bitmap(skbitmap);
|
| + UIResourceBitmap ui_resource_bitmap(2, 2);
|
| ui_resource_bitmap.SetWrapMode(UIResourceBitmap::REPEAT);
|
| UIResourceId ui_resource_id = 12345;
|
| host_impl_->CreateUIResource(ui_resource_id, ui_resource_bitmap);
|
| @@ -5597,13 +5592,8 @@ 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;
|
| - UIResourceBitmap bitmap(skbitmap);
|
| + UIResourceBitmap bitmap(1, 1);
|
| host_impl_->CreateUIResource(ui_resource_id, bitmap);
|
| EXPECT_EQ(1u, context3d->NumTextures());
|
| ResourceProvider::ResourceId id1 =
|
|
|