Title: [229721] trunk/Source/ThirdParty/ANGLE
- Revision
- 229721
- Author
- clo...@igalia.com
- Date
- 2018-03-19 15:05:17 -0700 (Mon, 19 Mar 2018)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (229720 => 229721)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2018-03-19 21:46:41 UTC (rev 229720)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2018-03-19 22:05:17 UTC (rev 229721)
@@ -1,3 +1,15 @@
+2018-03-19 Carlos Alberto Lopez Perez <clo...@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_hor...@apple.com>
Add and adopt WK_ALTERNATE_FRAMEWORKS_DIR in ANGLE
Modified: trunk/Source/ThirdParty/ANGLE/changes.diff (229720 => 229721)
--- trunk/Source/ThirdParty/ANGLE/changes.diff 2018-03-19 21:46:41 UTC (rev 229720)
+++ trunk/Source/ThirdParty/ANGLE/changes.diff 2018-03-19 22:05:17 UTC (rev 229721)
@@ -8066,3 +8066,16 @@
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;
Modified: trunk/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h (229720 => 229721)
--- trunk/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2018-03-19 21:46:41 UTC (rev 229720)
+++ trunk/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2018-03-19 22:05:17 UTC (rev 229721)
@@ -100,7 +100,7 @@
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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
