[Android WebView] Clamp Bitmap size to max. dimensions when drawing into a Canvas

android_webview/native/java_browser_view_renderer_helper.cc

Index: android_webview/native/java_browser_view_renderer_helper.cc
diff --git a/android_webview/native/java_browser_view_renderer_helper.cc b/android_webview/native/java_browser_view_renderer_helper.cc
index 04278adf368d227f2e277638927916070b910203..8bbed368bab36a5afd04c86ba02a510551540507 100644
--- a/android_webview/native/java_browser_view_renderer_helper.cc
+++ b/android_webview/native/java_browser_view_renderer_helper.cc
@@ -21,10 +21,12 @@ JavaBrowserViewRendererHelper::~JavaBrowserViewRendererHelper() {
 ScopedJavaLocalRef<jobject> JavaBrowserViewRendererHelper::CreateBitmap(
     JNIEnv* env,
     int width,
-    int height) {
+    int height,
+    const base::android::JavaRef<jobject>& jcanvas) {
   TRACE_EVENT0("android_webview", "RendererHelper::CreateBitmap");
   return width <= 0 || height <= 0 ? ScopedJavaLocalRef<jobject>() :
-      Java_JavaBrowserViewRendererHelper_createBitmap(env, width, height);
+      Java_JavaBrowserViewRendererHelper_createBitmap(env, width, height,
+                                                      jcanvas.obj());
 }
 
 void JavaBrowserViewRendererHelper::DrawBitmapIntoCanvas(