Index: content/browser/android/content_view_core_impl.cc |
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc |
index 4ef9af287cf1273b16aedfa09e4df504164250cd..a42740bd821ed34191661897746fde8f32fc2502 100644 |
--- a/content/browser/android/content_view_core_impl.cc |
+++ b/content/browser/android/content_view_core_impl.cc |
@@ -685,14 +685,16 @@ void ContentViewCoreImpl::ShowPastePopup(int x_dip, int y_dip) { |
void ContentViewCoreImpl::GetScaledContentBitmap( |
float scale, |
gfx::Size* out_size, |
+ jobject bitmap_config, |
vivekg
2014/02/11 17:06:46
bitmap_config -> jbitmap_config
sivag
2014/02/13 16:31:52
Done.
|
const base::Callback<void(bool, const SkBitmap&)>& result_callback) { |
RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid(); |
if (!view) { |
result_callback.Run(false, SkBitmap()); |
return; |
} |
- |
- view->GetScaledContentBitmap(scale, out_size, result_callback); |
+ JNIEnv* env = AttachCurrentThread(); |
+ SkBitmap::Config bitmap_format = gfx::ToSkiaBitmapConfig(env, bitmap_config); |
vivekg
2014/02/11 17:06:46
bitmap_format -> skbitmap_config for consistency.
sivag
2014/02/13 16:31:52
Done.
|
+ view->GetScaledContentBitmap(scale, out_size, bitmap_format, result_callback); |
} |
void ContentViewCoreImpl::StartContentIntent(const GURL& content_url) { |