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

android_webview/browser/in_process_view_renderer.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/in_process_view_renderer.h"
 
 #include <android/bitmap.h>
 
 #include "android_webview/public/browser/draw_gl.h"
 #include "android_webview/public/browser/draw_sw.h"
@@ skipping 420 matching lines @@
         "android_webview", "EarlyOut_EmptyClip", TRACE_EVENT_SCOPE_THREAD);
     return true;
   }
 
   JNIEnv* env = AttachCurrentThread();
 
   AwDrawSWFunctionTable* sw_functions = GetAwDrawSWFunctionTable();
   AwPixelInfo* pixels = sw_functions ?
       sw_functions->access_pixels(env, java_canvas) : NULL;
   // Render into an auxiliary bitmap if pixel info is not available.
+  ScopedJavaLocalRef<jobject> jcanvas(env, java_canvas);
   if (pixels == NULL) {
     TRACE_EVENT0("android_webview", "RenderToAuxBitmap");
     ScopedJavaLocalRef<jobject> jbitmap(java_helper_->CreateBitmap(
-        env, clip.width(), clip.height()));
+        env, clip.width(), clip.height(), jcanvas));
     if (!jbitmap.obj()) {
       TRACE_EVENT_INSTANT0("android_webview",
                            "EarlyOut_BitmapAllocFail",
                            TRACE_EVENT_SCOPE_THREAD);
       return false;
     }
 
     if (!RasterizeIntoBitmap(env, jbitmap,
                              clip.x() - scroll_at_start_of_frame_.x(),
                              clip.y() - scroll_at_start_of_frame_.y(),
                              base::Bind(&InProcessViewRenderer::RenderSW,
                                         base::Unretained(this)))) {
       TRACE_EVENT_INSTANT0("android_webview",
                            "EarlyOut_RasterizeFail",
                            TRACE_EVENT_SCOPE_THREAD);
       return false;
     }
 
-    ScopedJavaLocalRef<jobject> jcanvas(env, java_canvas);
     java_helper_->DrawBitmapIntoCanvas(env, jbitmap, jcanvas,
                                        clip.x(), clip.y());
     return true;
   }
 
   // Draw in a SkCanvas built over the pixel information.
   bool succeeded = false;
   {
     SkBitmap bitmap;
     bitmap.setConfig(static_cast<SkBitmap::Config>(pixels->config),
@@ skipping 49 matching lines @@
   picture->endRecording();
 
   if (IsSkiaVersionCompatible()) {
     // Add a reference that the create_picture() will take ownership of.
     picture->ref();
     return ScopedJavaLocalRef<jobject>(env,
         GetAwDrawSWFunctionTable()->create_picture(env, picture.get()));
   }
 
   // If Skia versions are not compatible, workaround it by rasterizing the
-  // picture into a bitmap and drawing it into a new Java picture. Pass false
-  // for |cache_result| as the picture we create will hold a shallow reference
-  // to the bitmap drawn, and we don't want subsequent draws to corrupt any
-  // previously returned pictures.
+  // picture into a bitmap and drawing it into a new Java picture. Pass null
+  // for |canvas| as we don't have java canvas at this point (and it would be
+  // software anyway).
   ScopedJavaLocalRef<jobject> jbitmap(java_helper_->CreateBitmap(
-      env, picture->width(), picture->height()));
+      env, picture->width(), picture->height(), ScopedJavaLocalRef<jobject>()));
   if (!jbitmap.obj())
     return ScopedJavaLocalRef<jobject>();
 
   if (!RasterizeIntoBitmap(env, jbitmap, 0, 0,
       base::Bind(&RenderPictureToCanvas,
                  base::Unretained(picture.get())))) {
     return ScopedJavaLocalRef<jobject>();
   }
 
   return java_helper_->RecordBitmapIntoPicture(env, jbitmap);
@@ skipping 124 matching lines @@
   // TODO(joth): BrowserViewRendererImpl had a bunch of logic for dpi and page
   // scale here. Determine what if any needs bringing over to this class.
   return CompositeSW(canvas);
 }
 
 bool InProcessViewRenderer::CompositeSW(SkCanvas* canvas) {
   return compositor_ && compositor_->DemandDrawSw(canvas);
 }
 
 }  // namespace android_webview