Attachment 393766 Details for Bug 162611 – Patch

[patch] Patch

bug-162611-20200317124831.patch (text/plain), 4.32 KB, created by Michael Catanzaro on 2020-03-17 10:48:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2020-03-17 10:48:31 PDT

Size: 4.32 KB

patch

obsolete

>Subversion Revision: 258559
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 553f6d1ec1385dbb56fefde64149bf4bd12f39cc..eb734d24aa2869af5c22cd6e030b9205f0eae402 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2020-03-17  Michael Catanzaro  <mcatanzaro@gnome.org>
>+
>+        [GTK] Allow distributors to brand user agent
>+        https://bugs.webkit.org/show_bug.cgi?id=162611
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/glib/UserAgentGLib.cpp:
>+        (WebCore::buildUserAgentString):
>+
> 2020-03-17  Jacob Uphoff  <jacob_uphoff@apple.com>
> 
>         Unreviewed, reverting r257844.
>diff --git a/Source/WebCore/platform/glib/UserAgentGLib.cpp b/Source/WebCore/platform/glib/UserAgentGLib.cpp
>index 67291624effdfc113bd1a084c0e7df38082cdde9..fdd7a5a95252803dd071ce7ec7bddcf1b9c35f05 100644
>--- a/Source/WebCore/platform/glib/UserAgentGLib.cpp
>+++ b/Source/WebCore/platform/glib/UserAgentGLib.cpp
>@@ -89,6 +89,9 @@ static String buildUserAgentString(const UserAgentQuirks& quirks)
>     else {
>         uaString.append(platformForUAString());
>         uaString.appendLiteral("; ");
>+#if defined(USER_AGENT_BRANDING)
>+        uaString.appendLiteral(USER_AGENT_BRANDING "; ");
>+#endif
>         uaString.append(platformVersionForUAString());
>     }
> 
>@@ -141,7 +144,7 @@ String standardUserAgent(const String& applicationName, const String& applicatio
>             finalApplicationVersion = versionForUAString();
>         userAgent = standardUserAgentStatic() + ' ' + applicationName + '/' + finalApplicationVersion;
>     }
>-    ASSERT(isValidUserAgentHeaderValue(userAgent));
>+    RELEASE_ASSERT(isValidUserAgentHeaderValue(userAgent));
>     return userAgent;
> }
> 
>@@ -153,7 +156,7 @@ String standardUserAgentForURL(const URL& url)
>         return String();
> 
>     String userAgent(buildUserAgentString(quirks));
>-    ASSERT(isValidUserAgentHeaderValue(userAgent));
>+    RELEASE_ASSERT(isValidUserAgentHeaderValue(userAgent));
>     return userAgent;
> }
> 
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index fd367b82638f96e1c1f94ebefe93fbb0439a4fbe..35661abd645e6c1cf9477488e5968094631247ae 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -17,6 +17,11 @@ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKIT
> 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)
>diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
>index 95c383a8c13c66f78f473c76e622ea8fed50a438..1b53d8119681e9041b2d008ec912ded8381154c5 100644
>--- a/Source/cmake/OptionsWPE.cmake
>+++ b/Source/cmake/OptionsWPE.cmake
>@@ -12,6 +12,11 @@ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to
> 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)
>diff --git a/ChangeLog b/ChangeLog
>index 5dcf196e5eb37a0c1761de1012a8f23be563f9a4..441e4b9b5521faada46955160a321851aba1c72d 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2020-03-17  Michael Catanzaro  <mcatanzaro@gnome.org>
>+
>+        [GTK] Allow distributors to brand user agent
>+        https://bugs.webkit.org/show_bug.cgi?id=162611
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add build option for inserting distributor branding into the user agent string.
>+
>+        * Source/cmake/OptionsGTK.cmake:
>+        * Source/cmake/OptionsWPE.cmake:
>+
> 2020-03-17  Philippe Normand  <pnormand@igalia.com>
> 
>         RELEASE_LOG should not be Cocoa specific

Actions: View | Formatted Diff | Diff

Attachments on bug 162611: 289961 | 291809 | 293018 | 392784 | 392785 | 393766 | 393772 | 393776 | 394301 | 394311