| Index: Source/WTF/wtf/FeatureDefines.h
|
| diff --git a/Source/WTF/wtf/FeatureDefines.h b/Source/WTF/wtf/FeatureDefines.h
|
| index 162c949785b9500db16b2e1e24d8c930952565e6..440c96c8c37ff5f5849392d126c76a55a1eb5b80 100644
|
| --- a/Source/WTF/wtf/FeatureDefines.h
|
| +++ b/Source/WTF/wtf/FeatureDefines.h
|
| @@ -197,7 +197,7 @@
|
| #endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
|
|
|
| /* --------- Apple Windows port --------- */
|
| -#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)
|
| +#if PLATFORM(WIN) && !OS(WINCE)
|
|
|
| #if !defined(ENABLE_FULLSCREEN_API)
|
| #define ENABLE_FULLSCREEN_API 1
|
| @@ -207,7 +207,7 @@
|
| #define ENABLE_WEB_ARCHIVE 1
|
| #endif
|
|
|
| -#endif /* PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO) */
|
| +#endif /* PLATFORM(WIN) && !OS(WINCE) */
|
|
|
| /* --------- WinCE port --------- */
|
| /* WinCE port is a specialization of PLATFORM(WIN). */
|
| @@ -228,17 +228,6 @@
|
|
|
| #endif /* PLATFORM(WIN) && OS(WINCE) */
|
|
|
| -/* --------- Windows CAIRO port --------- */
|
| -/* PLATFORM(WIN_CAIRO) is a specialization of PLATFORM(WIN). */
|
| -/* PLATFORM(WIN) is always enabled when PLATFORM(WIN_CAIRO) is enabled. */
|
| -#if PLATFORM(WIN_CAIRO)
|
| -
|
| -#if !defined(ENABLE_WEB_ARCHIVE)
|
| -#define ENABLE_WEB_ARCHIVE 1
|
| -#endif
|
| -
|
| -#endif /* PLATFORM(WIN_CAIRO) */
|
| -
|
| /* --------- WX port (Mac OS and Windows) --------- */
|
| #if PLATFORM(WX)
|
|
|
|
|