| 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 d18a00898b57a8517e13a3b4d8616d42c97a15c8..9bf76235cd8d63d88132ce021b1b21593d242cf7 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -1056,7 +1056,8 @@ BackingStore* RenderWidgetHostViewAura::AllocBackingStore(
|
| void RenderWidgetHostViewAura::CopyFromCompositingSurface(
|
| const gfx::Rect& src_subrect,
|
| const gfx::Size& dst_size,
|
| - const base::Callback<void(bool, const SkBitmap&)>& callback) {
|
| + const base::Callback<void(bool, const SkBitmap&)>& callback,
|
| + bool readback_config_rgb565) {
|
| if (!CanCopyToBitmap()) {
|
| callback.Run(false, SkBitmap());
|
| return;
|
| @@ -1817,7 +1818,9 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurfaceHasResult(
|
| }
|
|
|
| if (result->HasTexture()) {
|
| - PrepareTextureCopyOutputResult(dst_size_in_pixel, callback, result.Pass());
|
| + PrepareTextureCopyOutputResult(dst_size_in_pixel, false,
|
| + callback,
|
| + result.Pass());
|
| return;
|
| }
|
|
|
| @@ -1839,6 +1842,7 @@ static void CopyFromCompositingSurfaceFinished(
|
| // static
|
| void RenderWidgetHostViewAura::PrepareTextureCopyOutputResult(
|
| const gfx::Size& dst_size_in_pixel,
|
| + bool readback_config_rgb565,
|
| const base::Callback<void(bool, const SkBitmap&)>& callback,
|
| scoped_ptr<cc::CopyOutputResult> result) {
|
| base::ScopedClosureRunner scoped_callback_runner(
|
| @@ -1879,6 +1883,7 @@ void RenderWidgetHostViewAura::PrepareTextureCopyOutputResult(
|
| result->size(),
|
| gfx::Rect(result->size()),
|
| dst_size_in_pixel,
|
| + readback_config_rgb565,
|
| pixels,
|
| base::Bind(&CopyFromCompositingSurfaceFinished,
|
| callback,
|
|
|