Tom spot Callaway
3 years ago
parent
0d9d66e66b
commit
22ce682b2a
@ -0,0 +1,12 @@
|
||||
diff -up chromium-101.0.4951.41/content/common/user_agent.cc.fedora-user-agent chromium-101.0.4951.41/content/common/user_agent.cc
|
||||
--- chromium-101.0.4951.41/content/common/user_agent.cc.fedora-user-agent 2022-04-27 20:03:36.913767022 +0000
|
||||
+++ chromium-101.0.4951.41/content/common/user_agent.cc 2022-04-27 20:04:30.591942420 +0000
|
||||
@@ -34,7 +34,7 @@ std::string GetUserAgentPlatform() {
|
||||
#elif BUILDFLAG(IS_MAC)
|
||||
return "Macintosh; ";
|
||||
#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
- return "X11; "; // strange, but that's what Firefox uses
|
||||
+ return "X11; Fedora; "; // strange, but that's what Firefox uses
|
||||
#elif BUILDFLAG(IS_ANDROID)
|
||||
return "Linux; ";
|
||||
#elif BUILDFLAG(IS_FUCHSIA)
|
||||
@ -0,0 +1,165 @@
|
||||
diff -up chromium-101.0.4951.41/remoting/host/mojom/remoting_mojom_traits.h.remoting-extra-qualification chromium-101.0.4951.41/remoting/host/mojom/remoting_mojom_traits.h
|
||||
--- chromium-101.0.4951.41/remoting/host/mojom/remoting_mojom_traits.h.remoting-extra-qualification 2022-04-27 20:08:44.312318089 +0000
|
||||
+++ chromium-101.0.4951.41/remoting/host/mojom/remoting_mojom_traits.h 2022-04-28 16:11:30.308481321 +0000
|
||||
@@ -32,7 +32,7 @@
|
||||
namespace mojo {
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::BoolDataView, bool> {
|
||||
+class StructTraits<remoting::mojom::BoolDataView, bool> {
|
||||
public:
|
||||
static bool value(bool value) { return value; }
|
||||
|
||||
@@ -43,7 +43,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::FloatDataView, float> {
|
||||
+class StructTraits<remoting::mojom::FloatDataView, float> {
|
||||
public:
|
||||
static float value(float value) { return value; }
|
||||
|
||||
@@ -54,7 +54,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::Int32DataView, int32_t> {
|
||||
+class StructTraits<remoting::mojom::Int32DataView, int32_t> {
|
||||
public:
|
||||
static int32_t value(int32_t value) { return value; }
|
||||
|
||||
@@ -66,7 +66,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::UInt32DataView, uint32_t> {
|
||||
+class StructTraits<remoting::mojom::UInt32DataView, uint32_t> {
|
||||
public:
|
||||
static uint32_t value(uint32_t value) { return value; }
|
||||
|
||||
@@ -78,7 +78,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::DesktopCaptureOptionsDataView,
|
||||
+class StructTraits<remoting::mojom::DesktopCaptureOptionsDataView,
|
||||
::webrtc::DesktopCaptureOptions> {
|
||||
public:
|
||||
static bool use_update_notifications(
|
||||
@@ -103,7 +103,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::DesktopEnvironmentOptionsDataView,
|
||||
+class StructTraits<remoting::mojom::DesktopEnvironmentOptionsDataView,
|
||||
::remoting::DesktopEnvironmentOptions> {
|
||||
public:
|
||||
static bool enable_curtaining(
|
||||
@@ -200,7 +200,7 @@ struct EnumTraits<remoting::mojom::Deskt
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::DesktopRectDataView,
|
||||
+class StructTraits<remoting::mojom::DesktopRectDataView,
|
||||
::webrtc::DesktopRect> {
|
||||
public:
|
||||
static int32_t left(const ::webrtc::DesktopRect& rect) { return rect.left(); }
|
||||
@@ -220,7 +220,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::DesktopSizeDataView,
|
||||
+class StructTraits<remoting::mojom::DesktopSizeDataView,
|
||||
::webrtc::DesktopSize> {
|
||||
public:
|
||||
static int32_t width(const ::webrtc::DesktopSize& size) {
|
||||
@@ -236,7 +236,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::DesktopVectorDataView,
|
||||
+class StructTraits<remoting::mojom::DesktopVectorDataView,
|
||||
::webrtc::DesktopVector> {
|
||||
public:
|
||||
static int32_t x(const ::webrtc::DesktopVector& vector) { return vector.x(); }
|
||||
@@ -475,7 +475,7 @@ struct EnumTraits<remoting::mojom::Audio
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::AudioPacketDataView,
|
||||
+class StructTraits<remoting::mojom::AudioPacketDataView,
|
||||
::std::unique_ptr<::remoting::AudioPacket>> {
|
||||
public:
|
||||
static int32_t timestamp(
|
||||
@@ -513,7 +513,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::ClipboardEventDataView,
|
||||
+class StructTraits<remoting::mojom::ClipboardEventDataView,
|
||||
::remoting::protocol::ClipboardEvent> {
|
||||
public:
|
||||
static const std::string& mime_type(
|
||||
@@ -531,7 +531,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::KeyEventDataView,
|
||||
+class StructTraits<remoting::mojom::KeyEventDataView,
|
||||
::remoting::protocol::KeyEvent> {
|
||||
public:
|
||||
static bool pressed(const ::remoting::protocol::KeyEvent& event) {
|
||||
@@ -567,7 +567,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::MouseEventDataView,
|
||||
+class StructTraits<remoting::mojom::MouseEventDataView,
|
||||
::remoting::protocol::MouseEvent> {
|
||||
public:
|
||||
static absl::optional<int32_t> x(
|
||||
@@ -656,7 +656,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::ScreenResolutionDataView,
|
||||
+class StructTraits<remoting::mojom::ScreenResolutionDataView,
|
||||
::remoting::ScreenResolution> {
|
||||
public:
|
||||
static const ::webrtc::DesktopSize& dimensions(
|
||||
@@ -674,7 +674,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::TextEventDataView,
|
||||
+class StructTraits<remoting::mojom::TextEventDataView,
|
||||
::remoting::protocol::TextEvent> {
|
||||
public:
|
||||
static const std::string& text(const ::remoting::protocol::TextEvent& event) {
|
||||
@@ -686,7 +686,7 @@ class mojo::StructTraits<remoting::mojom
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::TouchEventPointDataView,
|
||||
+class StructTraits<remoting::mojom::TouchEventPointDataView,
|
||||
::remoting::protocol::TouchEventPoint> {
|
||||
public:
|
||||
static uint32_t id(const ::remoting::protocol::TouchEventPoint& event) {
|
||||
@@ -763,7 +763,7 @@ struct EnumTraits<remoting::mojom::Touch
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::TouchEventDataView,
|
||||
+class StructTraits<remoting::mojom::TouchEventDataView,
|
||||
::remoting::protocol::TouchEvent> {
|
||||
public:
|
||||
static ::remoting::protocol::TouchEvent::TouchEventType event_type(
|
||||
@@ -823,7 +823,7 @@ struct EnumTraits<remoting::mojom::Trans
|
||||
};
|
||||
|
||||
template <>
|
||||
-class mojo::StructTraits<remoting::mojom::TransportRouteDataView,
|
||||
+class StructTraits<remoting::mojom::TransportRouteDataView,
|
||||
::remoting::protocol::TransportRoute> {
|
||||
public:
|
||||
static ::remoting::protocol::TransportRoute::RouteType type(
|
||||
@ -0,0 +1,25 @@
|
||||
From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Hartmann <stha09@googlemail.com>
|
||||
Date: Wed, 27 Apr 2022 16:01:01 +0000
|
||||
Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils
|
||||
|
||||
---
|
||||
third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
|
||||
index 9e2d3ad..68f4823 100644
|
||||
--- a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
|
||||
+++ b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
#include "third_party/blink/public/common/fenced_frame/fenced_frame_utils.h"
|
||||
|
||||
+#include <cstring>
|
||||
+
|
||||
#include "base/guid.h"
|
||||
#include "base/strings/string_util.h"
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
--- a/components/autofill/core/browser/BUILD.gn
|
||||
+++ b/components/autofill/core/browser/BUILD.gn
|
||||
@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") {
|
||||
}
|
||||
|
||||
static_library("browser") {
|
||||
+ if (is_clang) {
|
||||
+ cflags = [
|
||||
+ "-fbracket-depth=1000",
|
||||
+ ]
|
||||
+ }
|
||||
sources = [
|
||||
"address_normalization_manager.cc",
|
||||
"address_normalization_manager.h",
|
||||
@ -0,0 +1,47 @@
|
||||
From 89c498edff683c68df6be0dd224848f4b4af5ae7 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Hartmann <stha09@googlemail.com>
|
||||
Date: Mon, 25 Apr 2022 13:25:02 +0200
|
||||
Subject: [PATCH] GCC: add explicit template instantiation
|
||||
|
||||
Bug: b/223668065
|
||||
Change-Id: I97ea197273f2b46b6a47a9fdfbbfb5065fbd8edd
|
||||
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/65268
|
||||
Kokoro-Result: kokoro <noreply+kokoro@google.com>
|
||||
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
|
||||
Reviewed-by: Alexis Hétu <sugoi@google.com>
|
||||
Commit-Queue: Alexis Hétu <sugoi@google.com>
|
||||
Tested-by: Alexis Hétu <sugoi@google.com>
|
||||
---
|
||||
|
||||
diff --git a/third_party/swiftshader/third_party/subzero/src/IceInstX8632.cpp b/third_party/swiftshader/third_party/subzero/src/IceInstX8632.cpp
|
||||
index fe87eee..94cac3b 100644
|
||||
--- a/third_party/swiftshader/third_party/subzero/src/IceInstX8632.cpp
|
||||
+++ b/third_party/swiftshader/third_party/subzero/src/IceInstX8632.cpp
|
||||
@@ -710,6 +710,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
+template void emitIASRegOpTyGPR<true, true>(const Cfg *Func, Type Ty,
|
||||
+ const Variable *Var,
|
||||
+ const Operand *Src,
|
||||
+ const GPREmitterRegOp &Emitter);
|
||||
+
|
||||
void emitIASAddrOpTyGPR(const Cfg *Func, Type Ty, const AsmAddress &Addr,
|
||||
const Operand *Src, const GPREmitterAddrOp &Emitter) {
|
||||
Assembler *Asm = Func->getAssembler<Assembler>();
|
||||
diff --git a/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp b/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp
|
||||
index 9d655a1..f7097d2 100644
|
||||
--- a/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp
|
||||
+++ b/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp
|
||||
@@ -698,6 +698,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
+template void emitIASRegOpTyGPR<true, true>(const Cfg *Func, Type Ty,
|
||||
+ const Variable *Var,
|
||||
+ const Operand *Src,
|
||||
+ const GPREmitterRegOp &Emitter);
|
||||
+
|
||||
void emitIASAddrOpTyGPR(const Cfg *Func, Type Ty, const AsmAddress &Addr,
|
||||
const Operand *Src, const GPREmitterAddrOp &Emitter) {
|
||||
Assembler *Asm = Func->getAssembler<Assembler>();
|
||||
@ -0,0 +1,43 @@
|
||||
From 9dd0503835dc875807ab63efb1f477bffed2a852 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Hartmann <stha09@googlemail.com>
|
||||
Date: Mon, 25 Apr 2022 23:18:30 +0000
|
||||
Subject: [PATCH] IWYU: add utility for std::exchange
|
||||
|
||||
Bug: 957519
|
||||
Change-Id: I307d520fdc34d2452018ed32a505e7e519739410
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3604643
|
||||
Reviewed-by: Wez <wez@chromium.org>
|
||||
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
|
||||
Cr-Commit-Position: refs/heads/main@{#995855}
|
||||
---
|
||||
|
||||
diff --git a/base/third_party/symbolize/patches/0001-expose-object-file-helpers.patch b/base/third_party/symbolize/patches/0001-expose-object-file-helpers.patch
|
||||
index b7376d8..72900a19 100644
|
||||
--- a/base/third_party/symbolize/patches/0001-expose-object-file-helpers.patch
|
||||
+++ b/base/third_party/symbolize/patches/0001-expose-object-file-helpers.patch
|
||||
@@ -118,11 +118,12 @@
|
||||
index c6f9ec4360ede..00cfa022219e6 100644
|
||||
--- a/base/third_party/symbolize/symbolize.h
|
||||
+++ b/base/third_party/symbolize/symbolize.h
|
||||
-@@ -60,6 +60,8 @@
|
||||
+@@ -60,6 +60,9 @@
|
||||
|
||||
#ifdef HAVE_SYMBOLIZE
|
||||
|
||||
+#include <algorithm>
|
||||
++#include <utility>
|
||||
+
|
||||
#if defined(__ELF__) // defined by gcc
|
||||
#if defined(__OpenBSD__)
|
||||
diff --git a/base/third_party/symbolize/symbolize.h b/base/third_party/symbolize/symbolize.h
|
||||
index 99029a9..278078f 100644
|
||||
--- a/base/third_party/symbolize/symbolize.h
|
||||
+++ b/base/third_party/symbolize/symbolize.h
|
||||
@@ -61,6 +61,7 @@
|
||||
#ifdef HAVE_SYMBOLIZE
|
||||
|
||||
#include <algorithm>
|
||||
+#include <utility>
|
||||
|
||||
#if defined(__ELF__) // defined by gcc
|
||||
#if defined(__OpenBSD__)
|
||||
@ -0,0 +1,62 @@
|
||||
diff -up chromium-102.0.5005.61/chrome/browser/about_flags.cc.accel-mjpeg chromium-102.0.5005.61/chrome/browser/about_flags.cc
|
||||
--- chromium-102.0.5005.61/chrome/browser/about_flags.cc.accel-mjpeg 2022-05-19 02:16:44.000000000 +0000
|
||||
+++ chromium-102.0.5005.61/chrome/browser/about_flags.cc 2022-06-03 20:09:42.298053196 +0000
|
||||
@@ -4308,12 +4308,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
|
||||
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
|
||||
#endif // ENABLE_VR
|
||||
-#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX)
|
||||
{"disable-accelerated-mjpeg-decode",
|
||||
flag_descriptions::kAcceleratedMjpegDecodeName,
|
||||
- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
|
||||
+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
|
||||
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
|
||||
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX)
|
||||
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
|
||||
flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
|
||||
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
|
||||
diff -up chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc
|
||||
--- chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc.accel-mjpeg 2022-06-03 17:55:53.493268667 +0000
|
||||
+++ chromium-102.0.5005.61/chrome/browser/flag_descriptions.cc 2022-06-03 20:22:41.162906775 +0000
|
||||
@@ -4029,7 +4029,7 @@ const char kUseAngleGL[] = "OpenGL";
|
||||
|
||||
// ChromeOS -------------------------------------------------------------------
|
||||
|
||||
-#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
const char kAcceleratedMjpegDecodeName[] =
|
||||
"Hardware-accelerated mjpeg decode for captured frame";
|
||||
@@ -4037,6 +4037,10 @@ const char kAcceleratedMjpegDecodeDescri
|
||||
"Enable hardware-accelerated mjpeg decode for captured frame where "
|
||||
"available.";
|
||||
|
||||
+#endif
|
||||
+
|
||||
+#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+
|
||||
const char kAllowDisableTouchpadHapticFeedbackName[] =
|
||||
"Allow disabling touchpad haptic feedback";
|
||||
const char kAllowDisableTouchpadHapticFeedbackDescription[] =
|
||||
diff -up chromium-102.0.5005.61/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-102.0.5005.61/chrome/browser/flag_descriptions.h
|
||||
--- chromium-102.0.5005.61/chrome/browser/flag_descriptions.h.accel-mjpeg 2022-06-03 17:55:53.494268633 +0000
|
||||
+++ chromium-102.0.5005.61/chrome/browser/flag_descriptions.h 2022-06-03 20:23:50.514578649 +0000
|
||||
@@ -2303,11 +2303,15 @@ extern const char kUseAngleGL[];
|
||||
|
||||
// ChromeOS -------------------------------------------------------------------
|
||||
|
||||
-#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX)
|
||||
|
||||
extern const char kAcceleratedMjpegDecodeName[];
|
||||
extern const char kAcceleratedMjpegDecodeDescription[];
|
||||
|
||||
+#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX)
|
||||
+
|
||||
+#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+
|
||||
extern const char kAllowDisableTouchpadHapticFeedbackName[];
|
||||
extern const char kAllowDisableTouchpadHapticFeedbackDescription[];
|
||||
|
||||
Loading…
Reference in new issue