diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
| commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
| tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/ui/gl/gl_switches.h | |
| parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
| download | qtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz | |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/ui/gl/gl_switches.h')
| -rw-r--r-- | chromium/ui/gl/gl_switches.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/chromium/ui/gl/gl_switches.h b/chromium/ui/gl/gl_switches.h index 5edf397857a..945783b725a 100644 --- a/chromium/ui/gl/gl_switches.h +++ b/chromium/ui/gl/gl_switches.h @@ -7,6 +7,7 @@ // Defines all the command-line switches used by ui/gl. +#include "base/feature_list.h" #include "ui/gl/gl_export.h" namespace gl { @@ -18,7 +19,9 @@ GL_EXPORT extern const char kGLImplementationAppleName[]; GL_EXPORT extern const char kGLImplementationEGLName[]; GL_EXPORT extern const char kGLImplementationANGLEName[]; GL_EXPORT extern const char kGLImplementationSwiftShaderName[]; +GL_EXPORT extern const char kGLImplementationSwiftShaderForWebGLName[]; extern const char kGLImplementationMockName[]; +extern const char kGLImplementationStubName[]; GL_EXPORT extern const char kANGLEImplementationDefaultName[]; GL_EXPORT extern const char kANGLEImplementationD3D9Name[]; @@ -51,15 +54,23 @@ GL_EXPORT extern const char kEnableES3APIs[]; GL_EXPORT extern const char kDisableES3APIs[]; GL_EXPORT extern const char kEnableSgiVideoSync[]; GL_EXPORT extern const char kDisableGLExtensions[]; -GL_EXPORT extern const char kEnableSwapBuffersWithDamage[]; +GL_EXPORT extern const char kEnableSwapBuffersWithBounds[]; // These flags are used by the test harness code, not passed in by users. GL_EXPORT extern const char kDisableGLDrawingForTests[]; -GL_EXPORT extern const char kOverrideUseGLWithOSMesaForTests[]; +GL_EXPORT extern const char kOverrideUseSoftwareGLForTests[]; GL_EXPORT extern const char* kGLSwitchesCopiedFromGpuProcessHost[]; GL_EXPORT extern const int kGLSwitchesCopiedFromGpuProcessHostNumSwitches; } // namespace switches +namespace features { + +#if defined(OS_WIN) +GL_EXPORT extern const base::Feature kD3DVsync; +#endif // defined(OS_WIN) + +} // namespace features + #endif // UI_GL_GL_SWITCHES_H_ |