| Index: cc/settings.cc
|
| diff --git a/cc/settings.cc b/cc/settings.cc
|
| index cfdc25835d41e13c027e763da5c089ac85b5cd52..c319224ff1592e51495f8113876207b1961c9b77 100644
|
| --- a/cc/settings.cc
|
| +++ b/cc/settings.cc
|
| @@ -17,29 +17,29 @@ static bool s_pageScalePinchZoomEnabled = false;
|
|
|
| namespace cc {
|
|
|
| -bool CCSettings::perTilePaintingEnabled() { return s_perTilePaintingEnabled; }
|
| -void CCSettings::setPerTilePaintingEnabled(bool enabled) { s_perTilePaintingEnabled = enabled; }
|
| +bool Settings::perTilePaintingEnabled() { return s_perTilePaintingEnabled; }
|
| +void Settings::setPerTilePaintingEnabled(bool enabled) { s_perTilePaintingEnabled = enabled; }
|
|
|
| -bool CCSettings::partialSwapEnabled() { return s_partialSwapEnabled; }
|
| -void CCSettings::setPartialSwapEnabled(bool enabled) { s_partialSwapEnabled = enabled; }
|
| +bool Settings::partialSwapEnabled() { return s_partialSwapEnabled; }
|
| +void Settings::setPartialSwapEnabled(bool enabled) { s_partialSwapEnabled = enabled; }
|
|
|
| -bool CCSettings::acceleratedAnimationEnabled() { return s_acceleratedAnimationEnabled; }
|
| -void CCSettings::setAcceleratedAnimationEnabled(bool enabled) { s_acceleratedAnimationEnabled = enabled; }
|
| +bool Settings::acceleratedAnimationEnabled() { return s_acceleratedAnimationEnabled; }
|
| +void Settings::setAcceleratedAnimationEnabled(bool enabled) { s_acceleratedAnimationEnabled = enabled; }
|
|
|
| -bool CCSettings::pageScalePinchZoomEnabled() { return s_pageScalePinchZoomEnabled; }
|
| -void CCSettings::setPageScalePinchZoomEnabled(bool enabled) { s_pageScalePinchZoomEnabled = enabled; }
|
| +bool Settings::pageScalePinchZoomEnabled() { return s_pageScalePinchZoomEnabled; }
|
| +void Settings::setPageScalePinchZoomEnabled(bool enabled) { s_pageScalePinchZoomEnabled = enabled; }
|
|
|
| -bool CCSettings::jankInsteadOfCheckerboard()
|
| +bool Settings::jankInsteadOfCheckerboard()
|
| {
|
| return CommandLine::ForCurrentProcess()->HasSwitch(switches::kJankInsteadOfCheckerboard);
|
| }
|
|
|
| -bool CCSettings::backgroundColorInsteadOfCheckerboard()
|
| +bool Settings::backgroundColorInsteadOfCheckerboard()
|
| {
|
| return CommandLine::ForCurrentProcess()->HasSwitch(switches::kBackgroundColorInsteadOfCheckerboard);
|
| }
|
|
|
| -void CCSettings::reset()
|
| +void Settings::reset()
|
| {
|
| s_perTilePaintingEnabled = false;
|
| s_partialSwapEnabled = false;
|
|
|