[WPE][GTK] Freeze WebKit version in user agent
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2017 15:59:29 +0000 (15:59 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Dec 2017 15:59:29 +0000 (15:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=180475

Reviewed by Carlos Garcia Campos.

.:

* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:

Source/WebCore:

Apple has frozen the WebKit version in its user agent, so we should too, at the same point.

* platform/glib/UserAgentGLib.cpp:
(WebCore::versionForUAString):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@225627 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/platform/glib/UserAgentGLib.cpp
Source/cmake/OptionsGTK.cmake
Source/cmake/OptionsWPE.cmake

index 234933f..438ecd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-12-07  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [WPE][GTK] Freeze WebKit version in user agent
+        https://bugs.webkit.org/show_bug.cgi?id=180475
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsWPE.cmake:
+
 2017-12-05  Stephan Szabo  <stephan.szabo@sony.com>
 
         Switch windows build to Visual Studio 2017
index df839f6..54ce9ee 100644 (file)
@@ -1,5 +1,17 @@
 2017-12-07  Michael Catanzaro  <mcatanzaro@igalia.com>
 
+        [WPE][GTK] Freeze WebKit version in user agent
+        https://bugs.webkit.org/show_bug.cgi?id=180475
+
+        Reviewed by Carlos Garcia Campos.
+
+        Apple has frozen the WebKit version in its user agent, so we should too, at the same point.
+
+        * platform/glib/UserAgentGLib.cpp:
+        (WebCore::versionForUAString):
+
+2017-12-07  Michael Catanzaro  <mcatanzaro@igalia.com>
+
         [WPE][GTK] Update user agent quirk version strings
         https://bugs.webkit.org/show_bug.cgi?id=180474
 
index b3ed684..1621a88 100644 (file)
@@ -69,9 +69,10 @@ static const String platformVersionForUAString()
 #endif
 }
 
-static const char* versionForUAString()
+static inline const char* versionForUAString()
 {
-    return USER_AGENT_MAJOR_VERSION "." USER_AGENT_MINOR_VERSION;
+    // https://bugs.webkit.org/show_bug.cgi?id=180365
+    return "605.1.15";
 }
 
 static String buildUserAgentString(const UserAgentQuirks& quirks)
index 77b112f..14a5572 100644 (file)
@@ -169,8 +169,6 @@ set(ENABLE_PLUGIN_PROCESS ${ENABLE_NETSCAPE_PLUGIN_API})
 add_definitions(-DBUILDING_GTK__=1)
 add_definitions(-DGETTEXT_PACKAGE="WebKit2GTK-${WEBKITGTK_API_VERSION}")
 add_definitions(-DDATA_DIR="${CMAKE_INSTALL_DATADIR}")
-add_definitions(-DUSER_AGENT_MAJOR_VERSION="605")
-add_definitions(-DUSER_AGENT_MINOR_VERSION="1")
 add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
 
 set(GTK_LIBRARIES ${GTK3_LIBRARIES})
index 5225733..4df0e8a 100644 (file)
@@ -82,8 +82,6 @@ endif ()
 add_definitions(-DBUILDING_WPE__=1)
 add_definitions(-DGETTEXT_PACKAGE="WPE")
 add_definitions(-DDATA_DIR="${CMAKE_INSTALL_DATADIR}")
-add_definitions(-DUSER_AGENT_MAJOR_VERSION="605")
-add_definitions(-DUSER_AGENT_MINOR_VERSION="1")
 
 SET_AND_EXPOSE_TO_BUILD(USE_CAIRO TRUE)
 SET_AND_EXPOSE_TO_BUILD(USE_EGL TRUE)