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 3e4d6e74db7e831af1ef5f13e7b5415c3ff2357b..cf53262e8a5ac9814f9eb13f24cada8c41b9a62a 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; |
@@ -1067,6 +1068,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); |
@@ -1809,6 +1811,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()) { |
@@ -1817,7 +1820,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; |
} |
@@ -1839,6 +1844,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 +1885,7 @@ void RenderWidgetHostViewAura::PrepareTextureCopyOutputResult( |
result->size(), |
gfx::Rect(result->size()), |
dst_size_in_pixel, |
+ readback_config_rgb565, |
pixels, |
base::Bind(&CopyFromCompositingSurfaceFinished, |
callback, |