Title: [225627] trunk
- Revision
- 225627
- Author
- [email protected]
- Date
- 2017-12-07 07:59:29 -0800 (Thu, 07 Dec 2017)
Log Message
[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:
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):
Modified Paths
Diff
Modified: trunk/ChangeLog (225626 => 225627)
--- trunk/ChangeLog 2017-12-07 15:36:37 UTC (rev 225626)
+++ trunk/ChangeLog 2017-12-07 15:59:29 UTC (rev 225627)
@@ -1,3 +1,13 @@
+2017-12-07 Michael Catanzaro <[email protected]>
+
+ [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 <[email protected]>
Switch windows build to Visual Studio 2017
Modified: trunk/Source/WebCore/ChangeLog (225626 => 225627)
--- trunk/Source/WebCore/ChangeLog 2017-12-07 15:36:37 UTC (rev 225626)
+++ trunk/Source/WebCore/ChangeLog 2017-12-07 15:59:29 UTC (rev 225627)
@@ -1,5 +1,17 @@
2017-12-07 Michael Catanzaro <[email protected]>
+ [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 <[email protected]>
+
[WPE][GTK] Update user agent quirk version strings
https://bugs.webkit.org/show_bug.cgi?id=180474
Modified: trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp (225626 => 225627)
--- trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp 2017-12-07 15:36:37 UTC (rev 225626)
+++ trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp 2017-12-07 15:59:29 UTC (rev 225627)
@@ -69,9 +69,10 @@
#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)
Modified: trunk/Source/cmake/OptionsGTK.cmake (225626 => 225627)
--- trunk/Source/cmake/OptionsGTK.cmake 2017-12-07 15:36:37 UTC (rev 225626)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-12-07 15:59:29 UTC (rev 225627)
@@ -169,8 +169,6 @@
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})
Modified: trunk/Source/cmake/OptionsWPE.cmake (225626 => 225627)
--- trunk/Source/cmake/OptionsWPE.cmake 2017-12-07 15:36:37 UTC (rev 225626)
+++ trunk/Source/cmake/OptionsWPE.cmake 2017-12-07 15:59:29 UTC (rev 225627)
@@ -82,8 +82,6 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
