diff options
| author | Bo Liu <boliu@chromium.org> | 2015-05-21 11:25:01 -0700 |
|---|---|---|
| committer | Bo Liu <boliu@chromium.org> | 2015-05-21 18:26:02 +0000 |
| commit | 00a0986aa4f3a355c47a0b8f5f55b19363be320c (patch) | |
| tree | 8e22dd03dfb695b3154f60af899f44a4ff6d64cd /android_webview | |
| parent | 499d5d83d11f2e8f12ef3df39be5849eb6c021ec (diff) | |
| download | chromium_src-00a0986aa4f3a355c47a0b8f5f55b19363be320c.zip chromium_src-00a0986aa4f3a355c47a0b8f5f55b19363be320c.tar.gz chromium_src-00a0986aa4f3a355c47a0b8f5f55b19363be320c.tar.bz2 | |
branch 2403: Fix software draws
Fix for the mistake in the last minute fix for android emulators. Last
minute fixes are bad.
BUG=490354
R=torne@chromium.org
TBR=hush
android_clang_dbg_recipe is crazy
NOTRY=true
Review URL: https://codereview.chromium.org/1147373002
Cr-Commit-Position: refs/heads/master@{#330953}
(cherry picked from commit 0f1990b030df3424e56f88030ad46a24abde9a71)
TBR=boliu
Review URL: https://codereview.chromium.org/1147933004
Cr-Commit-Position: refs/branch-heads/2403@{#54}
Cr-Branched-From: f54b8097a9c45ed4ad308133d49f05325d6c5070-refs/heads/master@{#330231}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/native/java_browser_view_renderer_helper.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/android_webview/native/java_browser_view_renderer_helper.cc b/android_webview/native/java_browser_view_renderer_helper.cc index 7da23ff..3a2ec02 100644 --- a/android_webview/native/java_browser_view_renderer_helper.cc +++ b/android_webview/native/java_browser_view_renderer_helper.cc @@ -157,8 +157,7 @@ scoped_ptr<SoftwareCanvasHolder> SoftwareCanvasHolder::Create( JNIEnv* env = base::android::AttachCurrentThread(); scoped_ptr<SoftwareCanvasHolder> holder; if (!force_auxiliary_bitmap) { - scoped_ptr<SoftwareCanvasHolder> holder( - new JavaCanvasHolder(env, java_canvas, scroll_correction)); + holder.reset(new JavaCanvasHolder(env, java_canvas, scroll_correction)); } if (!holder.get() || !holder->GetCanvas()) { holder.reset(); |