Title: [276702] releases/WebKitGTK/webkit-2.32
- Revision
- 276702
- Author
- [email protected]
- Date
- 2021-04-28 02:36:51 -0700 (Wed, 28 Apr 2021)
Log Message
Merge r275634 - [GTK] webkit://gpu should print runtime libwpe and wpebackend-fdo versions
https://bugs.webkit.org/show_bug.cgi?id=224298
Patch by Michael Catanzaro <[email protected]> on 2021-04-07
Reviewed by Adrian Perez de Castro.
.:
* Source/cmake/OptionsGTK.cmake:
Source/WebKit:
* UIProcess/API/glib/WebKitProtocolHandler.cpp:
(WebKit::WebKitProtocolHandler::handleGPU):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/ChangeLog (276701 => 276702)
--- releases/WebKitGTK/webkit-2.32/ChangeLog 2021-04-28 09:36:43 UTC (rev 276701)
+++ releases/WebKitGTK/webkit-2.32/ChangeLog 2021-04-28 09:36:51 UTC (rev 276702)
@@ -1,3 +1,12 @@
+2021-04-07 Michael Catanzaro <[email protected]>
+
+ [GTK] webkit://gpu should print runtime libwpe and wpebackend-fdo versions
+ https://bugs.webkit.org/show_bug.cgi?id=224298
+
+ Reviewed by Adrian Perez de Castro.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2021-03-26 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.32.0 release
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog (276701 => 276702)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-04-28 09:36:43 UTC (rev 276701)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-04-28 09:36:51 UTC (rev 276702)
@@ -1,3 +1,13 @@
+2021-04-07 Michael Catanzaro <[email protected]>
+
+ [GTK] webkit://gpu should print runtime libwpe and wpebackend-fdo versions
+ https://bugs.webkit.org/show_bug.cgi?id=224298
+
+ Reviewed by Adrian Perez de Castro.
+
+ * UIProcess/API/glib/WebKitProtocolHandler.cpp:
+ (WebKit::WebKitProtocolHandler::handleGPU):
+
2021-03-26 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.32.0 release
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp (276701 => 276702)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp 2021-04-28 09:36:43 UTC (rev 276701)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp 2021-04-28 09:36:51 UTC (rev 276702)
@@ -251,10 +251,18 @@
g_string_append_printf(html,
" <tbody><tr>"
" <td><div class=\"titlename\">WPE version</div></td>"
- " <td>%d.%d.%d (using fdo backend %d.%d.%d)</td>"
+ " <td>%d.%d.%d (build) %d.%d.%d (runtime)</td>"
" </tbody></tr>",
WPE_MAJOR_VERSION, WPE_MINOR_VERSION, WPE_MICRO_VERSION,
- WPE_FDO_MAJOR_VERSION, WPE_FDO_MINOR_VERSION, WPE_FDO_MICRO_VERSION);
+ wpe_get_major_version(), wpe_get_minor_version(), wpe_get_micro_version());
+
+ g_string_append_printf(html,
+ " <tbody><tr>"
+ " <td><div class=\"titlename\">WPEBackend-fdo version</div></td>"
+ " <td>%d.%d.%d (build) %d.%d.%d (runtime)</td>"
+ " </tbody></tr>",
+ WPE_FDO_MAJOR_VERSION, WPE_FDO_MINOR_VERSION, WPE_FDO_MICRO_VERSION,
+ wpe_fdo_get_major_version(), wpe_fdo_get_minor_version(), wpe_fdo_get_micro_version());
}
#endif
#endif
Modified: releases/WebKitGTK/webkit-2.32/Source/cmake/OptionsGTK.cmake (276701 => 276702)
--- releases/WebKitGTK/webkit-2.32/Source/cmake/OptionsGTK.cmake 2021-04-28 09:36:43 UTC (rev 276701)
+++ releases/WebKitGTK/webkit-2.32/Source/cmake/OptionsGTK.cmake 2021-04-28 09:36:51 UTC (rev 276702)
@@ -270,7 +270,7 @@
message(FATAL_ERROR "libwpe is required for USE_WPE_RENDERER")
endif ()
- find_package(WPEBackend_fdo 1.3.1)
+ find_package(WPEBackend_fdo 1.6.0)
if (NOT WPEBACKEND_FDO_FOUND)
message(FATAL_ERROR "WPEBackend-fdo is required for USE_WPE_RENDERER")
endif ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
