[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/

[Mike Gilbert]

commit:     e99cd36078a29de594241aa44b7de3f3ce353db9
Author:     Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Tue Oct 29 14:08:48 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 20:11:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e99cd360

www-client/chromium: dev channel bump to 79.0.3945.8

Closes: https://github.com/gentoo/gentoo/pull/13487
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 www-client/chromium/Manifest                       |   2 +-
 ...0.3941.4.ebuild => chromium-79.0.3945.8.ebuild} |   3 +-
 .../chromium-79-gcc-ambiguous-nodestructor.patch   |  32 +++-
 .../files/chromium-79-gcc-name-clash.patch         | 135 ++++++++++++++++
 .../files/chromium-79-gcc-permissive.patch         |  14 --
 .../chromium/files/chromium-79-include.patch       | 151 +++++++++++------
 .../files/chromium-79-swiftshader-linux.patch      | 180 ---------------------
 7 files changed, 272 insertions(+), 245 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index f2606637827..6cab752dd46 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,3 @@
 DIST chromium-78-revert-noexcept-r1.patch.gz 12094 BLAKE2B 1fd0c939af773ed398c9ab14fa80b042b4237cabdbcb06425e4d1c72200ec49c3c1383cfc95013cce4df411b0a2397b79030d41a0379ae80a0c60bae1fbb5ffa SHA512 dcb62b82b34d5d6982762cacfe3ab7d3538d908b3befe7666f5d70d98ba4f979b5bf056e5c5343ed76aa744a643318fc5a75ddedfcb1b7de3e7c28eb2587439f
 DIST chromium-78.0.3904.70.tar.xz 742787108 BLAKE2B 623a0359f461672d8d6c97b4703f5b50c6ac423350ba96b7f37582be38d9cc66674e441b506405bc5f136df19df886036ef5abae4b8c2e4e953ec296e2a25bb4 SHA512 95d926ea92a0e744284a4c5fca619e3a067dd0fdfaa7c05b5a069d2a8d1159bf849335e21e5803bd28175c1994bd4ff15337ad0a3063445fab74eef113275545
-DIST chromium-79.0.3941.4.tar.xz 772100680 BLAKE2B 2a510529ae9a58c2c831bd293eb1a9ea276422da6f49741be208bcf8c17eafa0e47c0adf8e3f1148f3da821188315e9d6c7f2de1c44dd844f5d481be17b35ef7 SHA512 5847f7c647737ea96c27f859e5b763100c4d0ecff83eb33d81d144e3be16a5a709290a66fa6754b8a38be68c850dee4be0abc2419f5a50e0cf22bc37a0563c80
+DIST chromium-79.0.3945.8.tar.xz 777902956 BLAKE2B eba9e94c9305a5fe9aaf8848456a69427219a29b139217d9b5409a35cb4a508d217fe82c08e3bc9325675180bfe7d7c93d583adf9d8ad6c04de1209b2305a1d3 SHA512 78358d0dbb8bd574c450f5443b7dfc888ea89ad9fa9da156106d260f1b3921deb6f5a50931c689c1855c9ffdef5e001d8636e8a00d416c9e9efe8bea2a8dfc6d

diff --git a/www-client/chromium/chromium-79.0.3941.4.ebuild b/www-client/chromium/chromium-79.0.3945.8.ebuild
similarity index 99%
rename from www-client/chromium/chromium-79.0.3941.4.ebuild
rename to www-client/chromium/chromium-79.0.3945.8.ebuild
index 9e2a2c46130..cf14a286871 100644
--- a/www-client/chromium/chromium-79.0.3941.4.ebuild
+++ b/www-client/chromium/chromium-79.0.3945.8.ebuild
@@ -144,14 +144,13 @@ PATCHES=(
 	"${FILESDIR}/chromium-fix-char_traits.patch"
 	"${FILESDIR}/chromium-unbundle-zlib-r1.patch"
 	"${FILESDIR}/chromium-77-system-icu.patch"
-	"${FILESDIR}/chromium-78-pm-crash.patch"
 	"${FILESDIR}/chromium-78-icon.patch"
 	"${FILESDIR}/chromium-78-protobuf-export.patch"
-	"${FILESDIR}/chromium-79-swiftshader-linux.patch"
 	"${FILESDIR}/chromium-79-system-hb.patch"
 	"${FILESDIR}/chromium-79-include.patch"
 	"${FILESDIR}/chromium-79-icu-65.patch"
 	"${FILESDIR}/chromium-79-gcc-ambiguous-nodestructor.patch"
+	"${FILESDIR}/chromium-79-gcc-name-clash.patch"
 	"${FILESDIR}/chromium-79-gcc-permissive.patch"
 	"${FILESDIR}/chromium-79-gcc-alignas.patch"
 )

diff --git a/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch b/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch
index 24504325e46..d43a091b971 100644
--- a/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch
+++ b/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch
@@ -1,13 +1,39 @@
+From af77dc4014ead3d898fdc8a7a70fe5063ac9b102 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena@×××.com>
+Date: Fri, 25 Oct 2019 19:01:29 +0000
+Subject: [PATCH] GCC: use brace-initializer for DohUpgrade vector
+
+Constructing NoDestructor with parenthesis constructor is ambiguous
+in GCC. Use brace-initializer to avoid that problem. This fixes this
+build error:
+
+Bug: 819294
+Change-Id: I00dda42daa1794d11e022f26ac07f92e599d106d
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879910
+Reviewed-by: Eric Orth <ericorth@××××××××.org>
+Commit-Queue: José Dapena Paz <jose.dapena@×××.com>
+Cr-Commit-Position: refs/heads/master@{#709569}
+---
+
 diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc
-index 14997c4..1543e91 100644
+index 14997c4..637b6f2 100644
 --- a/net/dns/dns_util.cc
 +++ b/net/dns/dns_util.cc
-@@ -144,7 +144,7 @@ const std::vector<DohUpgradeEntry>& GetDohUpgradeList() {
+@@ -144,7 +144,7 @@
    // DohProviderId histogram suffix list in
    // tools/metrics/histograms/histograms.xml.
    static const base::NoDestructor<std::vector<DohUpgradeEntry>>
 -      upgradable_servers({
-+      upgradable_servers(std::initializer_list<DohUpgradeEntry>{
++      upgradable_servers{{
            DohUpgradeEntry(
                "CleanBrowsingAdult",
                {"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1",
+@@ -215,7 +215,7 @@
+               {"9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9"},
+               {"dns.quad9.net", "dns9.quad9.net"} /* DoT hostname */,
+               {"https://dns.quad9.net/dns-query", true /* use_post */}),
+-      });
++      }};
+   return *upgradable_servers;
+ }
+ 

diff --git a/www-client/chromium/files/chromium-79-gcc-name-clash.patch b/www-client/chromium/files/chromium-79-gcc-name-clash.patch
new file mode 100644
index 00000000000..2324f4db7f9
--- /dev/null
+++ b/www-client/chromium/files/chromium-79-gcc-name-clash.patch
@@ -0,0 +1,135 @@
+From e925deab264e5ebc3c5c13415aa3d44a746e8d45 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena@×××.com>
+Date: Fri, 25 Oct 2019 14:53:51 +0000
+Subject: [PATCH] GCC: avoid clash of WebThemeEngine::ForcedColors with ForcedColors enum class
+
+GCC fails to build because the declaration of the enum class ForcedColors
+clashes with the GetForcedColors method.
+
+Bug: 819294
+Change-Id: I5c7647978d15c771f5372a8c70ac6aeb2284fb2f
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879452
+Reviewed-by: Kentaro Hara <haraken@××××××××.org>
+Commit-Queue: José Dapena Paz <jose.dapena@×××.com>
+Cr-Commit-Position: refs/heads/master@{#709469}
+
+(backported to M79)
+---
+
+diff --git a/content/child/webthemeengine_impl_android.cc b/content/child/webthemeengine_impl_android.cc
+index 2e703d6..3759f6c 100644
+--- a/content/child/webthemeengine_impl_android.cc
++++ b/content/child/webthemeengine_impl_android.cc
+@@ -228,7 +228,7 @@ void WebThemeEngineAndroid::Paint(
+       native_theme_extra_params, NativeColorScheme(color_scheme));
+ }
+ 
+-blink::ForcedColors WebThemeEngineAndroid::ForcedColors() const {
++blink::ForcedColors WebThemeEngineAndroid::GetForcedColors() const {
+   return forced_colors_;
+ }
+ 
+diff --git a/content/child/webthemeengine_impl_android.h b/content/child/webthemeengine_impl_android.h
+index 0c113a88..95e2744 100644
+--- a/content/child/webthemeengine_impl_android.h
++++ b/content/child/webthemeengine_impl_android.h
+@@ -22,7 +22,7 @@
+              const blink::WebRect& rect,
+              const blink::WebThemeEngine::ExtraParams* extra_params,
+              blink::WebColorScheme color_scheme) override;
+-  blink::ForcedColors ForcedColors() const override;
++  blink::ForcedColors GetForcedColors() const override;
+   void SetForcedColors(const blink::ForcedColors forced_colors) override;
+   blink::PreferredColorScheme PreferredColorScheme() const override;
+   void SetPreferredColorScheme(
+diff --git a/content/child/webthemeengine_impl_default.cc b/content/child/webthemeengine_impl_default.cc
+index 84db298..04af6c6 100644
+--- a/content/child/webthemeengine_impl_default.cc
++++ b/content/child/webthemeengine_impl_default.cc
+@@ -232,7 +232,7 @@
+ }
+ #endif
+ 
+-blink::ForcedColors WebThemeEngineDefault::ForcedColors() const {
++blink::ForcedColors WebThemeEngineDefault::GetForcedColors() const {
+   return ui::NativeTheme::GetInstanceForWeb()->UsesHighContrastColors()
+              ? blink::ForcedColors::kActive
+              : blink::ForcedColors::kNone;
+diff --git a/content/child/webthemeengine_impl_default.h b/content/child/webthemeengine_impl_default.h
+index 73579db..1f08f67 100644
+--- a/content/child/webthemeengine_impl_default.h
++++ b/content/child/webthemeengine_impl_default.h
+@@ -39,7 +39,7 @@
+                                     int32_t vertical_arrow_bitmap_height,
+                                     int32_t horizontal_arrow_bitmap_width);
+ #endif
+-  blink::ForcedColors ForcedColors() const override;
++  blink::ForcedColors GetForcedColors() const override;
+   void SetForcedColors(const blink::ForcedColors forced_colors) override;
+   blink::PreferredColorScheme PreferredColorScheme() const override;
+   void SetPreferredColorScheme(
+diff --git a/content/child/webthemeengine_impl_mac.cc b/content/child/webthemeengine_impl_mac.cc
+index 9cb279e..553eedb 100644
+--- a/content/child/webthemeengine_impl_mac.cc
++++ b/content/child/webthemeengine_impl_mac.cc
+@@ -6,7 +6,7 @@
+ 
+ namespace content {
+ 
+-blink::ForcedColors WebThemeEngineMac::ForcedColors() const {
++blink::ForcedColors WebThemeEngineMac::GetForcedColors() const {
+   return forced_colors_;
+ }
+ 
+diff --git a/content/child/webthemeengine_impl_mac.h b/content/child/webthemeengine_impl_mac.h
+index b3dafa1..c0b66c0 100644
+--- a/content/child/webthemeengine_impl_mac.h
++++ b/content/child/webthemeengine_impl_mac.h
+@@ -13,7 +13,7 @@
+  public:
+   ~WebThemeEngineMac() override {}
+ 
+-  blink::ForcedColors ForcedColors() const override;
++  blink::ForcedColors GetForcedColors() const override;
+   void SetForcedColors(const blink::ForcedColors forced_colors) override;
+   blink::PreferredColorScheme PreferredColorScheme() const override;
+   void SetPreferredColorScheme(
+diff --git a/third_party/blink/public/platform/web_theme_engine.h b/third_party/blink/public/platform/web_theme_engine.h
+index d642462..aa2da1b 100644
+--- a/third_party/blink/public/platform/web_theme_engine.h
++++ b/third_party/blink/public/platform/web_theme_engine.h
+@@ -227,7 +227,7 @@
+     return base::nullopt;
+   }
+ 
+-  virtual ForcedColors ForcedColors() const { return ForcedColors::kNone; }
++  virtual ForcedColors GetForcedColors() const { return ForcedColors::kNone; }
+   virtual void SetForcedColors(const blink::ForcedColors forced_colors) {}
+   virtual blink::PreferredColorScheme PreferredColorScheme() const {
+     return PreferredColorScheme::kNoPreference;
+diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/blink/renderer/core/css/media_values.cc
+index 045d793..f7c0484 100644
+--- a/third_party/blink/renderer/core/css/media_values.cc
++++ b/third_party/blink/renderer/core/css/media_values.cc
+@@ -221,7 +221,7 @@
+ 
+ ForcedColors MediaValues::CalculateForcedColors() {
+   if (Platform::Current() && Platform::Current()->ThemeEngine())
+-    return Platform::Current()->ThemeEngine()->ForcedColors();
++    return Platform::Current()->ThemeEngine()->GetForcedColors();
+   else
+     return ForcedColors::kNone;
+ }
+diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
+index 64b0d23..02cce1f 100644
+--- a/third_party/blink/renderer/core/dom/document.cc
++++ b/third_party/blink/renderer/core/dom/document.cc
+@@ -8625,7 +8625,7 @@
+ bool Document::InForcedColorsMode() const {
+   return RuntimeEnabledFeatures::ForcedColorsEnabled() && Platform::Current() &&
+          Platform::Current()->ThemeEngine() &&
+-         Platform::Current()->ThemeEngine()->ForcedColors() !=
++         Platform::Current()->ThemeEngine()->GetForcedColors() !=
+              ForcedColors::kNone;
+ }
+ 

diff --git a/www-client/chromium/files/chromium-79-gcc-permissive.patch b/www-client/chromium/files/chromium-79-gcc-permissive.patch
index e98f6f0ae38..c42d56985a6 100644
--- a/www-client/chromium/files/chromium-79-gcc-permissive.patch
+++ b/www-client/chromium/files/chromium-79-gcc-permissive.patch
@@ -1,17 +1,3 @@
-diff --git a/third_party/blink/public/platform/web_theme_engine.h b/third_party/blink/public/platform/web_theme_engine.h
-index 2b55c0b..f33d224 100644
---- a/third_party/blink/public/platform/web_theme_engine.h
-+++ b/third_party/blink/public/platform/web_theme_engine.h
-@@ -226,7 +226,7 @@ class WebThemeEngine {
-     return base::nullopt;
-   }
- 
--  virtual ForcedColors ForcedColors() const { return ForcedColors::kNone; }
-+  virtual enum ForcedColors ForcedColors() const { return ForcedColors::kNone; }
-   virtual void SetForcedColors(const blink::ForcedColors forced_colors) {}
- };
- 
-
 From 528e9a3e1f25bd264549c4c7779748abfd16bb1c Mon Sep 17 00:00:00 2001
 From: Jan Wilken Dörrie <jdoerrie@××××××××.org>
 Date: Fri, 18 Oct 2019 11:45:24 +0000

diff --git a/www-client/chromium/files/chromium-79-include.patch b/www-client/chromium/files/chromium-79-include.patch
index 06decbdf06d..8f2fb56176a 100644
--- a/www-client/chromium/files/chromium-79-include.patch
+++ b/www-client/chromium/files/chromium-79-include.patch
@@ -1,59 +1,64 @@
-From d26e3fc037f477648b6265ff9cdcb2c616942fae Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com>
-Date: Tue, 15 Oct 2019 14:56:07 +0000
-Subject: [PATCH] ui/display: Include <bitset> for std::bitset
+From f7c177d35242311ea7a2cf49a0980c61664f27ba Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena@×××.com>
+Date: Fri, 25 Oct 2019 15:07:09 +0000
+Subject: [PATCH] IWYU: include algorithm to use std::lower_bound in ui/gfx/font.cc
 
-Follow-up to commit 1b7e6d75f ("ui/display: extend EdidParser for HDR
-metadata") to fix the build with libstdc++ (and maybe MSVC):
+Fix GCC build because of missing include:
+../../ui/gfx/font.cc: In function ‘gfx::Font::Weight gfx::FontWeightFromInt(int)’:
+../../ui/gfx/font.cc:114:8: error: no matching function for call to ‘lower_bound(const gfx::Font::Weight*, const gfx::Font::Weight*, int&, gfx::FontWeightFromInt(int)::<lambda(const gfx::Font::Weight&, const int&)>)’
+       });
+        ^
+In file included from /usr/include/c++/8/bits/char_traits.h:39,
+                 from /usr/include/c++/8/string:40,
+                 from ../../ui/gfx/font.h:8,
+                 from ../../ui/gfx/font.cc:5:
+/usr/include/c++/8/bits/stl_algobase.h:984:5: note: candidate: ‘template<class _ForwardIterator, class _Tp> _ForwardIterator std::lower_bound(_ForwardIterator, _ForwardIterator, const _Tp&)’
+     lower_bound(_ForwardIterator __first, _ForwardIterator __last,
+     ^~~~~~~~~~~
+/usr/include/c++/8/bits/stl_algobase.h:984:5: note:   template argument deduction/substitution failed:
+../../ui/gfx/font.cc:114:8: note:   candidate expects 3 arguments, 4 provided
+       });
+        ^
 
-./../../ui/display/util/edid_parser.cc:416:22: error: no template named 'bitset' in namespace 'std'
-          const std::bitset<kMaxNumColorimetryEntries>
-                ~~~~~^
-./../../ui/display/util/edid_parser.cc:430:22: error: no template named 'bitset' in namespace 'std'
-          const std::bitset<kMaxNumHDRStaticMedatataEntries>
-                ~~~~~^
-
-Bug: 957519, 1012846
-Change-Id: Ic3c9c9416ac446bde9f190b9575ef1a386aa8e8e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862917
-Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com>
-Commit-Queue: Miguel Casas <mcasas@××××××××.org>
-Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com>
-Reviewed-by: Miguel Casas <mcasas@××××××××.org>
-Cr-Commit-Position: refs/heads/master@{#705965}
----
-
-diff --git a/ui/display/util/edid_parser.cc b/ui/display/util/edid_parser.cc
-index 44f2fdb..1adebb7 100644
---- a/ui/display/util/edid_parser.cc
-+++ b/ui/display/util/edid_parser.cc
-@@ -7,6 +7,7 @@
- #include <stddef.h>
- 
- #include <algorithm>
-+#include <bitset>
- 
- #include "base/hash/hash.h"
- #include "base/strings/string_util.h"
-
-IWYU: add missing algorithm
+Bug: 819294
+Change-Id: Ic59dcf3a06bdd54d1d426c08a61624873a0ff30c
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879909
+Commit-Queue: Alexei Svitkine <asvitkine@××××××××.org>
+Reviewed-by: Alexei Svitkine <asvitkine@××××××××.org>
+Cr-Commit-Position: refs/heads/master@{#709472}
 ---
 
 diff --git a/ui/gfx/font.cc b/ui/gfx/font.cc
-index 21367fd..085baeb 100644
+index 21367fd7..92b159e 100644
 --- a/ui/gfx/font.cc
 +++ b/ui/gfx/font.cc
-@@ -8,6 +8,8 @@
- #include "build/build_config.h"
- #include "ui/gfx/platform_font.h"
+@@ -4,6 +4,8 @@
+ 
+ #include "ui/gfx/font.h"
  
 +#include <algorithm>
 +
- namespace gfx {
- 
- ////////////////////////////////////////////////////////////////////////////////
+ #include "base/strings/utf_string_conversions.h"
+ #include "build/build_config.h"
+ #include "ui/gfx/platform_font.h"
 
-IWYU: add missing vector
+From 97eb905ba262382bc3583078761c68f4452aea71 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena@×××.com>
+Date: Fri, 25 Oct 2019 09:27:53 +0000
+Subject: [PATCH] IWYU: launch_manager.h uses std::vector
+
+Add #include <vector> for using std::vector. This fixes GCC build.
+
+./../chrome/browser/apps/launch_service/launch_manager.h:46:15: error: ‘vector’ in namespace ‘std’ does not name a template type
+   static std::vector<base::FilePath> GetLaunchFilesFromCommandLine(
+               ^~~~~~
+
+Bug: 819294
+Change-Id: I02ec3a2914a8fbe3aa0041017a0228f4b0ca1ec9
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879289
+Reviewed-by: Alexey Baskakov <loyso@××××××××.org>
+Commit-Queue: José Dapena Paz <jose.dapena@×××.com>
+Cr-Commit-Position: refs/heads/master@{#709411}
 ---
 
 diff --git a/chrome/browser/apps/launch_service/launch_manager.h b/chrome/browser/apps/launch_service/launch_manager.h
@@ -68,3 +73,59 @@ index 00aeb9d..76570ea 100644
  
  #include "base/macros.h"
  
+From e7407ce7fa262e9fd1a19dd0957e5a950520ee3a Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena@×××.com>
+Date: Fri, 25 Oct 2019 08:25:45 +0000
+Subject: [PATCH] IWYU: include cstdint in register_context.h as it uses uintptr_t
+
+GCC build fix as build fails with this:
+../../base/profiler/register_context.h:31:1: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
+ uintptr_t& AsUintPtr(T* value) {
+ ^~~~~~~~~
+ intptr_t
+../../base/profiler/register_context.h:110:3: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
+   uintptr_t stack_pointer;
+   ^~~~~~~~~
+   intptr_t
+../../base/profiler/register_context.h:111:3: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
+   uintptr_t frame_pointer;
+   ^~~~~~~~~
+   intptr_t
+../../base/profiler/register_context.h:112:3: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
+   uintptr_t instruction_pointer;
+   ^~~~~~~~~
+   intptr_t
+../../base/profiler/register_context.h:115:8: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
+ inline uintptr_t& RegisterContextStackPointer(RegisterContext* context) {
+        ^~~~~~~~~
+        intptr_t
+../../base/profiler/register_context.h:119:8: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
+ inline uintptr_t& RegisterContextFramePointer(RegisterContext* context) {
+        ^~~~~~~~~
+        intptr_t
+../../base/profiler/register_context.h:123:8: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
+ inline uintptr_t& RegisterContextInstructionPointer(RegisterContext* context) {
+        ^~~~~~~~~
+        intptr_t
+
+
+Bug: 819294
+Change-Id: I49567b00a6f021686c52053a22fb9c502c84f1bc
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879908
+Reviewed-by: Mike Wittman <wittman@××××××××.org>
+Commit-Queue: José Dapena Paz <jose.dapena@×××.com>
+Cr-Commit-Position: refs/heads/master@{#709398}
+---
+
+diff --git a/base/profiler/register_context.h b/base/profiler/register_context.h
+index 46c4250..7dd86ff 100644
+--- a/base/profiler/register_context.h
++++ b/base/profiler/register_context.h
+@@ -9,6 +9,7 @@
+ #ifndef BASE_PROFILER_REGISTER_CONTEXT_H_
+ #define BASE_PROFILER_REGISTER_CONTEXT_H_
+ 
++#include <cstdint>
+ #include <type_traits>
+ 
+ #include "build/build_config.h"

diff --git a/www-client/chromium/files/chromium-79-swiftshader-linux.patch b/www-client/chromium/files/chromium-79-swiftshader-linux.patch
deleted file mode 100644
index 3219dcd254b..00000000000
--- a/www-client/chromium/files/chromium-79-swiftshader-linux.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 74acd924593c427e5d3528d9ca6fdf2f4cd1383a Mon Sep 17 00:00:00 2001
-From: David 'Digit' Turner <digit@××××××.com>
-Date: Mon, 14 Oct 2019 15:28:36 +0200
-Subject: [PATCH] [linux]: Remove linux namespace.
-
-'linux' turns out to be a prebuilt macro for GCC (not Clang)
-so using "namespace linux { ... }" actually does not compile.
-
-This CL fixes the issue by removing the namespace, and using
-Linux as a prefix for the corresponding class.
-
-Bug: 140419396
-Change-Id: I1e980bc66b2cf8f2e21d9f7076918e2b476ae4d4
----
-
-diff --git a/third_party/swiftshader/src/System/Linux/MemFd.cpp b/third_party/swiftshader/src/System/Linux/MemFd.cpp
-index 22b77e4..a8f99e2 100644
---- a/third_party/swiftshader/src/System/Linux/MemFd.cpp
-+++ b/third_party/swiftshader/src/System/Linux/MemFd.cpp
-@@ -37,21 +37,18 @@
- #define __NR_memfd_create 319
- #endif /* __NR_memfd_create__ */
- 
--namespace linux
--{
--
--MemFd::~MemFd()
-+LinuxMemFd::~LinuxMemFd()
- {
- 	close();
- }
- 
--void MemFd::importFd(int fd)
-+void LinuxMemFd::importFd(int fd)
- {
- 	close();
- 	fd_ = fd;
- }
- 
--int MemFd::exportFd() const
-+int LinuxMemFd::exportFd() const
- {
- 	if (fd_ < 0)
- 	{
-@@ -62,7 +59,7 @@
- 	return ::fcntl(fd_, F_DUPFD_CLOEXEC, 0);
- }
- 
--bool MemFd::allocate(const char* name, size_t size)
-+bool LinuxMemFd::allocate(const char* name, size_t size)
- {
- 	close();
- 
-@@ -89,7 +86,7 @@
- 	return true;
- }
- 
--void MemFd::close()
-+void LinuxMemFd::close()
- {
- 	if (fd_ >= 0)
- 	{
-@@ -97,23 +94,21 @@
- 		// https://lwn.net/Articles/576478/ for example.
- 		int ret = ::close(fd_);
- 		if (ret < 0) {
--			TRACE("MemFd::close() failed with: %s", strerror(errno));
-+			TRACE("LinuxMemFd::close() failed with: %s", strerror(errno));
- 			assert(false);
- 		}
- 		fd_ = -1;
- 	}
- }
- 
--void* MemFd::mapReadWrite(size_t offset, size_t size)
-+void* LinuxMemFd::mapReadWrite(size_t offset, size_t size)
- {
- 	void* addr = ::mmap(nullptr, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd_,
- 						static_cast<off_t>(offset));
- 	return (addr == MAP_FAILED) ? nullptr : addr;
- }
- 
--bool MemFd::unmap(void* addr, size_t size)
-+bool LinuxMemFd::unmap(void* addr, size_t size)
- {
- 	return ::munmap(addr, size) == 0;
- }
--
--}  // namespace linux
-diff --git a/third_party/swiftshader/src/System/Linux/MemFd.hpp b/third_party/swiftshader/src/System/Linux/MemFd.hpp
-index 8b88473..209d642 100644
---- a/third_party/swiftshader/src/System/Linux/MemFd.hpp
-+++ b/third_party/swiftshader/src/System/Linux/MemFd.hpp
-@@ -22,18 +22,15 @@
- // supported by the Linux kernel since 3.17 (good enough for Android and desktop
- // Linux).
- 
--namespace linux
--{
--
--class MemFd {
-+class LinuxMemFd {
- public:
--	MemFd() = default;
-+	LinuxMemFd() = default;
- 
--	MemFd(const char* name, size_t size) : MemFd() {
-+	LinuxMemFd(const char* name, size_t size) : LinuxMemFd() {
- 		allocate(name, size);
- 	}
- 
--	~MemFd();
-+	~LinuxMemFd();
- 
- 	// Return true iff the region is valid/allocated.
- 	bool isValid() const { return fd_ >= 0; }
-@@ -68,6 +65,4 @@
- 	int fd_ = -1;
- };
- 
--}  // namespace linux
--
- #endif  // MEMFD_LINUX
-diff --git a/third_party/swiftshader/tests/SystemUnitTests/unittests.cpp b/third_party/swiftshader/tests/SystemUnitTests/unittests.cpp
-index 53ff9ec..9026b55 100644
---- a/third_party/swiftshader/tests/SystemUnitTests/unittests.cpp
-+++ b/third_party/swiftshader/tests/SystemUnitTests/unittests.cpp
-@@ -26,14 +26,14 @@
- 
- #ifdef __linux__
- TEST(MemFd, DefaultConstructor) {
--	linux::MemFd memfd;
-+	LinuxMemFd memfd;
- 	ASSERT_FALSE(memfd.isValid());
- 	ASSERT_EQ(-1, memfd.exportFd());
- }
- 
- TEST(MemFd, AllocatingConstructor) {
- 	const size_t kRegionSize = sw::memoryPageSize() * 8;
--	linux::MemFd memfd("test-region", kRegionSize);
-+	LinuxMemFd memfd("test-region", kRegionSize);
- 	ASSERT_TRUE(memfd.isValid());
- 	ASSERT_GE(memfd.fd(), 0);
- 	void* addr = memfd.mapReadWrite(0, kRegionSize);
-@@ -43,7 +43,7 @@
- 
- TEST(MemFd, ExplicitAllocation) {
- 	const size_t kRegionSize = sw::memoryPageSize() * 8;
--	linux::MemFd memfd;
-+	LinuxMemFd memfd;
- 	ASSERT_FALSE(memfd.isValid());
- 	ASSERT_EQ(-1, memfd.exportFd());
- 	ASSERT_TRUE(memfd.allocate("test-region", kRegionSize));
-@@ -52,7 +52,7 @@
- 
- TEST(MemFd, Close) {
- 	const size_t kRegionSize = sw::memoryPageSize() * 8;
--	linux::MemFd memfd("test-region", kRegionSize);
-+	LinuxMemFd memfd("test-region", kRegionSize);
- 	ASSERT_TRUE(memfd.isValid());
- 	int fd = memfd.exportFd();
- 	memfd.close();
-@@ -63,7 +63,7 @@
- 
- TEST(MemFd, ExportImportFd) {
- 	const size_t kRegionSize = sw::memoryPageSize() * 8;
--	linux::MemFd memfd("test-region1", kRegionSize);
-+	LinuxMemFd memfd("test-region1", kRegionSize);
- 	auto* addr = reinterpret_cast<uint8_t*>(memfd.mapReadWrite(0, kRegionSize));
- 	ASSERT_TRUE(addr);
- 	for (size_t n = 0; n < kRegionSize; ++n)
-@@ -74,7 +74,7 @@
- 	ASSERT_TRUE(memfd.unmap(addr, kRegionSize));
- 	memfd.close();
- 
--	linux::MemFd memfd2;
-+	LinuxMemFd memfd2;
- 	memfd2.importFd(fd);
- 	ASSERT_TRUE(memfd2.isValid());
- 	addr = reinterpret_cast<uint8_t*>(memfd2.mapReadWrite(0, kRegionSize));