Chromium compositor change implementing page-scale driven pinch-zoom.

cc/CCSettings.cpp

Index: cc/CCSettings.cpp
===================================================================
--- cc/CCSettings.cpp	(revision 158365)
+++ cc/CCSettings.cpp	(working copy)
@@ -6,10 +6,14 @@
 
 #include "CCSettings.h"
 
+#include "base/command_line.h"
+#include "content/public/common/content_switches.h"
+
 namespace {
 static bool s_perTilePaintingEnabled = false;
 static bool s_partialSwapEnabled = false;
 static bool s_acceleratedAnimationEnabled = false;
+static bool s_pageScalePinchZoomEnabled = false;
 } // namespace
 
 namespace cc {
@@ -23,11 +27,19 @@
 bool CCSettings::acceleratedAnimationEnabled() { return s_acceleratedAnimationEnabled; }
 void CCSettings::setAcceleratedAnimationEnabled(bool enabled) { s_acceleratedAnimationEnabled = enabled; }
 
+bool CCSettings::pageScalePinchZoomEnabled()
+{
+    return s_pageScalePinchZoomEnabled || CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnablePinchInCompositor);
+}
+void CCSettings::setPageScalePinchZoomEnabled(bool enabled) { s_pageScalePinchZoomEnabled = enabled; }
+
 void CCSettings::reset()
 {
     s_perTilePaintingEnabled = false;
     s_partialSwapEnabled = false;
     s_acceleratedAnimationEnabled = false;
+    s_pageScalePinchZoomEnabled = false;
 }
 
 } // namespace cc