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

cc/CCSettings.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #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;
 } // namespace
 
 namespace cc {
 
 bool CCSettings::perTilePaintingEnabled() { return s_perTilePaintingEnabled; }
 void CCSettings::setPerTilePaintingEnabled(bool enabled) { s_perTilePaintingEnabled = enabled; }
 
 bool CCSettings::partialSwapEnabled() { return s_partialSwapEnabled; }
 void CCSettings::setPartialSwapEnabled(bool enabled) { s_partialSwapEnabled = enabled; }
 
 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 exposing some gyp problems, I
believe.  

I get the following warning when building:
../../third_party/gold/gold64: warning: hidden symbol
'switches::kEnablePinchInCompositor' in
obj/chrome/libinstaller_util.a(obj/chrome/../content/public/common/installer_util.content_switches.o)
is referenced by DSO lib/libglue.so

The issue is related to the CONTENT_EXPORT macro in content_switches.h.  When CC
is pulled into glue.so, I don't think the macro is being set properly.  Sound
familiar?

+}
+
 void CCSettings::reset()
 {
     s_perTilePaintingEnabled = false;
     s_partialSwapEnabled = false;
     s_acceleratedAnimationEnabled = false;
 }
 
 } // namespace cc