| Index: cc/output/gl_renderer.cc
|
| diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
|
| index b3885055cf189ab17bd5798c8928dd7b54efb12d..7e0e14a1e109046e6f399469374673b0e5e7df7d 100644
|
| --- a/cc/output/gl_renderer.cc
|
| +++ b/cc/output/gl_renderer.cc
|
| @@ -1738,10 +1738,8 @@ void GLRenderer::DrawPictureQuad(const DrawingFrame* frame,
|
| const PictureDrawQuad* quad) {
|
| if (on_demand_tile_raster_bitmap_.width() != quad->texture_size.width() ||
|
| on_demand_tile_raster_bitmap_.height() != quad->texture_size.height()) {
|
| - on_demand_tile_raster_bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
|
| - quad->texture_size.width(),
|
| - quad->texture_size.height());
|
| - on_demand_tile_raster_bitmap_.allocPixels();
|
| + on_demand_tile_raster_bitmap_.allocN32Pixels(quad->texture_size.width(),
|
| + quad->texture_size.height());
|
|
|
| if (on_demand_tile_raster_resource_id_)
|
| resource_provider_->DeleteResource(on_demand_tile_raster_resource_id_);
|
| @@ -2297,9 +2295,7 @@ void GLRenderer::GetFramebufferPixelsAsync(
|
| DCHECK(request->force_bitmap_result());
|
|
|
| scoped_ptr<SkBitmap> bitmap(new SkBitmap);
|
| - bitmap->setConfig(
|
| - SkBitmap::kARGB_8888_Config, window_rect.width(), window_rect.height());
|
| - bitmap->allocPixels();
|
| + bitmap->allocN32Pixels(window_rect.width(), window_rect.height());
|
|
|
| scoped_ptr<SkAutoLockPixels> lock(new SkAutoLockPixels(*bitmap));
|
|
|
|
|