Changeset 276702 in webkit

Timestamp:

Apr 28, 2021, 2:36:51 AM (5 years ago)

Author:

Adrian Perez de Castro

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 <Michael Catanzaro> on 2021-04-07
Reviewed by Adrian Perez de Castro.

.:

• Source/cmake/OptionsGTK.cmake:

Source/WebKit:

• UIProcess/API/glib/WebKitProtocolHandler.cpp:

(WebKit::WebKitProtocolHandler::handleGPU):

Location:

releases/WebKitGTK/webkit-2.32

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

releases/WebKitGTK/webkit-2.32/ChangeLog

@@ +1 @@
+2021-04-07  Michael Catanzaro  <mcatanzaro@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-03-26  Adrian Perez de Castro  <aperez@igalia.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-07  Michael Catanzaro  <mcatanzaro@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-03-26  Adrian Perez de Castro  <aperez@igalia.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp

@@ -252 +252 @@
             " <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

releases/WebKitGTK/webkit-2.32/Source/cmake/OptionsGTK.cmake

@@ -271 +271 @@
     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")