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

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: Delete maxScrollOffsetChangedByDeviceScaleFactor test 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
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..264323ddf5fc2ec85983ac2fb5a6ebef57f95f43 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);
danakj 2013/01/17 18:02:49 nit: 2 space indent
aelias_OOO_until_Jul13 2013/01/17 19:59:46 Done.
// Run the GPU service as a thread in the browser instead of as a
// standalone process.

Powered by Google App Engine
This is Rietveld 408576698