diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 22:40:59 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 22:40:59 +0000 |
| commit | c660d46fdb0e45faf3ae09750766a8e2ddef08e3 (patch) | |
| tree | e36227194763737ee42a920716620fdacc5a78e1 /android_webview | |
| parent | ead6751a4a41f35c3cc4ba72f0519610ba6b2f08 (diff) | |
| download | chromium_src-c660d46fdb0e45faf3ae09750766a8e2ddef08e3.zip chromium_src-c660d46fdb0e45faf3ae09750766a8e2ddef08e3.tar.gz chromium_src-c660d46fdb0e45faf3ae09750766a8e2ddef08e3.tar.bz2 | |
[Android webview] Cleanup some command line flags
Remove obsolete kUseZeroCopyBuffers
Remove placeholder testing-webview-gl-mode, replace with dedicated
kDisableWebViewGLMode
Set the disable webGL flag in follow up to crrev.com/215135
BUG=b/10188126
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/22260002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/in_process_view_renderer.cc | 6 | ||||
| -rw-r--r-- | android_webview/common/aw_switches.cc | 2 | ||||
| -rw-r--r-- | android_webview/common/aw_switches.h | 4 | ||||
| -rw-r--r-- | android_webview/lib/main/aw_main_delegate.cc | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/android_webview/browser/in_process_view_renderer.cc b/android_webview/browser/in_process_view_renderer.cc index c8d54a1..a714956 100644 --- a/android_webview/browser/in_process_view_renderer.cc +++ b/android_webview/browser/in_process_view_renderer.cc @@ -7,6 +7,7 @@ #include <android/bitmap.h> #include "android_webview/browser/scoped_app_gl_state_restore.h" +#include "android_webview/common/aw_switches.h" #include "android_webview/public/browser/draw_gl.h" #include "android_webview/public/browser/draw_sw.h" #include "base/android/jni_android.h" @@ -111,9 +112,10 @@ bool RenderPictureToCanvas(SkPicture* picture, SkCanvas* canvas) { return true; } -// TODO(boliu): Remove this when hardware mode is ready. bool HardwareEnabled() { - return CommandLine::ForCurrentProcess()->HasSwitch("testing-webview-gl-mode"); + static bool g_hw_enabled = !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableWebViewGLMode); + return g_hw_enabled; } // Provides software rendering functions from the Android glue layer. diff --git a/android_webview/common/aw_switches.cc b/android_webview/common/aw_switches.cc index a24b123..a87e93a 100644 --- a/android_webview/common/aw_switches.cc +++ b/android_webview/common/aw_switches.cc @@ -8,6 +8,6 @@ namespace switches { const char kDisableSimpleCache[] = "disable-simple-cache"; -const char kUseZeroCopyBuffers[] = "use-zero-copy-buffers"; +const char kDisableWebViewGLMode[] = "disable-webview-gl-mode"; } // namespace switches diff --git a/android_webview/common/aw_switches.h b/android_webview/common/aw_switches.h index f5ef4b2..2c7db28 100644 --- a/android_webview/common/aw_switches.h +++ b/android_webview/common/aw_switches.h @@ -10,8 +10,8 @@ namespace switches { // When set, falls back to using the old disk cache. extern const char kDisableSimpleCache[]; -// Uses zero-copy buffers in graphics pipeline. -extern const char kUseZeroCopyBuffers[]; +// When set, forces use of fallback SW path even on HW canvas. +extern const char kDisableWebViewGLMode[]; } // namespace switches diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc index 0e43adde..6344b1f 100644 --- a/android_webview/lib/main/aw_main_delegate.cc +++ b/android_webview/lib/main/aw_main_delegate.cc @@ -59,6 +59,9 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) { cl->AppendSwitch(switches::kHideScrollbars); cl->AppendSwitch(switches::kDisableOverscrollEdgeEffect); + // Not yet secure in single-process mode. + cl->AppendSwitch(switches::kDisableExperimentalWebGL); + return false; } |