Title: [258877] trunk
- Revision
- 258877
- Author
- commit-qu...@webkit.org
- Date
- 2020-03-23 14:50:48 -0700 (Mon, 23 Mar 2020)
Log Message
[GTK] Allow distributors to brand user agent
https://bugs.webkit.org/show_bug.cgi?id=162611
Patch by Michael Catanzaro <mcatanz...@gnome.org> on 2020-03-23
Reviewed by Adrian Perez de Castro.
.:
Add build option for inserting distributor branding into the user agent string.
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsWPE.cmake:
Source/WebCore:
* platform/glib/UserAgentGLib.cpp:
(WebCore::buildUserAgentString):
Modified Paths
Diff
Modified: trunk/ChangeLog (258876 => 258877)
--- trunk/ChangeLog 2020-03-23 21:28:52 UTC (rev 258876)
+++ trunk/ChangeLog 2020-03-23 21:50:48 UTC (rev 258877)
@@ -1,3 +1,15 @@
+2020-03-23 Michael Catanzaro <mcatanz...@gnome.org>
+
+ [GTK] Allow distributors to brand user agent
+ https://bugs.webkit.org/show_bug.cgi?id=162611
+
+ Reviewed by Adrian Perez de Castro.
+
+ Add build option for inserting distributor branding into the user agent string.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+
2020-03-23 Philippe Normand <pnorm...@igalia.com>
[GTK][WPE] Disable systemd logging by default
Modified: trunk/Source/WebCore/ChangeLog (258876 => 258877)
--- trunk/Source/WebCore/ChangeLog 2020-03-23 21:28:52 UTC (rev 258876)
+++ trunk/Source/WebCore/ChangeLog 2020-03-23 21:50:48 UTC (rev 258877)
@@ -1,3 +1,13 @@
+2020-03-23 Michael Catanzaro <mcatanz...@gnome.org>
+
+ [GTK] Allow distributors to brand user agent
+ https://bugs.webkit.org/show_bug.cgi?id=162611
+
+ Reviewed by Adrian Perez de Castro.
+
+ * platform/glib/UserAgentGLib.cpp:
+ (WebCore::buildUserAgentString):
+
2020-03-23 Dean Jackson <d...@apple.com>
[WebGL] Skip vertexAttrib0 simulation when using ANGLE
Modified: trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp (258876 => 258877)
--- trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp 2020-03-23 21:28:52 UTC (rev 258876)
+++ trunk/Source/WebCore/platform/glib/UserAgentGLib.cpp 2020-03-23 21:50:48 UTC (rev 258877)
@@ -89,6 +89,9 @@
else {
uaString.append(platformForUAString());
uaString.appendLiteral("; ");
+#if defined(USER_AGENT_BRANDING)
+ uaString.appendLiteral(USER_AGENT_BRANDING "; ");
+#endif
uaString.append(platformVersionForUAString());
}
@@ -141,7 +144,15 @@
finalApplicationVersion = versionForUAString();
userAgent = standardUserAgentStatic() + ' ' + applicationName + '/' + finalApplicationVersion;
}
- ASSERT(isValidUserAgentHeaderValue(userAgent));
+
+ static bool checked = false;
+ if (!checked) {
+ // For release builds, we'll only check the first resource load, mainly to ensure that any
+ // configured application details or user agent branding is OK.
+ RELEASE_ASSERT_WITH_MESSAGE(isValidUserAgentHeaderValue(userAgent), "%s is not a valid user agent header", userAgent.utf8().data());
+ checked = true;
+ }
+ ASSERT(isValidUserAgentHeaderValue(userAgent);
return userAgent;
}
Modified: trunk/Source/cmake/OptionsGTK.cmake (258876 => 258877)
--- trunk/Source/cmake/OptionsGTK.cmake 2020-03-23 21:28:52 UTC (rev 258876)
+++ trunk/Source/cmake/OptionsGTK.cmake 2020-03-23 21:50:48 UTC (rev 258877)
@@ -17,6 +17,11 @@
set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0")
set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0")
+set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
+if (USER_AGENT_BRANDING)
+ add_definitions(-DUSER_AGENT_BRANDING="${USER_AGENT_BRANDING}")
+endif ()
+
find_package(Cairo 1.14.0 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(Freetype 2.4.2 REQUIRED)
Modified: trunk/Source/cmake/OptionsWPE.cmake (258876 => 258877)
--- trunk/Source/cmake/OptionsWPE.cmake 2020-03-23 21:28:52 UTC (rev 258876)
+++ trunk/Source/cmake/OptionsWPE.cmake 2020-03-23 21:50:48 UTC (rev 258877)
@@ -12,6 +12,11 @@
set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/wpe-webkit-${WPE_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
+set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
+if (USER_AGENT_BRANDING)
+ add_definitions(-DUSER_AGENT_BRANDING=${USER_AGENT_BRANDING})
+endif ()
+
find_package(Cairo 1.14.0 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(Freetype 2.4.2 REQUIRED)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
