Changeset 268916 in webkit

Timestamp:

Oct 23, 2020, 1:26:08 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r267875 - [GTK] WPE and backend versions are mixed up in webkit://gpu
​https://bugs.webkit.org/show_bug.cgi?id=217210

Patch by Alexander Mikhaylenko <Alexander Mikhaylenko> on 2020-10-02
Reviewed by Adrian Perez de Castro.

• UIProcess/API/glib/WebKitProtocolHandler.cpp:

(WebKit::WebKitProtocolHandler::handleGPU):

Location:

releases/WebKitGTK/webkit-2.30/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/glib/WebKitProtocolHandler.cpp (modified) (1 diff)

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

@@ +1 @@
+2020-10-02  Alexander Mikhaylenko  <alexm@gnome.org>
+
+        [GTK] WPE and backend versions are mixed up in webkit://gpu
+        https://bugs.webkit.org/show_bug.cgi?id=217210
+
+        Reviewed by Adrian Perez de Castro.
+
+        * UIProcess/API/glib/WebKitProtocolHandler.cpp:
+        (WebKit::WebKitProtocolHandler::handleGPU):
+
 2020-10-14  Sergio Villar Senin  <svillar@igalia.com>
 

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

@@ -253 +253 @@
             "  <td>%d.%d.%d (using fdo backend %d.%d.%d)</td>"
             " </tbody></tr>",
-            WPE_FDO_MAJOR_VERSION, WPE_FDO_MINOR_VERSION, WPE_FDO_MICRO_VERSION,
-            WPE_MAJOR_VERSION, WPE_MINOR_VERSION, WPE_MICRO_VERSION);
+            WPE_MAJOR_VERSION, WPE_MINOR_VERSION, WPE_MICRO_VERSION,
+            WPE_FDO_MAJOR_VERSION, WPE_FDO_MINOR_VERSION, WPE_FDO_MICRO_VERSION);
     }
 #endif