| 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 e06ed4faf2f51c4c2bcec7583c9547a0770c254f..e6b867e22d676b0c094dd0036223a55faea62084 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -1057,7 +1057,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;
|
| @@ -1068,6 +1069,7 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurface(
|
| cc::CopyOutputRequest::CreateRequest(base::Bind(
|
| &RenderWidgetHostViewAura::CopyFromCompositingSurfaceHasResult,
|
| dst_size_in_pixel,
|
| + readback_config_rgb565,
|
| callback));
|
| gfx::Rect src_subrect_in_pixel =
|
| ConvertRectToPixel(current_device_scale_factor_, src_subrect);
|
| @@ -1800,6 +1802,7 @@ void RenderWidgetHostViewAura::SetSurfaceNotInUseByCompositor(
|
| // static
|
| void RenderWidgetHostViewAura::CopyFromCompositingSurfaceHasResult(
|
| const gfx::Size& dst_size_in_pixel,
|
| + bool readback_config_rgb565,
|
| const base::Callback<void(bool, const SkBitmap&)>& callback,
|
| scoped_ptr<cc::CopyOutputResult> result) {
|
| if (result->IsEmpty() || result->size().IsEmpty()) {
|
| @@ -1808,7 +1811,9 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurfaceHasResult(
|
| }
|
|
|
| if (result->HasTexture()) {
|
| - PrepareTextureCopyOutputResult(dst_size_in_pixel, callback, result.Pass());
|
| + PrepareTextureCopyOutputResult(dst_size_in_pixel, readback_config_rgb565,
|
| + callback,
|
| + result.Pass());
|
| return;
|
| }
|
|
|
| @@ -1830,6 +1835,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(
|
| @@ -1871,6 +1877,7 @@ void RenderWidgetHostViewAura::PrepareTextureCopyOutputResult(
|
| gfx::Rect(result->size()),
|
| dst_size_in_pixel,
|
| pixels,
|
| + readback_config_rgb565,
|
| base::Bind(&CopyFromCompositingSurfaceFinished,
|
| callback,
|
| base::Passed(&release_callback),
|
|
|