Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_aura.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| index 3e4c1ca5a68af97e127f85841fdc0a5ba4c9aa27..4ec0de3bf5c07836dec12d6e9c612a4afcad3a51 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| @@ -1857,7 +1857,8 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurfaceHasResult( |
| } |
| DCHECK(result->HasBitmap()); |
| - PrepareBitmapCopyOutputResult(dst_size_in_pixel, callback, result.Pass()); |
| + PrepareBitmapCopyOutputResult(dst_size_in_pixel, config, callback, |
| + result.Pass()); |
| } |
| static void CopyFromCompositingSurfaceFinished( |
| @@ -1885,7 +1886,7 @@ void RenderWidgetHostViewAura::PrepareTextureCopyOutputResult( |
| return; |
| scoped_ptr<SkBitmap> bitmap(new SkBitmap); |
| - bitmap->setConfig(SkBitmap::kARGB_8888_Config, |
| + bitmap->setConfig(config, |
| dst_size_in_pixel.width(), dst_size_in_pixel.height(), |
| 0, kOpaque_SkAlphaType); |
| if (!bitmap->allocPixels()) |
| @@ -1927,10 +1928,14 @@ void RenderWidgetHostViewAura::PrepareTextureCopyOutputResult( |
| // static |
| void RenderWidgetHostViewAura::PrepareBitmapCopyOutputResult( |
| const gfx::Size& dst_size_in_pixel, |
| + const SkBitmap::Config config, |
| const base::Callback<void(bool, const SkBitmap&)>& callback, |
| scoped_ptr<cc::CopyOutputResult> result) { |
| + if (config != SkBitmap::kARGB_8888_Config) { |
| + NOTIMPLEMENTED(); |
| + callback.Run(false, SkBitmap()); |
|
no sievers
2014/01/27 18:41:49
same here
sivag
2014/01/28 13:17:01
Done.
|
| + } |
| DCHECK(result->HasBitmap()); |
| - |
| base::ScopedClosureRunner scoped_callback_runner( |
| base::Bind(callback, false, SkBitmap())); |
| if (!result->HasBitmap()) |