diff options
| author | bokan@chromium.org <bokan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 10:29:00 +0000 |
|---|---|---|
| committer | bokan@chromium.org <bokan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 10:29:00 +0000 |
| commit | fe89d82f7d90d1bc084bc4dd49269ce530c50cbf (patch) | |
| tree | 923030d92fc4f18ce04af5ccdd1b4de7cd4c0ae0 /cc/base | |
| parent | 6fa615b4eff8602ae539686e28fcbafd7deab1c6 (diff) | |
| download | chromium_src-fe89d82f7d90d1bc084bc4dd49269ce530c50cbf.zip chromium_src-fe89d82f7d90d1bc084bc4dd49269ce530c50cbf.tar.gz chromium_src-fe89d82f7d90d1bc084bc4dd49269ce530c50cbf.tar.bz2 | |
Fix for pinch virtual viewport flag wasn't fully enabled.
Missed a case when enabling the flag on CrOS in r266119.
BUG=367099
Review URL: https://codereview.chromium.org/257903002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/base')
| -rw-r--r-- | cc/base/switches.cc | 1 | ||||
| -rw-r--r-- | cc/base/switches.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cc/base/switches.cc b/cc/base/switches.cc index 0731598..4211a35 100644 --- a/cc/base/switches.cc +++ b/cc/base/switches.cc @@ -63,6 +63,7 @@ const char kStrictLayerPropertyChangeChecking[] = // Virtual viewport for fixed-position elements, scrollbars during pinch. const char kEnablePinchVirtualViewport[] = "enable-pinch-virtual-viewport"; +const char kDisablePinchVirtualViewport[] = "disable-pinch-virtual-viewport"; // Disable partial swap which is needed for some OpenGL drivers / emulators. const char kUIDisablePartialSwap[] = "ui-disable-partial-swap"; diff --git a/cc/base/switches.h b/cc/base/switches.h index b8b2243..be4c1ac 100644 --- a/cc/base/switches.h +++ b/cc/base/switches.h @@ -31,6 +31,7 @@ CC_EXPORT extern const char kCompositeToMailbox[]; CC_EXPORT extern const char kMaxTilesForInterestArea[]; CC_EXPORT extern const char kMaxUnusedResourceMemoryUsagePercentage[]; CC_EXPORT extern const char kEnablePinchVirtualViewport[]; +CC_EXPORT extern const char kDisablePinchVirtualViewport[]; CC_EXPORT extern const char kStrictLayerPropertyChangeChecking[]; CC_EXPORT extern const char kDisableCompositorTouchHitTesting[]; |