[WPE] Implement WebCore::standardUserAgent()

https://bugs.webkit.org/show_bug.cgi?id=175507

Reviewed by Michael Catanzaro.

Remove "_GLIB" from user-agent version macros.

.:

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

Source/WebCore:

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

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

diff --git a/ChangeLog b/ChangeLog
index c1d0d41..d6b9276 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2017-08-14  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Implement WebCore::standardUserAgent()
+        https://bugs.webkit.org/show_bug.cgi?id=175507
+
+        Reviewed by Michael Catanzaro.
+
+        Remove "_GLIB" from user-agent version macros.
+
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsWPE.cmake:
+
 2017-08-13  Adrian Perez de Castro  <aperez@igalia.com>
 
         [WPE] Implement WebCore::standardUserAgent()

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 13f4e43..37b565d 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2017-08-14  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Implement WebCore::standardUserAgent()
+        https://bugs.webkit.org/show_bug.cgi?id=175507
+
+        Reviewed by Michael Catanzaro.
+
+        Remove "_GLIB" from user-agent version macros.
+
+        * platform/glib/UserAgentGLib.cpp:
+        (WebCore::versionForUAString):
+
 2017-08-14  Chris Dumez  <cdumez@apple.com>
 
         Unreviewed, rollout r220622 & r220696

diff --git a/Source/WebCore/platform/glib/UserAgentGLib.cpp b/Source/WebCore/platform/glib/UserAgentGLib.cpp
index c863da6..8eabebe 100644 (file)
--- a/Source/WebCore/platform/glib/UserAgentGLib.cpp
+++ b/Source/WebCore/platform/glib/UserAgentGLib.cpp
@@ -72,7 +72,7 @@ static const String platformVersionForUAString()
 
 static const char* versionForUAString()
 {
-    return USER_AGENT_GLIB_MAJOR_VERSION "." USER_AGENT_GLIB_MINOR_VERSION;
+    return USER_AGENT_MAJOR_VERSION "." USER_AGENT_MINOR_VERSION;
 }
 
 static String buildUserAgentString(const UserAgentQuirks& quirks)

diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 3ac2084..ce61a4f 100644 (file)
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -194,8 +194,8 @@ 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_GLIB_MAJOR_VERSION="604")
-add_definitions(-DUSER_AGENT_GLIB_MINOR_VERSION="1")
+add_definitions(-DUSER_AGENT_MAJOR_VERSION="604")
+add_definitions(-DUSER_AGENT_MINOR_VERSION="1")
 add_definitions(-DWEBKITGTK_API_VERSION_STRING="${WEBKITGTK_API_VERSION}")
 
 set(GTK_LIBRARIES ${GTK3_LIBRARIES})

diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
index 2208cf4..fd3b860 100644 (file)
--- a/Source/cmake/OptionsWPE.cmake
+++ b/Source/cmake/OptionsWPE.cmake
@@ -126,8 +126,8 @@ endif ()
 add_definitions(-DBUILDING_WPE__=1)
 add_definitions(-DGETTEXT_PACKAGE="WPE")
 add_definitions(-DDATA_DIR="${CMAKE_INSTALL_DATADIR}")
-add_definitions(-DUSER_AGENT_GLIB_MAJOR_VERSION="601")
-add_definitions(-DUSER_AGENT_GLIB_MINOR_VERSION="1")
+add_definitions(-DUSER_AGENT_MAJOR_VERSION="601")
+add_definitions(-DUSER_AGENT_MINOR_VERSION="1")
 
 set(USE_UDIS86 1)