Chromium Code Reviews| Index: content/public/common/content_switches.cc |
| diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc |
| index 1ddae70a29a03e2b56a50487750f33048bc95b62..328d4a038090a1c43e8c4559f76c80d107c1da26 100644 |
| --- a/content/public/common/content_switches.cc |
| +++ b/content/public/common/content_switches.cc |
| @@ -205,9 +205,6 @@ const char kEnableScriptedSpeech[] = "enable-scripted-speech"; |
| // Specifies the request key for the continuous speech recognition webservice. |
| const char kSpeechRecognitionWebserviceKey[] = "speech-service-key"; |
| -// Disables animation on the compositor thread. |
| -const char kDisableThreadedAnimation[] = "disable-threaded-animation"; |
| - |
| #if defined(OS_ANDROID) |
| // Enable web audio API. |
| const char kEnableWebAudio[] = "enable-webaudio"; |
| @@ -314,9 +311,6 @@ const char kEnableDeprecatedPeerConnection[] = |
| // assumed to be sRGB. |
| const char kEnableMonitorProfile[] = "enable-monitor-profile"; |
| -// Enables partial swaps in the WK compositor on platforms that support it. |
| -const char kEnablePartialSwap[] = "enable-partial-swap"; |
| - |
| // Enables UI releasing handle to front surface for background tabs on platforms |
| // that support it. |
| const char kEnableUIReleaseFrontSurface[] = "enable-ui-release-front-surface"; |
| @@ -324,10 +318,6 @@ const char kEnableUIReleaseFrontSurface[] = "enable-ui-release-front-surface"; |
| // Enables touch-screen pinch gestures. |
| const char kEnablePinch[] = "enable-pinch"; |
| -// Enables an alternative pinch-zoom gesture support, via the threaded |
| -// compositor. |
| -const char kEnablePinchInCompositor[] = "enable-pinch-in-compositor"; |
| - |
| // Enable caching of pre-parsed JS script data. See http://crbug.com/32407. |
| const char kEnablePreparsedJsCaching[] = "enable-preparsed-js-caching"; |
| @@ -372,9 +362,6 @@ const char kEnableStrictSiteIsolation[] = "enable-strict-site-isolation"; |
| // Enable multithreaded GPU compositing of web content. |
| const char kEnableThreadedCompositing[] = "enable-threaded-compositing"; |
| -// Disable multithreaded GPU compositing of web content. |
| -const char kDisableThreadedCompositing[] = "disable-threaded-compositing"; |
| - |
| // Enable use of experimental TCP sockets API for sending data in the |
| // SYN packet. |
| const char kEnableTcpFastOpen[] = "enable-tcp-fastopen"; |
| @@ -720,12 +707,12 @@ const char kScrollPixels[] = "scroll-pixels"; |
| const char kUseSystemSSL[] = "use-system-ssl"; |
| #endif |
| -// Enable per-tile page painting. |
| -const char kEnablePerTilePainting[] = "enable-per-tile-painting"; |
| - |
| // Disables the use of a 3D software rasterizer. |
| const char kDisableSoftwareRasterizer[] = "disable-software-rasterizer"; |
| +// Disable multithreaded GPU compositing of web content. |
| +const char kDisableThreadedCompositing[] = "disable-threaded-compositing"; |
|
sky
2012/10/18 17:16:26
Make position match that of header.
|
| + |
| #if defined(USE_AURA) |
| // Configures the time after a GestureFlingCancel in which taps are cancelled. |
| extern const char kFlingTapSuppressMaxDown[] = "fling-tap-suppress-max-down"; |