Index: content/browser/renderer_host/render_widget_host_view_android.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
index 44d060a63ead8d96cda20647e83152460a04d979..a7640423b57450df514ff1cefecdcf0527731719 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -625,11 +625,8 @@ void RenderWidgetHostViewAndroid::CopyFromCompositingSurface( |
const gfx::Size& dst_size, |
const base::Callback<void(bool, const SkBitmap&)>& callback, |
const SkBitmap::Config bitmap_config) { |
- // Only ARGB888 and RGB565 supported as of now. |
- bool format_support = ((bitmap_config == SkBitmap::kRGB_565_Config) || |
- (bitmap_config == SkBitmap::kARGB_8888_Config)); |
- if (!format_support) { |
- DCHECK(format_support); |
+ |
+ if (!IsReadBackConfigSupported(bitmap_config)) { |
callback.Run(false, SkBitmap()); |
return; |
} |
@@ -638,18 +635,6 @@ void RenderWidgetHostViewAndroid::CopyFromCompositingSurface( |
callback.Run(false, SkBitmap()); |
return; |
} |
- ImageTransportFactoryAndroid* factory = |
- ImageTransportFactoryAndroid::GetInstance(); |
- GLHelper* gl_helper = factory->GetGLHelper(); |
- if (!gl_helper) |
- return; |
- bool check_rgb565_support = gl_helper->CanUseRgb565Readback(); |
- if ((bitmap_config == SkBitmap::kRGB_565_Config) && |
- !check_rgb565_support) { |
- LOG(ERROR) << "Readbackformat rgb565 not supported"; |
- callback.Run(false, SkBitmap()); |
- return; |
- } |
const gfx::Display& display = |
gfx::Screen::GetNativeScreen()->GetPrimaryDisplay(); |
float device_scale_factor = display.device_scale_factor(); |
@@ -1413,6 +1398,7 @@ void RenderWidgetHostViewAndroid::PrepareTextureCopyOutputResult( |
ImageTransportFactoryAndroid* factory = |
ImageTransportFactoryAndroid::GetInstance(); |
GLHelper* gl_helper = factory->GetGLHelper(); |
+ |
if (!gl_helper) |
return; |
@@ -1479,6 +1465,16 @@ void RenderWidgetHostViewAndroid::PrepareBitmapCopyOutputResult( |
callback.Run(true, *source); |
} |
+bool RenderWidgetHostViewAndroid::IsReadBackConfigSupported( |
+ const SkBitmap::Config& bitmap_config) { |
vivekg
2014/02/20 00:53:31
nit: As SkBitmap::Config is an enum, pass it by va
sivag
2014/02/21 11:40:51
Done.
|
+ ImageTransportFactoryAndroid* factory = |
+ ImageTransportFactoryAndroid::GetInstance(); |
+ GLHelper* gl_helper = factory->GetGLHelper(); |
+ if (!gl_helper) |
+ return false; |
+ return gl_helper->IsReadBackConfigSupported(bitmap_config); |
+} |
+ |
// static |
void RenderWidgetHostViewPort::GetDefaultScreenInfo( |
blink::WebScreenInfo* results) { |