Attachment 372438 Details for Bug 198991 – Patch

[patch] Patch

bug-198991-20190619083704.patch (text/plain), 1.38 KB, created by Zan Dobersek on 2019-06-18 23:37:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2019-06-18 23:37:05 PDT

Size: 1.38 KB

patch

obsolete

>Subversion Revision: 246581
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 04935c45c8ffb831af2db0d0924dd371d374153e..42133abec00b17866c50e1455c61b8d615652882 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-18  Zan Dobersek  <zdobersek@igalia.com>
>+
>+        USE_ANGLE macro can be evaluated without being defined
>+        https://bugs.webkit.org/show_bug.cgi?id=198991
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/Platform.h: On platforms not yet defining USE_ANGLE, the
>+        incompatibility check with some other flags leads to the macro being
>+        evaluated even when it was not defined, producing compiler warnings.
>+        To avoid this, the macro should be defined to 0 before the check in
>+        case it was not defined already.
>+
> 2019-06-18  Kenneth Russell  <kbr@chromium.org>
> 
>         Add preliminary ANGLE backend to WebCore
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index 8a56c6cf0531683d90fc2395e32ee8d9558243e2..58b365d4ce6650dbe5dca31fba4f211409be0998 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -1138,6 +1138,10 @@
> #endif
> 
> #if ENABLE(WEBGL)
>+#if !defined(USE_ANGLE)
>+#define USE_ANGLE 0
>+#endif
>+
> #if (USE_ANGLE && (USE_OPENGL || USE_OPENGL_ES || (defined(USE_EGL) && USE_EGL)))
> #error USE_ANGLE is incompatible with USE_OPENGL, USE_OPENGL_ES and USE_EGL
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 198991: 372438