| 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 14a50be1120fb3303292312df419096a44305ded..725207c64f47659db0216a07a8132d920f39dc27 100644
|
| --- a/content/browser/android/content_view_core_impl.cc
|
| +++ b/content/browser/android/content_view_core_impl.cc
|
| @@ -701,14 +701,17 @@ void ContentViewCoreImpl::ShowPastePopup(int x_dip, int y_dip) {
|
| static_cast<jint>(y_dip));
|
| }
|
|
|
| -unsigned int ContentViewCoreImpl::GetScaledContentTexture(
|
| +void ContentViewCoreImpl::GetScaledContentBitmap(
|
| float scale,
|
| - gfx::Size* out_size) {
|
| + gfx::Size* out_size,
|
| + const base::Callback<void(bool, const SkBitmap&)>& result_callback) {
|
| RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid();
|
| - if (!view)
|
| - return 0;
|
| + if (!view) {
|
| + result_callback.Run(false, SkBitmap());
|
| + return;
|
| + }
|
|
|
| - return view->GetScaledContentTexture(scale, out_size);
|
| + view->GetScaledContentBitmap(scale, out_size, result_callback);
|
| }
|
|
|
| void ContentViewCoreImpl::StartContentIntent(const GURL& content_url) {
|
|
|