Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9098)

Unified Diff: content/browser/android/content_startup_flags.cc

Issue 11958004: Make new-style page scale work on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase to 177887 Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/pinch_zoom_viewport.cc ('k') | content/browser/android/content_view_core_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/content_startup_flags.cc
diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc
index 3e0ee61af2a669a87247093f83b65e7f94af0c20..e7932046d70913a8a9a535a7fe9e43670b10851d 100644
--- a/content/browser/android/content_startup_flags.cc
+++ b/content/browser/android/content_startup_flags.cc
@@ -57,7 +57,9 @@ void SetContentCommandLineFlags(int max_render_process_count) {
switches::kEnableCompositedScrollingForFrames);
parsed_command_line->AppendSwitch(switches::kEnableGestureTapHighlight);
- parsed_command_line->AppendSwitch(switches::kEnableCssTransformPinch);
+ parsed_command_line->AppendSwitch(switches::kEnablePinch);
+ if (!parsed_command_line->HasSwitch(cc::switches::kEnableImplSidePainting))
+ parsed_command_line->AppendSwitch(switches::kEnableCssTransformPinch);
// Run the GPU service as a thread in the browser instead of as a
// standalone process.
« no previous file with comments | « cc/pinch_zoom_viewport.cc ('k') | content/browser/android/content_view_core_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698