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

Unified Diff: cc/CCSettings.cpp

Issue 10916279: Chromium compositor change implementing page-scale driven pinch-zoom. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Change m_unpinchedViewportSize and remove unnecessary >1 page scale clamping. Created 8 years, 3 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: cc/CCSettings.cpp
===================================================================
--- cc/CCSettings.cpp (revision 159486)
+++ cc/CCSettings.cpp (working copy)
@@ -10,6 +10,7 @@
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 +24,15 @@
bool CCSettings::acceleratedAnimationEnabled() { return s_acceleratedAnimationEnabled; }
void CCSettings::setAcceleratedAnimationEnabled(bool enabled) { s_acceleratedAnimationEnabled = enabled; }
+bool CCSettings::pageScalePinchZoomEnabled() { return s_pageScalePinchZoomEnabled; }
+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

Powered by Google App Engine
This is Rietveld 408576698