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 f262a3d8cb6f18cfe74ab68cc880c41f13b7e4bc..b905f00410890779b2dda81129c168f284239fbb 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
@@ -1089,7 +1089,7 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurface( |
const gfx::Rect& src_subrect, |
const gfx::Size& dst_size, |
const base::Callback<void(bool, const SkBitmap&)>& callback, |
- bool readback_config_rgb565) { |
+ const SkBitmap::Config config) { |
if (!CanCopyToBitmap()) { |
callback.Run(false, SkBitmap()); |
return; |
@@ -1100,7 +1100,7 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurface( |
cc::CopyOutputRequest::CreateRequest(base::Bind( |
&RenderWidgetHostViewAura::CopyFromCompositingSurfaceHasResult, |
dst_size_in_pixel, |
- readback_config_rgb565, |
+ config, |
callback)); |
gfx::Rect src_subrect_in_pixel = |
ConvertRectToPixel(current_device_scale_factor_, src_subrect); |
@@ -1833,7 +1833,7 @@ void RenderWidgetHostViewAura::SetSurfaceNotInUseByCompositor( |
// static |
void RenderWidgetHostViewAura::CopyFromCompositingSurfaceHasResult( |
const gfx::Size& dst_size_in_pixel, |
- bool readback_config_rgb565, |
+ const SkBitmap::Config config, |
const base::Callback<void(bool, const SkBitmap&)>& callback, |
scoped_ptr<cc::CopyOutputResult> result) { |
if (result->IsEmpty() || result->size().IsEmpty()) { |
@@ -1842,7 +1842,7 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurfaceHasResult( |
} |
if (result->HasTexture()) { |
- PrepareTextureCopyOutputResult(dst_size_in_pixel, readback_config_rgb565, |
+ PrepareTextureCopyOutputResult(dst_size_in_pixel, config, |
callback, |
result.Pass()); |
return; |
@@ -1866,7 +1866,7 @@ static void CopyFromCompositingSurfaceFinished( |
// static |
void RenderWidgetHostViewAura::PrepareTextureCopyOutputResult( |
const gfx::Size& dst_size_in_pixel, |
- bool readback_config_rgb565, |
+ const SkBitmap::Config config, |
const base::Callback<void(bool, const SkBitmap&)>& callback, |
scoped_ptr<cc::CopyOutputResult> result) { |
base::ScopedClosureRunner scoped_callback_runner( |
@@ -1908,7 +1908,7 @@ void RenderWidgetHostViewAura::PrepareTextureCopyOutputResult( |
gfx::Rect(result->size()), |
dst_size_in_pixel, |
pixels, |
- readback_config_rgb565, |
+ config, |
base::Bind(&CopyFromCompositingSurfaceFinished, |
callback, |
base::Passed(&release_callback), |