REGRESSION(r225340): WPE port should not be getting EGL X11 types on ANGLE
authorclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Mar 2018 22:05:17 +0000 (22:05 +0000)
committerclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Mar 2018 22:05:17 +0000 (22:05 +0000)
https://bugs.webkit.org/show_bug.cgi?id=183749

Reviewed by Alex Christensen.

Add back the USE_WPE ifdef.

* changes.diff:
* include/EGL/eglplatform.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229721 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/changes.diff
Source/ThirdParty/ANGLE/include/EGL/eglplatform.h

index 0f2d810..34d475c 100644 (file)
@@ -1,3 +1,15 @@
+2018-03-19  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        REGRESSION(r225340): WPE port should not be getting EGL X11 types on ANGLE
+        https://bugs.webkit.org/show_bug.cgi?id=183749
+
+        Reviewed by Alex Christensen.
+
+        Add back the USE_WPE ifdef.
+
+        * changes.diff:
+        * include/EGL/eglplatform.h:
+
 2018-03-15  Tim Horton  <timothy_horton@apple.com>
 
         Add and adopt WK_ALTERNATE_FRAMEWORKS_DIR in ANGLE
index a5820d7..eacfee9 100644 (file)
@@ -8066,3 +8066,16 @@ index 6daa78330..98931fe31 100644
      bool EndObject(SizeType memberCount = 0) {
          (void)memberCount;
          RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
+diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
+index 333448be348..47d18093c96 100644
+--- a/include/EGL/eglplatform.h
++++ b/include/EGL/eglplatform.h
+@@ -100,7 +100,7 @@ typedef struct ANativeWindow*           EGLNativeWindowType;
+ typedef struct egl_native_pixmap_t*     EGLNativePixmapType;
+ typedef void*                           EGLNativeDisplayType;
+-#elif defined(USE_OZONE)
++#elif defined(USE_OZONE) || defined(USE_WPE)
+ typedef intptr_t EGLNativeDisplayType;
+ typedef intptr_t EGLNativeWindowType;
index 333448b..47d1809 100644 (file)
@@ -100,7 +100,7 @@ typedef struct ANativeWindow*           EGLNativeWindowType;
 typedef struct egl_native_pixmap_t*     EGLNativePixmapType;
 typedef void*                           EGLNativeDisplayType;
 
-#elif defined(USE_OZONE)
+#elif defined(USE_OZONE) || defined(USE_WPE)
 
 typedef intptr_t EGLNativeDisplayType;
 typedef intptr_t EGLNativeWindowType;