diff options
| author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 00:53:56 +0000 |
|---|---|---|
| committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 00:53:56 +0000 |
| commit | 9eef585de4ccc9de28d7596b0169e06abd4c4866 (patch) | |
| tree | b37f38461bec3032975f88f3deee33c3e1e175c6 /android_webview/browser | |
| parent | 0d0b4a4e77be5bcd40895f814241a1ea233f1a22 (diff) | |
| download | chromium_src-9eef585de4ccc9de28d7596b0169e06abd4c4866.zip chromium_src-9eef585de4ccc9de28d7596b0169e06abd4c4866.tar.gz chromium_src-9eef585de4ccc9de28d7596b0169e06abd4c4866.tar.bz2 | |
[Android WebView] Remove caching of Bitmaps used for SW draw.
Remove the temporary hack that was introduced to improve SW
rendering performance by caching the Bitmap we drew into as this
creates problems when there's more than one bitmap on screen at once
(as they both end up using the same bitmap).
Review URL: https://chromiumcodereview.appspot.com/16415010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser')
| -rw-r--r-- | android_webview/browser/browser_view_renderer.h | 3 | ||||
| -rw-r--r-- | android_webview/browser/in_process_view_renderer.cc | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h index ded115a..e24b25c 100644 --- a/android_webview/browser/browser_view_renderer.h +++ b/android_webview/browser/browser_view_renderer.h @@ -54,8 +54,7 @@ class BrowserViewRenderer { virtual base::android::ScopedJavaLocalRef<jobject> CreateBitmap( JNIEnv* env, int width, - int height, - bool cache_result) = 0; + int height) = 0; // Draws the provided Java Bitmap into the provided Java Canvas. virtual void DrawBitmapIntoCanvas( diff --git a/android_webview/browser/in_process_view_renderer.cc b/android_webview/browser/in_process_view_renderer.cc index 556b7c5..0ad4a41 100644 --- a/android_webview/browser/in_process_view_renderer.cc +++ b/android_webview/browser/in_process_view_renderer.cc @@ -440,7 +440,7 @@ bool InProcessViewRenderer::DrawSWInternal(jobject java_canvas, if (pixels == NULL) { TRACE_EVENT0("android_webview", "Render to Aux Bitmap"); ScopedJavaLocalRef<jobject> jbitmap(java_helper_->CreateBitmap( - env, clip.width(), clip.height(), false)); + env, clip.width(), clip.height())); if (!jbitmap.obj()) { TRACE_EVENT_INSTANT0("android_webview", "Bitmap Alloc Fail", TRACE_EVENT_SCOPE_THREAD); @@ -532,7 +532,7 @@ InProcessViewRenderer::CapturePicture() { // to the bitmap drawn, and we don't want subsequent draws to corrupt any // previously returned pictures. ScopedJavaLocalRef<jobject> jbitmap(java_helper_->CreateBitmap( - env, picture->width(), picture->height(), false)); + env, picture->width(), picture->height())); if (!jbitmap.obj()) return ScopedJavaLocalRef<jobject>(); |