Title: [256587] releases/WebKitGTK/webkit-2.26/Source/WebKit
- Revision
- 256587
- Author
- carlo...@webkit.org
- Date
- 2020-02-14 01:39:42 -0800 (Fri, 14 Feb 2020)
Log Message
Merge r250077 - [GTK] Compilation errors when GL is disabled
https://bugs.webkit.org/show_bug.cgi?id=200223
Fix following compilation error when building with ENABLE_OPENGL=OFF
../../Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:123:51: error: use of undeclared identifier 'WaylandCompositor'
parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
^
Patch by Yury Semikhatsky <yu...@chromium.org> on 2019-09-18
Reviewed by Philippe Normand.
* UIProcess/glib/WebProcessPoolGLib.cpp:
(WebKit::WebProcessPool::platformInitializeWebProcess): only make a call when using EGL, this matches
guards in WaylandCompositor.h. The condition was changed in r245807.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog (256586 => 256587)
--- releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog 2020-02-14 08:40:48 UTC (rev 256586)
+++ releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog 2020-02-14 09:39:42 UTC (rev 256587)
@@ -1,3 +1,18 @@
+2019-09-18 Yury Semikhatsky <yu...@chromium.org>
+
+ [GTK] Compilation errors when GL is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=200223
+
+ Fix following compilation error when building with ENABLE_OPENGL=OFF
+ ../../Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:123:51: error: use of undeclared identifier 'WaylandCompositor'
+ parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
+ ^
+ Reviewed by Philippe Normand.
+
+ * UIProcess/glib/WebProcessPoolGLib.cpp:
+ (WebKit::WebProcessPool::platformInitializeWebProcess): only make a call when using EGL, this matches
+ guards in WaylandCompositor.h. The condition was changed in r245807.
+
2019-09-12 Charlie Turner <ctur...@igalia.com>
[GTK] Allow CacheStore::destroyEngine to destroy default engine for soup.
Modified: releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp (256586 => 256587)
--- releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2020-02-14 08:40:48 UTC (rev 256586)
+++ releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2020-02-14 09:39:42 UTC (rev 256587)
@@ -119,7 +119,7 @@
parameters.hostClientFileDescriptor = wpe_renderer_host_create_client();
parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name());
}
-#else
+#elif USE(EGL)
parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
