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 95f9625509e55dd9efaa16bcd476a7d3f182e73b..a2f0db3a01c0f29855d0ff7a737c506b46385197 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
@@ -1050,7 +1050,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; |
@@ -1809,7 +1810,9 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurfaceHasResult( |
} |
if (result->HasTexture()) { |
- PrepareTextureCopyOutputResult(dst_size_in_pixel, callback, result.Pass()); |
+ PrepareTextureCopyOutputResult(dst_size_in_pixel, false, |
piman
2014/01/09 18:12:15
Well, it sounds like readback_config_rgb565 should
sivag
2014/01/10 12:20:01
Do you mean add this support to CopyFromCompositin
piman
2014/01/10 22:38:33
Right... in CopyFromCompositingSurface the paramet
sivag
2014/01/15 15:24:13
Done.
|
+ callback, |
+ result.Pass()); |
return; |
} |
@@ -1831,6 +1834,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 +1875,7 @@ void RenderWidgetHostViewAura::PrepareTextureCopyOutputResult( |
result->size(), |
gfx::Rect(result->size()), |
dst_size_in_pixel, |
+ readback_config_rgb565, |
pixels, |
base::Bind(&CopyFromCompositingSurfaceFinished, |
callback, |