diff options
Diffstat (limited to 'cc/test/layer_tree_pixel_test.cc')
-rw-r--r-- | cc/test/layer_tree_pixel_test.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index 7ae11c3..a282cc4 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc @@ -268,12 +268,8 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap( gl->DeleteTextures(1, &texture_id); scoped_ptr<SkBitmap> bitmap(new SkBitmap); - bitmap->setConfig(SkBitmap::kARGB_8888_Config, - size.width(), - size.height()); - bitmap->allocPixels(); + bitmap->allocN32Pixels(size.width(), size.height()); - scoped_ptr<SkAutoLockPixels> lock(new SkAutoLockPixels(*bitmap)); uint8* out_pixels = static_cast<uint8*>(bitmap->getPixels()); size_t row_bytes = size.width() * 4; @@ -324,7 +320,7 @@ void LayerTreePixelTest::CopyBitmapToTextureMailboxAsTexture( gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - DCHECK_EQ(SkBitmap::kARGB_8888_Config, bitmap.getConfig()); + DCHECK_EQ(kPMColor_SkColorType, bitmap.colorType()); { SkAutoLockPixels lock(bitmap); |