Index: cc/CCSettings.cpp |
=================================================================== |
--- cc/CCSettings.cpp (revision 157978) |
+++ cc/CCSettings.cpp (working copy) |
@@ -6,6 +6,9 @@ |
#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; |
@@ -23,6 +26,12 @@ |
bool CCSettings::acceleratedAnimationEnabled() { return s_acceleratedAnimationEnabled; } |
void CCSettings::setAcceleratedAnimationEnabled(bool enabled) { s_acceleratedAnimationEnabled = enabled; } |
+bool CCSettings::pageScalePinchZoomEnabled() |
+{ |
+ return CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kEnablePinchInCompositor); |
Jeff Timanus
2012/09/21 18:10:01
Using the command line directly from within CC is
|
+} |
+ |
void CCSettings::reset() |
{ |
s_perTilePaintingEnabled = false; |