Title: [275634] trunk
Revision
275634
Author
commit-qu...@webkit.org
Date
2021-04-07 15:18:03 -0700 (Wed, 07 Apr 2021)

Log Message

[GTK] webkit://gpu should print runtime libwpe and wpebackend-fdo versions
https://bugs.webkit.org/show_bug.cgi?id=224298

Patch by Michael Catanzaro <mcatanz...@gnome.org> 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: trunk/ChangeLog (275633 => 275634)


--- trunk/ChangeLog	2021-04-07 22:17:55 UTC (rev 275633)
+++ trunk/ChangeLog	2021-04-07 22:18:03 UTC (rev 275634)
@@ -1,3 +1,12 @@
+2021-04-07  Michael Catanzaro  <mcatanz...@gnome.org>
+
+        [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-04-07  Don Olmstead  <don.olmst...@sony.com>
 
         [CMake] Mark _LIBRARY not _LIBRARIES in find modules

Modified: trunk/Source/WebKit/ChangeLog (275633 => 275634)


--- trunk/Source/WebKit/ChangeLog	2021-04-07 22:17:55 UTC (rev 275633)
+++ trunk/Source/WebKit/ChangeLog	2021-04-07 22:18:03 UTC (rev 275634)
@@ -1,3 +1,13 @@
+2021-04-07  Michael Catanzaro  <mcatanz...@gnome.org>
+
+        [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-04-07  Brent Fulgham  <bfulg...@apple.com>
 
         [Cocoa] Incorrect selector used to set logging level

Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp (275633 => 275634)


--- trunk/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp	2021-04-07 22:17:55 UTC (rev 275633)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp	2021-04-07 22:18:03 UTC (rev 275634)
@@ -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: trunk/Source/cmake/OptionsGTK.cmake (275633 => 275634)


--- trunk/Source/cmake/OptionsGTK.cmake	2021-04-07 22:17:55 UTC (rev 275633)
+++ trunk/Source/cmake/OptionsGTK.cmake	2021-04-07 22:18:03 UTC (rev 275634)
@@ -277,7 +277,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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to