Title: [230407] releases/WebKitGTK/webkit-2.20/Source/ThirdParty/ANGLE
- Revision
- 230407
- Author
- carlo...@webkit.org
- Date
- 2018-04-09 05:14:03 -0700 (Mon, 09 Apr 2018)
Log Message
Merge r229721 - 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: releases/WebKitGTK/webkit-2.20/Source/ThirdParty/ANGLE/ChangeLog (230406 => 230407)
--- releases/WebKitGTK/webkit-2.20/Source/ThirdParty/ANGLE/ChangeLog 2018-04-09 12:13:57 UTC (rev 230406)
+++ releases/WebKitGTK/webkit-2.20/Source/ThirdParty/ANGLE/ChangeLog 2018-04-09 12:14:03 UTC (rev 230407)
@@ -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-01-27 Dan Bernstein <m...@apple.com>
HaveInternalSDK includes should be "#include?"
Modified: releases/WebKitGTK/webkit-2.20/Source/ThirdParty/ANGLE/changes.diff (230406 => 230407)
--- releases/WebKitGTK/webkit-2.20/Source/ThirdParty/ANGLE/changes.diff 2018-04-09 12:13:57 UTC (rev 230406)
+++ releases/WebKitGTK/webkit-2.20/Source/ThirdParty/ANGLE/changes.diff 2018-04-09 12:14:03 UTC (rev 230407)
@@ -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: releases/WebKitGTK/webkit-2.20/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h (230406 => 230407)
--- releases/WebKitGTK/webkit-2.20/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2018-04-09 12:13:57 UTC (rev 230406)
+++ releases/WebKitGTK/webkit-2.20/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2018-04-09 12:14:03 UTC (rev 230407)
@@ -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
