38 changed files with 452 additions and 768 deletions
@ -1,22 +0,0 @@ |
|||
diff -up chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc.gettid-fix chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc
|
|||
--- chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc.gettid-fix 2019-06-12 17:05:01.720907204 -0400
|
|||
+++ chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc 2019-06-12 17:06:01.000671370 -0400
|
|||
@@ -40,7 +40,8 @@
|
|||
#include <time.h> |
|||
#include <unistd.h> |
|||
|
|||
-static long gettid(void) { return syscall(__NR_gettid); }
|
|||
+/* renamed to avoid conflict with glibc 'gettid()' */
|
|||
+static long gettid_gpr(void) { return syscall(__NR_gettid); }
|
|||
|
|||
void gpr_log(const char* file, int line, gpr_log_severity severity, |
|||
const char* format, ...) { |
|||
@@ -70,7 +71,7 @@ void gpr_default_log(gpr_log_func_args*
|
|||
gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); |
|||
struct tm tm; |
|||
static __thread long tid = 0; |
|||
- if (tid == 0) tid = gettid();
|
|||
+ if (tid == 0) tid = gettid_gpr();
|
|||
|
|||
timer = static_cast<time_t>(now.tv_sec); |
|||
final_slash = strrchr(args->file, '/'); |
|||
@ -1,81 +0,0 @@ |
|||
From 5d66d5907ac3e76d1e382b8a8e8afe653bd00f4c Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Sun, 31 May 2020 13:59:15 +0000 |
|||
Subject: [PATCH] Fix GCC build with PROTOBUF_USE_DLLS enabled |
|||
|
|||
GCC does not allow mixing __attribute__(()) syntax and alignas() |
|||
syntax. Re-use approach from chromium base/compiler_specific.h |
|||
---
|
|||
.../protobuf/src/google/protobuf/arena.h | 2 +- |
|||
.../protobuf/src/google/protobuf/port_def.inc | 29 +++++++++++++++++++ |
|||
.../src/google/protobuf/port_undef.inc | 1 + |
|||
3 files changed, 31 insertions(+), 1 deletion(-) |
|||
|
|||
diff --git a/third_party/protobuf/src/google/protobuf/arena.h b/third_party/protobuf/src/google/protobuf/arena.h
|
|||
index dedc221..a8515ce 100644
|
|||
--- a/third_party/protobuf/src/google/protobuf/arena.h
|
|||
+++ b/third_party/protobuf/src/google/protobuf/arena.h
|
|||
@@ -245,7 +245,7 @@ struct ArenaOptions {
|
|||
// well as protobuf container types like RepeatedPtrField and Map. The protocol |
|||
// is internal to protobuf and is not guaranteed to be stable. Non-proto types |
|||
// should not rely on this protocol. |
|||
-class PROTOBUF_EXPORT alignas(8) Arena final {
|
|||
+class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final {
|
|||
public: |
|||
// Arena constructor taking custom options. See ArenaOptions below for |
|||
// descriptions of the options available. |
|||
diff --git a/third_party/protobuf/src/google/protobuf/port_def.inc b/third_party/protobuf/src/google/protobuf/port_def.inc
|
|||
index f1bd85d..6d02b53 100644
|
|||
--- a/third_party/protobuf/src/google/protobuf/port_def.inc
|
|||
+++ b/third_party/protobuf/src/google/protobuf/port_def.inc
|
|||
@@ -528,6 +528,35 @@ PROTOBUF_EXPORT_TEMPLATE_TEST(DEFAULT, __declspec(dllimport));
|
|||
#undef IN |
|||
#endif // _MSC_VER |
|||
|
|||
+// Specify memory alignment for structs, classes, etc.
|
|||
+// Use like:
|
|||
+// class PROTOBUF_ALIGNAS(16) MyClass { ... }
|
|||
+// PROTOBUF_ALIGNAS(16) int array[4];
|
|||
+//
|
|||
+// In most places you can use the C++11 keyword "alignas", which is preferred.
|
|||
+//
|
|||
+// But compilers have trouble mixing __attribute__((...)) syntax with
|
|||
+// alignas(...) syntax.
|
|||
+//
|
|||
+// Doesn't work in clang or gcc:
|
|||
+// struct alignas(16) __attribute__((packed)) S { char c; };
|
|||
+// Works in clang but not gcc:
|
|||
+// struct __attribute__((packed)) alignas(16) S2 { char c; };
|
|||
+// Works in clang and gcc:
|
|||
+// struct alignas(16) S3 { char c; } __attribute__((packed));
|
|||
+//
|
|||
+// There are also some attributes that must be specified *before* a class
|
|||
+// definition: visibility (used for exporting functions/classes) is one of
|
|||
+// these attributes. This means that it is not possible to use alignas() with a
|
|||
+// class that is marked as exported.
|
|||
+#if defined(_MSC_VER)
|
|||
+#define PROTOBUF_ALIGNAS(byte_alignment) __declspec(align(byte_alignment))
|
|||
+#elif defined(__GNUC__)
|
|||
+#define PROTOBUF_ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
|
|||
+#else
|
|||
+#define PROTOBUF_ALIGNAS(byte_alignment) alignas(byte_alignment)
|
|||
+#endif
|
|||
+
|
|||
#if defined(__clang__) |
|||
#pragma clang diagnostic push |
|||
// TODO(gerbens) ideally we cleanup the code. But a cursory try shows many |
|||
diff --git a/third_party/protobuf/src/google/protobuf/port_undef.inc b/third_party/protobuf/src/google/protobuf/port_undef.inc
|
|||
index b7e67fe..ba1fffc 100644
|
|||
--- a/third_party/protobuf/src/google/protobuf/port_undef.inc
|
|||
+++ b/third_party/protobuf/src/google/protobuf/port_undef.inc
|
|||
@@ -80,6 +80,7 @@
|
|||
#undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_foj3FJo5StF0OvIzl7oMxA__declspec |
|||
#undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_DECLSPEC_dllexport |
|||
#undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_DECLSPEC_dllimport |
|||
+#undef PROTOBUF_ALIGNAS
|
|||
|
|||
|
|||
|
|||
--
|
|||
2.26.2 |
|||
|
|||
@ -1,34 +0,0 @@ |
|||
diff -up chromium-80.0.3987.106/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring chromium-80.0.3987.106/third_party/webrtc/audio/utility/channel_mixer.cc
|
|||
--- chromium-80.0.3987.106/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring 2020-02-21 13:19:47.077683105 -0500
|
|||
+++ chromium-80.0.3987.106/third_party/webrtc/audio/utility/channel_mixer.cc 2020-02-21 13:19:47.077683105 -0500
|
|||
@@ -8,6 +8,8 @@
|
|||
* be found in the AUTHORS file in the root of the source tree. |
|||
*/ |
|||
|
|||
+#include <cstring>
|
|||
+
|
|||
#include "audio/utility/channel_mixer.h" |
|||
|
|||
#include "audio/utility/channel_mixing_matrix.h" |
|||
diff -up chromium-80.0.3987.106/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring chromium-80.0.3987.106/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
|
|||
--- chromium-80.0.3987.106/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring 2020-02-21 13:19:48.171659179 -0500
|
|||
+++ chromium-80.0.3987.106/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc 2020-02-21 13:19:48.174659113 -0500
|
|||
@@ -17,6 +17,7 @@
|
|||
#include <spa/param/video/raw-utils.h> |
|||
#include <spa/support/type-map.h> |
|||
|
|||
+#include <cstring>
|
|||
#include <memory> |
|||
#include <utility> |
|||
|
|||
diff -up chromium-80.0.3987.106/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring chromium-80.0.3987.106/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
|
|||
--- chromium-80.0.3987.106/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring 2020-02-21 13:30:09.609068057 -0500
|
|||
+++ chromium-80.0.3987.106/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc 2020-02-21 13:30:23.791757875 -0500
|
|||
@@ -10,6 +10,7 @@
|
|||
|
|||
#include "modules/video_coding/utility/ivf_file_reader.h" |
|||
|
|||
+#include <cstring>
|
|||
#include <string> |
|||
#include <vector> |
|||
|
|||
@ -1,33 +0,0 @@ |
|||
From 08ac7188f414218ac9d764e29e7aa64a6bfc2f96 Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Sun, 31 May 2020 10:02:03 +0000 |
|||
Subject: [PATCH] disable clang-format for generated code in blink |
|||
|
|||
For GCC builds clang-format might be not available. Additionally, |
|||
current scripts look for clang-format within chromium sources and |
|||
don't consider system clang-format. |
|||
---
|
|||
.../bindings/scripts/bind_gen/codegen_utils.py | 10 +--------- |
|||
1 file changed, 1 insertion(+), 9 deletions(-) |
|||
|
|||
diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py b/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py
|
|||
index 7021f1a..33bf5bf 100644
|
|||
--- a/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py
|
|||
+++ b/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py
|
|||
@@ -150,12 +150,4 @@ def write_code_node_to_file(code_node, filepath):
|
|||
|
|||
rendered_text = render_code_node(code_node) |
|||
|
|||
- format_result = style_format.auto_format(rendered_text, filename=filepath)
|
|||
- if not format_result.did_succeed:
|
|||
- raise RuntimeError("Style-formatting failed: filename = {filename}\n"
|
|||
- "---- stderr ----\n"
|
|||
- "{stderr}:".format(
|
|||
- filename=format_result.filename,
|
|||
- stderr=format_result.error_message))
|
|||
-
|
|||
- web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents)
|
|||
+ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text)
|
|||
--
|
|||
2.26.2 |
|||
|
|||
@ -1,36 +0,0 @@ |
|||
From c4f6e8cd34a245c3640b86a91c9694d69594d80b Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Wed, 16 Sep 2020 15:05:02 +0000 |
|||
Subject: [PATCH] IWYU: ui::CursorFactory is now required independent from |
|||
Ozone |
|||
|
|||
---
|
|||
.../ui/views/chrome_browser_main_extra_parts_views_linux.cc | 5 +---- |
|||
1 file changed, 1 insertion(+), 4 deletions(-) |
|||
|
|||
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
|
|||
index 5a97d61..ccedd2a 100644
|
|||
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
|
|||
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
|
|||
@@ -7,6 +7,7 @@
|
|||
#include "chrome/browser/themes/theme_service_aura_linux.h" |
|||
#include "chrome/browser/ui/browser_list.h" |
|||
#include "chrome/browser/ui/views/theme_profile_key.h" |
|||
+#include "ui/base/cursor/cursor_factory.h"
|
|||
#include "ui/display/screen.h" |
|||
#include "ui/views/linux_ui/linux_ui.h" |
|||
|
|||
@@ -15,10 +16,6 @@
|
|||
#include "ui/gtk/gtk_ui_delegate.h" |
|||
#endif |
|||
|
|||
-#if defined(USE_OZONE)
|
|||
-#include "ui/base/cursor/cursor_factory.h"
|
|||
-#endif
|
|||
-
|
|||
#if defined(USE_X11) |
|||
#include "ui/gfx/x/connection.h" // nogncheck |
|||
#if BUILDFLAG(USE_GTK) |
|||
--
|
|||
2.26.2 |
|||
|
|||
@ -1,25 +0,0 @@ |
|||
From 0c0af4cabb7490db473cd2c28f069956974a4d98 Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Fri, 2 Oct 2020 12:11:58 +0000 |
|||
Subject: [PATCH] IWYU: uint8_t is defined in stdint.h |
|||
|
|||
---
|
|||
third_party/openscreen/src/util/crypto/random_bytes.h | 2 ++ |
|||
1 file changed, 2 insertions(+) |
|||
|
|||
diff --git a/third_party/openscreen/src/util/crypto/random_bytes.h b/third_party/openscreen/src/util/crypto/random_bytes.h
|
|||
index 3cb2fa8..025b52c 100644
|
|||
--- a/third_party/openscreen/src/util/crypto/random_bytes.h
|
|||
+++ b/third_party/openscreen/src/util/crypto/random_bytes.h
|
|||
@@ -7,6 +7,8 @@
|
|||
|
|||
#include <array> |
|||
|
|||
+#include <stdint.h>
|
|||
+
|
|||
namespace openscreen { |
|||
|
|||
std::array<uint8_t, 16> GenerateRandomBytes16(); |
|||
--
|
|||
2.26.2 |
|||
|
|||
@ -1,27 +0,0 @@ |
|||
From 6e402d97c2dec5726f37e95f97b7f7e12b1d3b1d Mon Sep 17 00:00:00 2001 |
|||
From: Jose Dapena Paz <[email protected]> |
|||
Date: Wed, 11 Nov 2020 11:02:13 +0100 |
|||
Subject: [PATCH] IWYU: include headers for std::vector and std::unique_ptr in AXTreeFormatter |
|||
|
|||
Fix these build errors with libstdc++: |
|||
../../ui/accessibility/platform/inspect/tree_formatter.h:35:12: error: ‘std::vector’ has not been declared |
|||
../../ui/accessibility/platform/inspect/tree_formatter.h:61:16: error: ‘unique_ptr’ in namespace ‘std’ does not name a template type |
|||
|
|||
Bug: 957519 |
|||
Change-Id: I402ac0644255b3cd4932ff2fe72d999b125a7895 |
|||
---
|
|||
|
|||
diff --git a/ui/accessibility/platform/inspect/tree_formatter.h b/ui/accessibility/platform/inspect/tree_formatter.h
|
|||
index 4a70a4d..bb23768 100644
|
|||
--- a/ui/accessibility/platform/inspect/tree_formatter.h
|
|||
+++ b/ui/accessibility/platform/inspect/tree_formatter.h
|
|||
@@ -5,6 +5,9 @@
|
|||
#ifndef UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_ |
|||
#define UI_ACCESSIBILITY_PLATFORM_INSPECT_TREE_FORMATTER_H_ |
|||
|
|||
+#include <memory>
|
|||
+#include <vector>
|
|||
+
|
|||
#include "ui/accessibility/platform/inspect/inspect.h" |
|||
|
|||
#include "ui/gfx/native_widget_types.h" |
|||
@ -1,21 +0,0 @@ |
|||
From 127ec3b1bf26ab37f2ae8333f284008868756274 Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Sat, 21 Nov 2020 15:59:23 +0000 |
|||
Subject: [PATCH] IWYU: size_t is defined stddef.h |
|||
|
|||
Change-Id: I4400ac7c6004b49ec6e72c44f2754e2166642f88 |
|||
---
|
|||
|
|||
diff --git a/components/bookmarks/browser/bookmark_model_observer.h b/components/bookmarks/browser/bookmark_model_observer.h
|
|||
index 69c40e7..0e5eb96 100644
|
|||
--- a/components/bookmarks/browser/bookmark_model_observer.h
|
|||
+++ b/components/bookmarks/browser/bookmark_model_observer.h
|
|||
@@ -7,6 +7,8 @@
|
|||
|
|||
#include <set> |
|||
|
|||
+#include <stddef.h>
|
|||
+
|
|||
class GURL; |
|||
|
|||
namespace bookmarks { |
|||
@ -1,36 +0,0 @@ |
|||
From 56c654a91600e3bf254aa9f66c1151b0850b6ee4 Mon Sep 17 00:00:00 2001 |
|||
From: Jose Dapena Paz <[email protected]> |
|||
Date: Wed, 11 Nov 2020 10:24:47 +0100 |
|||
Subject: [PATCH] GCC: do not pass unique_ptr to DCHECK_NE, but the actual pointer, in CompositorFrameReporter |
|||
|
|||
DCHECK_NE comparison requires CheckOpValueStr to be defined for the |
|||
type, or providing an output stream operator. A unique_ptr does not |
|||
provide any. |
|||
|
|||
Compilation in GCC is failing in CompositorFrameReporter because of |
|||
this: |
|||
../../cc/metrics/compositor_frame_reporter.cc: In member function ‘void cc::CompositorFrameReporter::ReportEventLatencyHistograms() const’: |
|||
../../base/check_op.h:224:59: error: no matching function for call to ‘CheckOpValueStr(const std::unique_ptr<cc::EventMetrics>&)’ |
|||
|
|||
Fixed comparing the result of get() method for unique_ptr instead of |
|||
the unique_ptr. |
|||
|
|||
Bug: 819294 |
|||
Change-Id: I11103d1867c7196c1de92e72f9f12dcfd31c29f1 |
|||
|
|||
(updated to use DCHECK as suggested in comments) |
|||
---
|
|||
|
|||
diff --git a/cc/metrics/compositor_frame_reporter.cc b/cc/metrics/compositor_frame_reporter.cc
|
|||
index 725beb0..fafd0f3 100644
|
|||
--- a/cc/metrics/compositor_frame_reporter.cc
|
|||
+++ b/cc/metrics/compositor_frame_reporter.cc
|
|||
@@ -686,7 +686,7 @@
|
|||
|
|||
void CompositorFrameReporter::ReportEventLatencyHistograms() const { |
|||
for (const auto& event_metrics : events_metrics_) { |
|||
- DCHECK_NE(event_metrics, nullptr);
|
|||
+ DCHECK(event_metrics);
|
|||
const std::string histogram_base_name = |
|||
GetEventLatencyHistogramBaseName(*event_metrics); |
|||
const int event_type_index = static_cast<int>(event_metrics->type()); |
|||
@ -1,20 +0,0 @@ |
|||
From 372366b4180533f27d3250a50810828370d697b0 Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Sat, 21 Nov 2020 16:12:18 +0000 |
|||
Subject: [PATCH] IWYU: include limits for std::numeric_limits |
|||
|
|||
Change-Id: Ia5226e1432a622f4f4abc8f1b18bcab8638a73c6 |
|||
---
|
|||
|
|||
diff --git a/src/trace_processor/containers/string_pool.h b/src/trace_processor/containers/string_pool.h
|
|||
index 11ae91c..58c6db2 100644
|
|||
--- a/third_party/perfetto/src/trace_processor/containers/string_pool.h
|
|||
+++ b/third_party/perfetto/src/trace_processor/containers/string_pool.h
|
|||
@@ -22,6 +22,7 @@
|
|||
|
|||
#include <unordered_map> |
|||
#include <vector> |
|||
+#include <limits>
|
|||
|
|||
#include "perfetto/ext/base/optional.h" |
|||
#include "perfetto/ext/base/paged_memory.h" |
|||
@ -1,59 +0,0 @@ |
|||
From 75a1f5234e4b544b4d16eddb995d39685da21361 Mon Sep 17 00:00:00 2001 |
|||
From: Ivan Murashov <[email protected]> |
|||
Date: Fri, 20 Nov 2020 09:38:56 +0000 |
|||
Subject: [PATCH] Remove storage class specifier for the explicit template specialization |
|||
|
|||
According to the http://www.eel.is/c++draft/temp.expl.spec: |
|||
An explicit specialization shall not use a storage-class-specifier |
|||
other than thread_local. |
|||
Clang doesn't claims about it, but GCC does. |
|||
An error example for GCC 8.4.0: |
|||
gen/third_party/dawn/src/dawn_wire/client/ApiObjects_autogen.h:25:5: |
|||
error: explicit template specialization cannot have a storage class |
|||
|
|||
Bug: dawn:384 |
|||
Change-Id: Iaf86722a943d19c9796a7f112885666ac88f20ca |
|||
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/33480 |
|||
Commit-Queue: Corentin Wallez <[email protected]> |
|||
Reviewed-by: Corentin Wallez <[email protected]> |
|||
---
|
|||
|
|||
diff --git a/third_party/dawn/generator/templates/dawn_wire/client/ApiObjects.h b/third_party/dawn/generator/templates/dawn_wire/client/ApiObjects.h
|
|||
index 0d8421b..bbf9817 100644
|
|||
--- a/third_party/dawn/generator/templates/dawn_wire/client/ApiObjects.h
|
|||
+++ b/third_party/dawn/generator/templates/dawn_wire/client/ApiObjects.h
|
|||
@@ -21,7 +21,9 @@
|
|||
namespace dawn_wire { namespace client { |
|||
|
|||
template <typename T> |
|||
- static constexpr ObjectType ObjectTypeToTypeEnum = static_cast<ObjectType>(-1);
|
|||
+ struct ObjectTypeToTypeEnum {
|
|||
+ static constexpr ObjectType value = static_cast<ObjectType>(-1);
|
|||
+ };
|
|||
|
|||
{% for type in by_category["object"] %} |
|||
{% set Type = type.name.CamelCase() %} |
|||
@@ -41,7 +43,9 @@
|
|||
} |
|||
|
|||
template <> |
|||
- static constexpr ObjectType ObjectTypeToTypeEnum<{{type.name.CamelCase()}}> = ObjectType::{{type.name.CamelCase()}};
|
|||
+ struct ObjectTypeToTypeEnum<{{Type}}> {
|
|||
+ static constexpr ObjectType value = ObjectType::{{Type}};
|
|||
+ };
|
|||
|
|||
{% endfor %} |
|||
}} // namespace dawn_wire::client |
|||
diff --git a/third_party/dawn/src/dawn_wire/client/Device.h b/third_party/dawn/src/dawn_wire/client/Device.h
|
|||
index eef03a5..a0036a4 100644
|
|||
--- a/third_party/dawn/src/dawn_wire/client/Device.h
|
|||
+++ b/third_party/dawn/src/dawn_wire/client/Device.h
|
|||
@@ -65,7 +65,7 @@
|
|||
|
|||
template <typename T> |
|||
void TrackObject(T* object) { |
|||
- mObjects[ObjectTypeToTypeEnum<T>].Append(object);
|
|||
+ mObjects[ObjectTypeToTypeEnum<T>::value].Append(object);
|
|||
} |
|||
|
|||
void CancelCallbacksForDisconnect() override; |
|||
@ -1,21 +0,0 @@ |
|||
From bcb20babee602b55fe4bd026e13a41d10b89632f Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Sat, 21 Nov 2020 15:55:02 +0000 |
|||
Subject: [PATCH] IWYU: include limits for std::numeric_limits |
|||
|
|||
Change-Id: I1b6b07ebb397a29c84d3ed51ae41523e3ecab497 |
|||
---
|
|||
|
|||
diff --git a/components/federated_learning/floc_constants.cc b/components/federated_learning/floc_constants.cc
|
|||
index df66e5d..2eb50f1 100644
|
|||
--- a/components/federated_learning/floc_constants.cc
|
|||
+++ b/components/federated_learning/floc_constants.cc
|
|||
@@ -4,6 +4,8 @@
|
|||
|
|||
#include "components/federated_learning/floc_constants.h" |
|||
|
|||
+#include <limits>
|
|||
+
|
|||
namespace federated_learning { |
|||
|
|||
// This is only for experimentation and won't be served to websites. |
|||
@ -1,25 +0,0 @@ |
|||
From bc383a5dd7fa8f2b535f28815fd6932fbc0d2a45 Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Wed, 28 Oct 2020 16:00:35 +0000 |
|||
Subject: [PATCH] IWYU: include stddef.h for size_t |
|||
|
|||
---
|
|||
third_party/dawn/src/common/ityp_array.h | 2 ++ |
|||
1 file changed, 2 insertions(+) |
|||
|
|||
diff --git a/third_party/dawn/src/common/ityp_array.h b/third_party/dawn/src/common/ityp_array.h
|
|||
index 48e080f..c784198 100644
|
|||
--- a/third_party/dawn/src/common/ityp_array.h
|
|||
+++ b/third_party/dawn/src/common/ityp_array.h
|
|||
@@ -21,6 +21,8 @@
|
|||
#include <array> |
|||
#include <type_traits> |
|||
|
|||
+#include <stddef.h>
|
|||
+
|
|||
namespace ityp { |
|||
|
|||
// ityp::array is a helper class that wraps std::array with the restriction that |
|||
--
|
|||
2.26.2 |
|||
|
|||
@ -1,39 +0,0 @@ |
|||
From 4f4604877f3b666ac7a373ae443e3c3795424569 Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Fri, 6 Nov 2020 11:18:42 +0000 |
|||
Subject: [PATCH] GCC: fix attribute on function definition |
|||
|
|||
GCC does not accept attributes at the end for function definitions. |
|||
Solution is to move it before function name. Otherwise GCC fails like |
|||
this: |
|||
|
|||
../../base/compiler_specific.h:97:28: error: attributes are not allowed |
|||
on a function-definition |
|||
97 | #define WARN_UNUSED_RESULT __attribute__((warn_unused_result)) |
|||
| ^~~~~~~~~~~~~ |
|||
../../media/gpu/vaapi/vaapi_wrapper.h:322:36: note: in |
|||
expansion of macro 'WARN_UNUSED_RESULT' |
|||
322 | const T* data) WARN_UNUSED_RESULT { |
|||
| ^~~~~~~~~~~~~~~~~~ |
|||
---
|
|||
media/gpu/vaapi/vaapi_wrapper.h | 4 ++-- |
|||
1 file changed, 2 insertions(+), 2 deletions(-) |
|||
|
|||
diff --git a/media/gpu/vaapi/vaapi_wrapper.h b/media/gpu/vaapi/vaapi_wrapper.h
|
|||
index fd1fd82..deeda1f 100644
|
|||
--- a/media/gpu/vaapi/vaapi_wrapper.h
|
|||
+++ b/media/gpu/vaapi/vaapi_wrapper.h
|
|||
@@ -318,8 +318,8 @@ class MEDIA_GPU_EXPORT VaapiWrapper
|
|||
// Convenient templatized version of SubmitBuffer() where |size| is deduced to |
|||
// be the size of the type of |*data|. |
|||
template <typename T> |
|||
- bool SubmitBuffer(VABufferType va_buffer_type,
|
|||
- const T* data) WARN_UNUSED_RESULT {
|
|||
+ bool WARN_UNUSED_RESULT SubmitBuffer(VABufferType va_buffer_type,
|
|||
+ const T* data) {
|
|||
return SubmitBuffer(va_buffer_type, sizeof(T), data); |
|||
} |
|||
// Batch-version of SubmitBuffer(), where the lock for accessing libva is |
|||
--
|
|||
2.26.2 |
|||
|
|||
@ -1,72 +0,0 @@ |
|||
diff -up chromium-88.0.4324.11/chrome/browser/about_flags.cc.accel-mjpeg chromium-88.0.4324.11/chrome/browser/about_flags.cc
|
|||
--- chromium-88.0.4324.11/chrome/browser/about_flags.cc.accel-mjpeg 2020-11-19 20:51:19.000000000 -0500
|
|||
+++ chromium-88.0.4324.11/chrome/browser/about_flags.cc 2020-11-30 16:14:32.393366384 -0500
|
|||
@@ -3309,12 +3309,12 @@ const FeatureEntry kFeatureEntries[] = {
|
|||
flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop, |
|||
MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)}, |
|||
#endif // ENABLE_VR |
|||
-#if defined(OS_CHROMEOS)
|
|||
+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
|
|||
{"disable-accelerated-mjpeg-decode", |
|||
flag_descriptions::kAcceleratedMjpegDecodeName, |
|||
- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
|
|||
+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
|
|||
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, |
|||
-#endif // OS_CHROMEOS
|
|||
+#endif // OS_CHROMEOS || OS_LINUX
|
|||
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName, |
|||
flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop, |
|||
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)}, |
|||
diff -up chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc
|
|||
--- chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc.accel-mjpeg 2020-11-30 16:14:32.393366384 -0500
|
|||
+++ chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc 2020-11-30 16:20:50.174195910 -0500
|
|||
@@ -3572,9 +3572,9 @@ const char kVideoToolboxVp9DecodingDescr
|
|||
|
|||
#endif |
|||
|
|||
-// Chrome OS -------------------------------------------------------------------
|
|||
+// Chrome OS and Linux ---------------------------------------------------------
|
|||
|
|||
-#if defined(OS_CHROMEOS)
|
|||
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|||
|
|||
const char kAcceleratedMjpegDecodeName[] = |
|||
"Hardware-accelerated mjpeg decode for captured frame"; |
|||
@@ -3582,6 +3582,12 @@ const char kAcceleratedMjpegDecodeDescri
|
|||
"Enable hardware-accelerated mjpeg decode for captured frame where " |
|||
"available."; |
|||
|
|||
+#endif
|
|||
+
|
|||
+// Chrome OS -------------------------------------------------------------------
|
|||
+
|
|||
+#if defined(OS_CHROMEOS)
|
|||
+
|
|||
const char kAllowDisableMouseAccelerationName[] = |
|||
"Allow disabling mouse acceleration"; |
|||
const char kAllowDisableMouseAccelerationDescription[] = |
|||
diff -up chromium-88.0.4324.11/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-88.0.4324.11/chrome/browser/flag_descriptions.h
|
|||
--- chromium-88.0.4324.11/chrome/browser/flag_descriptions.h.accel-mjpeg 2020-11-30 16:14:32.394366389 -0500
|
|||
+++ chromium-88.0.4324.11/chrome/browser/flag_descriptions.h 2020-11-30 16:22:13.831601058 -0500
|
|||
@@ -2068,13 +2068,19 @@ extern const char kVideoToolboxVp9Decodi
|
|||
|
|||
#endif // defined(OS_MAC) |
|||
|
|||
-// Chrome OS ------------------------------------------------------------------
|
|||
+// Chrome OS and Linux --------------------------------------------------------
|
|||
|
|||
-#if defined(OS_CHROMEOS)
|
|||
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|||
|
|||
extern const char kAcceleratedMjpegDecodeName[]; |
|||
extern const char kAcceleratedMjpegDecodeDescription[]; |
|||
|
|||
+#endif
|
|||
+
|
|||
+// Chrome OS ------------------------------------------------------------------
|
|||
+
|
|||
+#if defined(OS_CHROMEOS)
|
|||
+
|
|||
extern const char kAllowDisableMouseAccelerationName[]; |
|||
extern const char kAllowDisableMouseAccelerationDescription[]; |
|||
|
|||
@ -1,39 +0,0 @@ |
|||
diff -up chromium-88.0.4324.11/chrome/common/safe_browsing/DEPS.nounrar chromium-88.0.4324.11/chrome/common/safe_browsing/DEPS
|
|||
--- chromium-88.0.4324.11/chrome/common/safe_browsing/DEPS.nounrar 2020-11-19 20:51:23.000000000 -0500
|
|||
+++ chromium-88.0.4324.11/chrome/common/safe_browsing/DEPS 2020-11-30 16:04:30.599454130 -0500
|
|||
@@ -1,6 +1,5 @@
|
|||
include_rules = [ |
|||
"+components/safe_browsing", |
|||
"+third_party/protobuf", |
|||
- "+third_party/unrar",
|
|||
"+third_party/zlib", |
|||
] |
|||
diff -up chromium-88.0.4324.11/chrome/services/file_util/BUILD.gn.nounrar chromium-88.0.4324.11/chrome/services/file_util/BUILD.gn
|
|||
--- chromium-88.0.4324.11/chrome/services/file_util/BUILD.gn.nounrar 2020-11-19 20:51:24.000000000 -0500
|
|||
+++ chromium-88.0.4324.11/chrome/services/file_util/BUILD.gn 2020-11-30 16:04:30.599454130 -0500
|
|||
@@ -15,7 +15,6 @@ source_set("file_util") {
|
|||
"//base", |
|||
"//chrome/common/safe_browsing", |
|||
"//chrome/common/safe_browsing:archive_analyzer_results", |
|||
- "//chrome/common/safe_browsing:rar_analyzer",
|
|||
"//components/safe_browsing:buildflags", |
|||
"//mojo/public/cpp/bindings", |
|||
] |
|||
diff -up chromium-88.0.4324.11/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-88.0.4324.11/chrome/services/file_util/safe_archive_analyzer.cc
|
|||
--- chromium-88.0.4324.11/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2020-11-19 20:51:24.000000000 -0500
|
|||
+++ chromium-88.0.4324.11/chrome/services/file_util/safe_archive_analyzer.cc 2020-11-30 16:04:30.599454130 -0500
|
|||
@@ -45,10 +45,14 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
|
|||
void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file, |
|||
base::File temporary_file, |
|||
AnalyzeRarFileCallback callback) { |
|||
+#if 0
|
|||
DCHECK(rar_file.IsValid()); |
|||
|
|||
safe_browsing::ArchiveAnalyzerResults results; |
|||
safe_browsing::rar_analyzer::AnalyzeRarFile( |
|||
std::move(rar_file), std::move(temporary_file), &results); |
|||
std::move(callback).Run(results); |
|||
+#else
|
|||
+ NOTREACHED();
|
|||
+#endif
|
|||
} |
|||
@ -0,0 +1,26 @@ |
|||
diff -up chromium-88.0.4324.182/third_party/swiftshader/src/OpenGL/libEGL/BUILD.gn.gcc-swiftshader-visibility chromium-88.0.4324.182/third_party/swiftshader/src/OpenGL/libEGL/BUILD.gn
|
|||
--- chromium-88.0.4324.182/third_party/swiftshader/src/OpenGL/libEGL/BUILD.gn.gcc-swiftshader-visibility 2021-02-25 16:31:51.929335783 +0000
|
|||
+++ chromium-88.0.4324.182/third_party/swiftshader/src/OpenGL/libEGL/BUILD.gn 2021-02-25 16:31:51.929335783 +0000
|
|||
@@ -42,7 +42,8 @@ config("swiftshader_libEGL_private_confi
|
|||
} else if (is_clang) { |
|||
defines += [ "EGLAPI=__attribute__((visibility(\"protected\"))) __attribute__((no_sanitize(\"function\")))" ] |
|||
} else { |
|||
- defines += [ "EGLAPI= " ]
|
|||
+ cflags += [ "-fvisibility=protected" ]
|
|||
+ defines += [ "EGLAPI=__attribute__((visibility(\"protected\")))" ]
|
|||
} |
|||
} |
|||
} |
|||
diff -up chromium-88.0.4324.182/third_party/swiftshader/src/OpenGL/libGLESv2/BUILD.gn.gcc-swiftshader-visibility chromium-88.0.4324.182/third_party/swiftshader/src/OpenGL/libGLESv2/BUILD.gn
|
|||
--- chromium-88.0.4324.182/third_party/swiftshader/src/OpenGL/libGLESv2/BUILD.gn.gcc-swiftshader-visibility 2021-02-25 18:16:28.576901417 +0000
|
|||
+++ chromium-88.0.4324.182/third_party/swiftshader/src/OpenGL/libGLESv2/BUILD.gn 2021-02-25 18:17:50.356567690 +0000
|
|||
@@ -57,7 +57,8 @@ config("swiftshader_libGLESv2_private_co
|
|||
} else if (is_clang) { |
|||
defines += [ "GL_APICALL=__attribute__((visibility(\"protected\"))) __attribute__((no_sanitize(\"function\")))" ] |
|||
} else { |
|||
- defines += [ "GL_APICALL= " ]
|
|||
+ cflags += [ "-fvisibility=protected" ]
|
|||
+ defines += [ "GL_APICALL=__attribute__((visibility(\"protected\")))" ]
|
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
diff -up chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
|
|||
--- chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix 2021-02-17 13:16:27.120283969 -0500
|
|||
+++ chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2021-02-17 13:17:37.951617295 -0500
|
|||
@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
|
|||
#else |
|||
const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; |
|||
#endif |
|||
- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
|
|||
+ size_t stack_size = (std::max(SIGSTKSZ, static_cast<long>(65536)) + page_mask) & ~page_mask;
|
|||
#if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ |
|||
defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) |
|||
// Account for sanitizer instrumentation requiring additional stack space. |
|||
diff -up chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
|||
--- chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix 2021-02-17 14:39:04.556382532 -0500
|
|||
+++ chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-02-17 14:39:34.002519173 -0500
|
|||
@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
|
|||
// SIGSTKSZ may be too small to prevent the signal handlers from overrunning |
|||
// the alternative stack. Ensure that the size of the alternative stack is |
|||
// large enough. |
|||
- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
|||
+ static const unsigned kSigStackSize = std::max(static_cast<long>(16384), SIGSTKSZ);
|
|||
|
|||
// Only set an alternative stack if there isn't already one, or if the current |
|||
// one is too small. |
|||
@ -0,0 +1,25 @@ |
|||
From c06ddc4935bf1394812c011ce5d93898ccc8a53a Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Tue, 09 Feb 2021 19:22:57 +0000 |
|||
Subject: [PATCH] IWYU: add ctime for std::time |
|||
|
|||
Bug: None |
|||
Change-Id: I8bdae43209984242b9f5e538d74ece4409b65e3c |
|||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2679610 |
|||
Reviewed-by: Katie Dektar <[email protected]> |
|||
Commit-Queue: Katie Dektar <[email protected]> |
|||
Cr-Commit-Position: refs/heads/[email protected]{#852287} |
|||
---
|
|||
|
|||
diff --git a/ui/accessibility/ax_tree_serializer.h b/ui/accessibility/ax_tree_serializer.h
|
|||
index ddbbdcd..1790e3b 100644
|
|||
--- a/ui/accessibility/ax_tree_serializer.h
|
|||
+++ b/ui/accessibility/ax_tree_serializer.h
|
|||
@@ -8,6 +8,7 @@
|
|||
#include <stddef.h> |
|||
#include <stdint.h> |
|||
|
|||
+#include <ctime>
|
|||
#include <ostream> |
|||
#include <unordered_map> |
|||
#include <unordered_set> |
|||
@ -0,0 +1,28 @@ |
|||
From 5a56bfe8d281250a1deee0d116a9fcde65b9c29a Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Fri, 15 Jan 2021 18:37:05 +0000 |
|||
Subject: [PATCH] IWYU: add various missing includes |
|||
|
|||
std::weak_ptr and std::shared_ptr require map |
|||
*int*_t types require cstdint |
|||
---
|
|||
third_party/dawn/src/dawn_wire/client/Device.h | 2 ++ |
|||
1 file changed, 2 insertions(+) |
|||
|
|||
diff --git a/third_party/dawn/src/dawn_wire/client/Device.h b/third_party/dawn/src/dawn_wire/client/Device.h
|
|||
index 3f16700..1082549 100644
|
|||
--- a/third_party/dawn/src/dawn_wire/client/Device.h
|
|||
+++ b/third_party/dawn/src/dawn_wire/client/Device.h
|
|||
@@ -22,7 +22,9 @@
|
|||
#include "dawn_wire/client/ApiObjects_autogen.h" |
|||
#include "dawn_wire/client/ObjectBase.h" |
|||
|
|||
+#include <cstdint>
|
|||
#include <map> |
|||
+#include <memory>
|
|||
|
|||
namespace dawn_wire { namespace client { |
|||
|
|||
--
|
|||
2.26.2 |
|||
|
|||
@ -0,0 +1,29 @@ |
|||
From 7cd4eab0bfca6192f14d6143410e1ae774eb1c29 Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Thu, 31 Dec 2020 11:57:22 +0000 |
|||
Subject: [PATCH] GCC: do not pass unique_ptr to DCHECK_NE, but the actual |
|||
pointer |
|||
|
|||
DCHECK_NE comparison requires CheckOpValueStr to be defined for the |
|||
type, or providing an output stream operator. A unique_ptr does not |
|||
provide any. USE DCHECK instead. |
|||
---
|
|||
net/third_party/quiche/src/quic/core/quic_path_validator.cc | 2 +- |
|||
1 file changed, 1 insertion(+), 1 deletion(-) |
|||
|
|||
diff --git a/net/third_party/quiche/src/quic/core/quic_path_validator.cc b/net/third_party/quiche/src/quic/core/quic_path_validator.cc
|
|||
index 0722216..fb2aeaf 100644
|
|||
--- a/net/third_party/quiche/src/quic/core/quic_path_validator.cc
|
|||
+++ b/net/third_party/quiche/src/quic/core/quic_path_validator.cc
|
|||
@@ -68,7 +68,7 @@ void QuicPathValidator::OnPathResponse(const QuicPathFrameBuffer& probing_data,
|
|||
void QuicPathValidator::StartPathValidation( |
|||
std::unique_ptr<QuicPathValidationContext> context, |
|||
std::unique_ptr<ResultDelegate> result_delegate) { |
|||
- DCHECK_NE(nullptr, context);
|
|||
+ DCHECK(context);
|
|||
QUIC_DLOG(INFO) << "Start validating path " << *context |
|||
<< " via writer: " << context->WriterToUse(); |
|||
if (path_context_ != nullptr) { |
|||
--
|
|||
2.26.2 |
|||
|
|||
@ -0,0 +1,26 @@ |
|||
From 1ee06c3678a85d158eb82d4af438d1e43a4c814e Mon Sep 17 00:00:00 2001 |
|||
From: Stephan Hartmann <[email protected]> |
|||
Date: Sun, 6 Dec 2020 16:14:17 +0000 |
|||
Subject: [PATCH] GCC: change make_visitor visibility to public |
|||
|
|||
GCC complains that make_visitor is used in private context from |
|||
inner Iterator class. |
|||
---
|
|||
net/third_party/quiche/src/quic/core/quic_interval_set.h | 1 - |
|||
1 file changed, 1 deletion(-) |
|||
|
|||
diff --git a/net/third_party/quiche/src/quic/core/quic_interval_set.h b/net/third_party/quiche/src/quic/core/quic_interval_set.h
|
|||
index af64e29..7ee8978 100644
|
|||
--- a/net/third_party/quiche/src/quic/core/quic_interval_set.h
|
|||
+++ b/net/third_party/quiche/src/quic/core/quic_interval_set.h
|
|||
@@ -1874,7 +1874,6 @@ class QUIC_NO_EXPORT QuicIntervalSet {
|
|||
return absl::visit([&](auto& s) { return s.Contains(min, max); }, qiset_); |
|||
} |
|||
|
|||
- private:
|
|||
template <class A, class B, class C> |
|||
struct overloader : A, B, C { |
|||
overloader(A a, B b, C c) : A(a), B(b), C(c) {} |
|||
--
|
|||
2.26.2 |
|||
|
|||
@ -0,0 +1,38 @@ |
|||
diff --git a/third_party/skia/include/effects/SkImageFilters.h b/third_party/skia/include/effects/SkImageFilters.h
|
|||
index 04cce0a..d06b007 100644
|
|||
--- a/third_party/skia/include/effects/SkImageFilters.h
|
|||
+++ b/third_party/skia/include/effects/SkImageFilters.h
|
|||
@@ -23,6 +23,9 @@ class SkColorFilter;
|
|||
class SkPaint; |
|||
class SkRegion; |
|||
|
|||
+constexpr SkRect kNoCropRect = {SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
|
|||
+ SK_ScalarInfinity, SK_ScalarInfinity};
|
|||
+
|
|||
// A set of factory functions providing useful SkImageFilter effects. For image filters that take an |
|||
// input filter, providing nullptr means it will automatically use the dynamic source image. This |
|||
// source depends on how the filter is applied, but is either the contents of a saved layer when |
|||
@@ -33,8 +36,6 @@ public:
|
|||
// to those types as a crop rect for the image filter factories. It's not intended to be used |
|||
// directly. |
|||
struct CropRect { |
|||
- static constexpr SkRect kNoCropRect = {SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
|
|||
- SK_ScalarInfinity, SK_ScalarInfinity};
|
|||
CropRect() : fCropRect(kNoCropRect) {} |
|||
// Intentionally not explicit so callers don't have to use this type but can use SkIRect or |
|||
// SkRect as desired. |
|||
diff --git a/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp b/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
|
|||
index 5290b00..fb97fc1 100644
|
|||
--- a/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
|
|||
+++ b/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
|
|||
@@ -47,10 +47,6 @@ static SkImageFilter::CropRect to_legacy_crop_rect(const SkImageFilters::CropRec
|
|||
: SkImageFilter::CropRect(SkRect::MakeEmpty(), 0x0); |
|||
} |
|||
|
|||
-// Allow kNoCropRect to be referenced (for certain builds, e.g. macOS libFuzzer chromium target,
|
|||
-// see crbug.com/1139725)
|
|||
-constexpr SkRect SkImageFilters::CropRect::kNoCropRect;
|
|||
-
|
|||
void SkImageFilters::RegisterFlattenables() { |
|||
SkAlphaThresholdFilter::RegisterFlattenables(); |
|||
SkArithmeticImageFilter::RegisterFlattenables(); |
|||
@ -0,0 +1,66 @@ |
|||
diff -up chromium-89.0.4389.72/chrome/browser/about_flags.cc.accel-mjpeg chromium-89.0.4389.72/chrome/browser/about_flags.cc
|
|||
--- chromium-89.0.4389.72/chrome/browser/about_flags.cc.accel-mjpeg 2021-03-04 14:02:26.379527446 -0500
|
|||
+++ chromium-89.0.4389.72/chrome/browser/about_flags.cc 2021-03-04 14:06:40.208830372 -0500
|
|||
@@ -3526,12 +3526,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) || defined(OS_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) || OS_LINUX
|
|||
{"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName, |
|||
flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop, |
|||
FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)}, |
|||
diff -up chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc
|
|||
--- chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc.accel-mjpeg 2021-03-02 12:45:03.000000000 -0500
|
|||
+++ chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc 2021-03-04 14:07:56.648199844 -0500
|
|||
@@ -3704,12 +3704,22 @@ const char kAccountManagementFlowsV2Desc
|
|||
"Settings. " |
|||
"See go/betterAM"; |
|||
|
|||
+#endif
|
|||
+
|
|||
+#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|||
+
|
|||
const char kAcceleratedMjpegDecodeName[] = |
|||
"Hardware-accelerated mjpeg decode for captured frame"; |
|||
const char kAcceleratedMjpegDecodeDescription[] = |
|||
"Enable hardware-accelerated mjpeg decode for captured frame where " |
|||
"available."; |
|||
|
|||
+#endif
|
|||
+
|
|||
+// Chrome OS -------------------------------------------------------------------
|
|||
+
|
|||
+#if defined(OS_CHROMEOS)
|
|||
+
|
|||
const char kAllowDisableMouseAccelerationName[] = |
|||
"Allow disabling mouse acceleration"; |
|||
const char kAllowDisableMouseAccelerationDescription[] = |
|||
diff -up chromium-89.0.4389.72/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-89.0.4389.72/chrome/browser/flag_descriptions.h
|
|||
--- chromium-89.0.4389.72/chrome/browser/flag_descriptions.h.accel-mjpeg 2021-03-04 14:02:26.381527456 -0500
|
|||
+++ chromium-89.0.4389.72/chrome/browser/flag_descriptions.h 2021-03-04 14:09:10.842558552 -0500
|
|||
@@ -2138,9 +2138,17 @@ extern const char kVideoToolboxVp9Decodi
|
|||
extern const char kAccountManagementFlowsV2Name[]; |
|||
extern const char kAccountManagementFlowsV2Description[]; |
|||
|
|||
+#endif
|
|||
+
|
|||
+#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
|
|||
+
|
|||
extern const char kAcceleratedMjpegDecodeName[]; |
|||
extern const char kAcceleratedMjpegDecodeDescription[]; |
|||
|
|||
+#endif
|
|||
+
|
|||
+#if BUILDFLAG(IS_CHROMEOS_ASH)
|
|||
+
|
|||
extern const char kAllowDisableMouseAccelerationName[]; |
|||
extern const char kAllowDisableMouseAccelerationDescription[]; |
|||
|
|||
@ -0,0 +1,34 @@ |
|||
diff -up chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc
|
|||
--- chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring 2021-03-02 12:48:16.000000000 -0500
|
|||
+++ chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc 2021-03-04 13:31:42.894817353 -0500
|
|||
@@ -8,6 +8,8 @@
|
|||
* be found in the AUTHORS file in the root of the source tree. |
|||
*/ |
|||
|
|||
+#include <cstring>
|
|||
+
|
|||
#include "audio/utility/channel_mixer.h" |
|||
|
|||
#include "audio/utility/channel_mixing_matrix.h" |
|||
diff -up chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
|
|||
--- chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring 2021-03-04 13:31:42.895817359 -0500
|
|||
+++ chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc 2021-03-04 13:45:27.795162431 -0500
|
|||
@@ -23,6 +23,7 @@
|
|||
#include <sys/mman.h> |
|||
#include <sys/syscall.h> |
|||
|
|||
+#include <cstring>
|
|||
#include <memory> |
|||
#include <utility> |
|||
|
|||
diff -up chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
|
|||
--- chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring 2021-03-02 12:48:17.000000000 -0500
|
|||
+++ chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc 2021-03-04 13:31:42.895817359 -0500
|
|||
@@ -10,6 +10,7 @@
|
|||
|
|||
#include "modules/video_coding/utility/ivf_file_reader.h" |
|||
|
|||
+#include <cstring>
|
|||
#include <string> |
|||
#include <vector> |
|||
|
|||
@ -0,0 +1,90 @@ |
|||
diff -up chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn
|
|||
--- chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn.nounrar 2021-03-02 12:45:06.000000000 -0500
|
|||
+++ chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn 2021-03-04 11:56:21.676563769 -0500
|
|||
@@ -43,39 +43,6 @@ if (safe_browsing_mode == 1) {
|
|||
public_deps = [ "//components/safe_browsing/core:csd_proto" ] |
|||
} |
|||
|
|||
- source_set("rar_analyzer") {
|
|||
- sources = [
|
|||
- "rar_analyzer.cc",
|
|||
- "rar_analyzer.h",
|
|||
- ]
|
|||
-
|
|||
- deps = [
|
|||
- ":archive_analyzer_results",
|
|||
- ":download_type_util",
|
|||
- "//base",
|
|||
- "//base:i18n",
|
|||
- "//components/safe_browsing/core:features",
|
|||
- "//components/safe_browsing/core:file_type_policies",
|
|||
- "//third_party/unrar:unrar",
|
|||
- ]
|
|||
-
|
|||
- defines = [
|
|||
- "_FILE_OFFSET_BITS=64",
|
|||
- "LARGEFILE_SOURCE",
|
|||
- "RAR_SMP",
|
|||
- "SILENT",
|
|||
-
|
|||
- # The following is set to disable certain macro definitions in the unrar
|
|||
- # source code.
|
|||
- "CHROMIUM_UNRAR",
|
|||
-
|
|||
- # Disables exceptions in unrar, replaces them with process termination.
|
|||
- "UNRAR_NO_EXCEPTIONS",
|
|||
- ]
|
|||
-
|
|||
- public_deps = [ "//components/safe_browsing/core:csd_proto" ]
|
|||
- }
|
|||
-
|
|||
if (is_mac) { |
|||
source_set("disk_image_type_sniffer_mac") { |
|||
sources = [ |
|||
@@ -145,7 +112,6 @@ source_set("safe_browsing") {
|
|||
":archive_analyzer_results", |
|||
":binary_feature_extractor", |
|||
":download_type_util", |
|||
- ":rar_analyzer",
|
|||
"//components/safe_browsing/core:features", |
|||
] |
|||
|
|||
diff -up chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS.nounrar chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS
|
|||
--- chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS.nounrar 2021-03-02 12:45:06.000000000 -0500
|
|||
+++ chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS 2021-03-04 11:56:21.676563769 -0500
|
|||
@@ -1,6 +1,5 @@
|
|||
include_rules = [ |
|||
"+components/safe_browsing", |
|||
"+third_party/protobuf", |
|||
- "+third_party/unrar",
|
|||
"+third_party/zlib", |
|||
] |
|||
diff -up chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn.nounrar chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn
|
|||
--- chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn.nounrar 2021-03-04 11:56:21.676563769 -0500
|
|||
+++ chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn 2021-03-04 11:57:38.583933453 -0500
|
|||
@@ -17,7 +17,6 @@ source_set("file_util") {
|
|||
"//build:chromeos_buildflags", |
|||
"//chrome/common/safe_browsing", |
|||
"//chrome/common/safe_browsing:archive_analyzer_results", |
|||
- "//chrome/common/safe_browsing:rar_analyzer",
|
|||
"//components/safe_browsing:buildflags", |
|||
"//mojo/public/cpp/bindings", |
|||
] |
|||
diff -up chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc
|
|||
--- chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2021-03-02 12:45:06.000000000 -0500
|
|||
+++ chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc 2021-03-04 11:56:21.677563774 -0500
|
|||
@@ -45,10 +45,14 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
|
|||
void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file, |
|||
base::File temporary_file, |
|||
AnalyzeRarFileCallback callback) { |
|||
+#if 0
|
|||
DCHECK(rar_file.IsValid()); |
|||
|
|||
safe_browsing::ArchiveAnalyzerResults results; |
|||
safe_browsing::rar_analyzer::AnalyzeRarFile( |
|||
std::move(rar_file), std::move(temporary_file), &results); |
|||
std::move(callback).Run(results); |
|||
+#else
|
|||
+ NOTREACHED();
|
|||
+#endif
|
|||
} |
|||
@ -1,11 +0,0 @@ |
|||
--- a/third_party/widevine/cdm/BUILD.gn
|
|||
+++ b/third_party/widevine/cdm/BUILD.gn
|
|||
@@ -14,7 +14,7 @@ buildflag_header("buildflags") {
|
|||
|
|||
flags = [ |
|||
"ENABLE_WIDEVINE=$enable_widevine", |
|||
- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm",
|
|||
+ "BUNDLE_WIDEVINE_CDM=true",
|
|||
"ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", |
|||
] |
|||
} |
|||
@ -1,14 +0,0 @@ |
|||
--- a/base/strings/char_traits.h
|
|||
+++ b/base/strings/char_traits.h
|
|||
@@ -67,9 +67,9 @@
|
|||
return __builtin_memcmp(s1, s2, n); |
|||
#else |
|||
for (; n; --n, ++s1, ++s2) { |
|||
- if (*s1 < *s2)
|
|||
+ if ((unsigned char)*s1 < (unsigned char)*s2)
|
|||
return -1; |
|||
- if (*s1 > *s2)
|
|||
+ if ((unsigned char)*s1 > (unsigned char)*s2)
|
|||
return 1; |
|||
} |
|||
return 0; |
|||
@ -9,26 +9,3 @@ |
|||
|
|||
.SH SYNOPSIS |
|||
.B @@[email protected]@ |
|||
@@ -24,7 +24,7 @@ stable flags.
|
|||
\fB\-\-user\-data\-dir\fR=\fIDIR\fR |
|||
Specifies the directory that user data (your "profile") is kept in. |
|||
Defaults to |
|||
-.I $HOME/.config/@@[email protected]@ .
|
|||
+.I $HOME/.config/@@[email protected]@ .
|
|||
Separate instances of @@[email protected]@ must use separate user data directories; |
|||
repeated invocations of @@[email protected]@ will reuse an existing process for |
|||
a given user data directory. |
|||
@@ -150,11 +150,11 @@ Comma separated list of hosts or pattern
|
|||
|
|||
.SH FILES |
|||
.TP |
|||
-.I $HOME/.config/@@[email protected]@
|
|||
+.I $HOME/.config/@@[email protected]@
|
|||
Default directory for configuration data. |
|||
|
|||
.TP |
|||
-.I $HOME/.cache/@@[email protected]@
|
|||
+.I $HOME/.cache/@@[email protected]@
|
|||
Default directory for cache data. (Why? See |
|||
<http://standards.freedesktop.org/basedir-spec/latest/> .) |
|||
|
|||
|
|||
@ -1,31 +0,0 @@ |
|||
--- a/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
|
|||
+++ b/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
|
|||
@@ -83,7 +83,7 @@ def _MinifyJS(input_js):
|
|||
|
|||
with tempfile.NamedTemporaryFile() as _: |
|||
args = [ |
|||
- 'python',
|
|||
+ 'python2',
|
|||
rjsmin_path |
|||
] |
|||
p = subprocess.Popen(args, |
|||
@@ -203,7 +203,7 @@ def _MinifyCSS(css_text):
|
|||
os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py')) |
|||
|
|||
with tempfile.NamedTemporaryFile() as _: |
|||
- rcssmin_args = ['python', rcssmin_path]
|
|||
+ rcssmin_args = ['python2', rcssmin_path]
|
|||
p = subprocess.Popen(rcssmin_args, |
|||
stdin=subprocess.PIPE, |
|||
stdout=subprocess.PIPE, |
|||
--- a/tools/gn/bootstrap/bootstrap.py
|
|||
+++ b/tools/gn/bootstrap/bootstrap.py
|
|||
@@ -129,7 +129,7 @@ def main(argv):
|
|||
if not options.debug: |
|||
gn_gen_args += ' is_debug=false' |
|||
subprocess.check_call([ |
|||
- gn_path, 'gen', out_dir,
|
|||
+ gn_path, 'gen', out_dir, ' --script-executable=/usr/bin/python2',
|
|||
'--args=%s' % gn_gen_args, "--root=" + SRC_ROOT |
|||
]) |
|||
|
|||
@ -1,16 +0,0 @@ |
|||
From bfff7b95bb4d9ff20a3a67191dfffe25334f9dca Mon Sep 17 00:00:00 2001 |
|||
From: Akarshan Biswas <[email protected]> |
|||
Date: Wed, 7 Nov 2018 16:29:01 +0530 |
|||
Subject: [PATCH] Let's brand chromium-vaapi |
|||
|
|||
--- a/components/version_ui_strings.grdp
|
|||
+++ b/components/version_ui_strings.grdp
|
|||
@@ -7,7 +7,7 @@
|
|||
Official Build |
|||
</message> |
|||
<message name="IDS_VERSION_UI_UNOFFICIAL" desc="unofficial build on the about:version page"> |
|||
- Developer Build
|
|||
+ RPM Fusion Build
|
|||
</message> |
|||
<message name="IDS_VERSION_UI_32BIT" desc="32-bit on the chrome://version page"> |
|||
(32-bit) |
|||
@ -160,7 +160,7 @@ BuildRequires: libicu-devel >= 5.4 |
|||
#Build with debugging symbols |
|||
%global debug_pkg 0 |
|||
|
|||
%global majorversion 88 |
|||
%global majorversion 89 |
|||
%global revision 1 |
|||
|
|||
%if %{freeworld} |
|||
@ -168,7 +168,7 @@ Name: ungoogled-chromium%{nsuffix} |
|||
%else |
|||
Name: ungoogled-chromium |
|||
%endif |
|||
Version: %{majorversion}.0.4324.182 |
|||
Version: %{majorversion}.0.4389.72 |
|||
Release: 1%{?dist}.%{revision} |
|||
%if %{?freeworld} |
|||
# chromium-freeworld |
|||
@ -181,7 +181,7 @@ License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and Open |
|||
|
|||
### Chromium Fedora Patches ### |
|||
# Use /etc/chromium for initial_prefs |
|||
Patch1: chromium-86.0.4240.75-initial_prefs-etc-path.patch |
|||
Patch1: chromium-89.0.4389.72-initial_prefs-etc-path.patch |
|||
# Use gn system files |
|||
Patch2: chromium-67.0.3396.62-gn-system.patch |
|||
# Do not prefix libpng functions |
|||
@ -191,7 +191,7 @@ Patch4: chromium-60.0.3112.78-jpeg-nomangle.patch |
|||
# Do not mangle zlib |
|||
Patch5: chromium-77.0.3865.75-no-zlib-mangle.patch |
|||
# Do not use unrar code, it is non-free |
|||
Patch6: chromium-88.0.4324.11-norar.patch |
|||
Patch6: chromium-89.0.4389.72-norar.patch |
|||
# Use Gentoo's Widevine hack |
|||
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r3.patch |
|||
Patch7: chromium-71.0.3578.98-widevine-r3.patch |
|||
@ -200,41 +200,37 @@ Patch8: chromium-83.0.4103.61-disable-fontconfig-cache-magic.patch |
|||
# drop rsp clobber, which breaks gcc9 (thanks to Jeff Law) |
|||
Patch9: chromium-78.0.3904.70-gcc9-drop-rsp-clobber.patch |
|||
# Try to load widevine from other places |
|||
Patch10: chromium-86.0.4240.75-widevine-other-locations.patch |
|||
Patch10: chromium-89.0.4389.72-widevine-other-locations.patch |
|||
# Try to fix version.py for Rawhide |
|||
Patch11: chromium-71.0.3578.98-py2-bootstrap.patch |
|||
|
|||
# rename function to avoid conflict with rawhide glibc "gettid()" |
|||
Patch50: chromium-75.0.3770.80-grpc-gettid-fix.patch |
|||
# Needs to be submitted.. |
|||
Patch51: chromium-76.0.3809.100-gcc-remoting-constexpr.patch |
|||
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch |
|||
Patch52: chromium-81.0.4044.92-unbundle-zlib.patch |
|||
# Needs to be submitted.. |
|||
Patch53: chromium-77.0.3865.75-gcc-include-memory.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-79-gcc-protobuf-alignas.patch |
|||
Patch54: chromium-79-gcc-protobuf-alignas.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-78-protobuf-RepeatedPtrField-export.patch |
|||
Patch55: chromium-78-protobuf-RepeatedPtrField-export.patch |
|||
# ../../third_party/perfetto/include/perfetto/base/task_runner.h:48:55: error: 'uint32_t' has not been declared |
|||
Patch56: chromium-80.0.3987.87-missing-cstdint-header.patch |
|||
# Missing <cstring> (thanks c++17) |
|||
Patch57: chromium-80.0.3987.106-missing-cstring-header.patch |
|||
Patch57: chromium-89.0.4389.72-missing-cstring-header.patch |
|||
# prepare for using system ffmpeg (clean) |
|||
# http://svnweb.mageia.org/packages/cauldron/chromium-browser-stable/current/SOURCES/chromium-53-ffmpeg-no-deprecation-errors.patch?view=markup |
|||
Patch58: chromium-53-ffmpeg-no-deprecation-errors.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-84-blink-disable-clang-format.patch |
|||
Patch59: chromium-84-blink-disable-clang-format.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-fix-char_traits.patch |
|||
Patch60: chromium-fix-char_traits.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-87-CursorFactory-include.patch |
|||
Patch61: chromium-87-CursorFactory-include.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-87-openscreen-include.patch |
|||
Patch62: chromium-87-openscreen-include.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-AXTreeFormatter-include.patch |
|||
Patch63: chromium-88-AXTreeFormatter-include.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-vaapi-attribute.patch |
|||
Patch64: chromium-88-vaapi-attribute.patch |
|||
# https://github.com/stha09/chromium-patches/blob/chromium-89-patchset-7/chromium-89-dawn-include.patch |
|||
Patch60: chromium-89-dawn-include.patch |
|||
# https://github.com/stha09/chromium-patches/blob/chromium-89-patchset-7/chromium-89-quiche-dcheck.patch |
|||
Patch61: chromium-89-quiche-dcheck.patch |
|||
# https://github.com/stha09/chromium-patches/blob/chromium-89-patchset-7/chromium-89-quiche-private.patch |
|||
Patch62: chromium-89-quiche-private.patch |
|||
# https://github.com/stha09/chromium-patches/blob/chromium-89-patchset-7/chromium-89-skia-CropRect.patch |
|||
Patch63: chromium-89-skia-CropRect.patch |
|||
# https://github.com/stha09/chromium-patches/blob/chromium-89-patchset-7/chromium-89-AXTreeSerializer-include.patch |
|||
Patch64: chromium-89-AXTreeSerializer-include.patch |
|||
|
|||
|
|||
# Silence GCC warnings during gn compile |
|||
Patch65: chromium-84.0.4147.105-gn-gcc-cleanup.patch |
|||
# Fix missing cstring in remoting code |
|||
@ -243,21 +239,13 @@ Patch66: chromium-84.0.4147.125-remoting-cstring.patch |
|||
Patch67: chromium-84.0.4147.125-i686-fix_textrels.patch |
|||
# Work around binutils bug in aarch64 (F33+) |
|||
Patch68: chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-BookmarkModelObserver-include.patch |
|||
Patch69: chromium-88-BookmarkModelObserver-include.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-CompositorFrameReporter-dcheck.patch |
|||
Patch70: chromium-88-CompositorFrameReporter-dcheck.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-dawn-static.patch |
|||
Patch71: chromium-88-dawn-static.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-federated_learning-include.patch |
|||
Patch72: chromium-88-federated_learning-include.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-ityp-include.patch |
|||
Patch73: chromium-88-ityp-include.patch |
|||
# https://github.com/stha09/chromium-patches/blob/master/chromium-88-StringPool-include.patch |
|||
Patch74: chromium-88-StringPool-include.patch |
|||
# Fix sandbox code to properly handle the new way that glibc handles fstat in Fedora 34+ |
|||
# Thanks to Kevin Kofler for the fix. |
|||
Patch75: chromium-88.0.4324.96-fstatfix.patch |
|||
# Rawhide (f35) glibc defines SIGSTKSZ as a long instead of a constant |
|||
Patch76: chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch |
|||
# Fix symbol visibility with gcc on swiftshader's libEGL |
|||
Patch77: chromium-88.0.4324.182-gcc-fix-swiftshader-libEGL-visibility.patch |
|||
|
|||
# Use lstdc++ on EPEL7 only |
|||
Patch101: chromium-75.0.3770.100-epel7-stdc++.patch |
|||
@ -282,7 +270,7 @@ Patch109: chromium-87.0.4280.66-el7-no-sys-random.patch |
|||
|
|||
# VAAPI |
|||
# Upstream turned VAAPI on in Linux in 86 |
|||
Patch202: chromium-88.0.4324.11-enable-hardware-accelerated-mjpeg.patch |
|||
Patch202: chromium-89.0.4389.72-enable-hardware-accelerated-mjpeg.patch |
|||
Patch203: chromium-86.0.4240.75-vaapi-i686-fpermissive.patch |
|||
Patch205: chromium-86.0.4240.75-fix-vaapi-on-intel.patch |
|||
|
|||
@ -293,7 +281,6 @@ Patch300: chromium-88.0.4324.96-rhel8-force-disable-use_gnome_keyring.patch |
|||
Patch400: chromium-gcc11.patch |
|||
|
|||
# RPM Fusion patches [free/chromium-freeworld]: |
|||
Patch502: chromium-enable-widevine.patch |
|||
Patch503: chromium-manpage.patch |
|||
|
|||
# RPM Fusion patches [free/chromium-browser-privacy]: |
|||
@ -324,7 +311,7 @@ Source7: get_free_ffmpeg_source_files.py |
|||
# Usage: get_linux_tests_name.py chromium-%%{version} --spec |
|||
Source8: get_linux_tests_names.py |
|||
# GNOME stuff |
|||
Source9: chromium-browser.xml |
|||
Source9: ungoogled-chromium.xml |
|||
Source13: master_preferences |
|||
# Unpackaged fonts |
|||
Source14: https://fontlibrary.org/assets/downloads/gelasio/4d610887ff4d445cbc639aae7828d139/gelasio.zip |
|||
@ -343,7 +330,7 @@ Source20: https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz |
|||
Source21: %{name}.appdata.xml |
|||
|
|||
# ungoogled-chromium source |
|||
%global ungoogled_chromium_revision 88.0.4324.182-1 |
|||
%global ungoogled_chromium_revision 89.0.4389.72-1 |
|||
Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromium_revision}/ungoogled-chromium-%{ungoogled_chromium_revision}.tar.gz |
|||
|
|||
# We can assume gcc and binutils. |
|||
@ -404,6 +391,9 @@ BuildRequires: nss-devel >= 3.26 |
|||
BuildRequires: pciutils-devel |
|||
BuildRequires: pulseaudio-libs-devel |
|||
|
|||
# For X11/xshmfence.h |
|||
BuildRequires: libxshmfence-devel |
|||
|
|||
# For screen sharing on Wayland, currently Fedora only thing - no epel |
|||
%if 0%{?fedora} |
|||
BuildRequires: pkgconfig(libpipewire-0.2) |
|||
@ -650,9 +640,11 @@ Requires: minizip%{_isa} |
|||
%patch1 -p1 -b .etc |
|||
%patch2 -p1 -b .gnsystem |
|||
%patch3 -p1 -b .nolibpngprefix |
|||
%patch4 -p1 -b .nolibjpegmangle |
|||
# Upstream accidentally made the same change in 89, but they've already reverted it for 90+ so this patch will return |
|||
# %%patch4 -p1 -b .nolibjpegmangle |
|||
%patch5 -p1 -b .nozlibmangle |
|||
%patch6 -p1 -b .nounrar |
|||
# Conflict with unrar.patch in ungoogled-chromium |
|||
# %%patch6 -p1 -b .nounrar |
|||
%patch7 -p1 -b .widevine-hack |
|||
%patch8 -p1 -b .nofontconfigcache |
|||
%patch9 -p1 -b .gcc9 |
|||
@ -660,33 +652,30 @@ Requires: minizip%{_isa} |
|||
%patch11 -p1 -b .py2 |
|||
|
|||
# Short term fixes (usually gcc and backports) |
|||
%patch50 -p1 -b .gettid-fix |
|||
%patch51 -p1 -b .gcc-remoting-constexpr |
|||
%if 0%{?fedora} || 0%{?rhel} >= 8 |
|||
%patch52 -p1 -b .unbundle-zlib |
|||
%endif |
|||
%patch53 -p1 -b .gcc-include-memory |
|||
%patch54 -p1 -b .base-gcc-no-alignas |
|||
%patch55 -p1 -b .protobuf-export |
|||
%patch56 -p1 -b .missing-cstdint |
|||
%patch57 -p1 -b .missing-cstring |
|||
%patch58 -p1 -b .ffmpeg-deprecations |
|||
%patch59 -p1 -b .blink-disable-clang-format |
|||
%patch60 -p1 -b .fix-char_traits |
|||
%patch61 -p1 -b .CursorFactory-include |
|||
%patch62 -p1 -b .openscreen-include |
|||
%patch63 -p1 -b .AXTreeFormatter-include |
|||
%patch64 -p1 -b .vaapi-attribute |
|||
%patch60 -p1 -b .dawn-include |
|||
%patch61 -p1 -b .quiche-dcheck |
|||
%patch62 -p1 -b .quiche-private |
|||
%patch63 -p1 -b .skia-CropRect |
|||
%patch64 -p1 -b .AXTreeSerializer-include |
|||
%patch65 -p1 -b .gn-gcc-cleanup |
|||
%patch66 -p1 -b .remoting-cstring |
|||
%patch67 -p1 -b .i686-textrels |
|||
%patch69 -p1 -b .BookmarkModelObserver-include |
|||
%patch70 -p1 -b .CompositorFrameReporter-dcheck |
|||
%patch71 -p1 -b .dawn-static |
|||
%patch72 -p1 -b .federated_learning-include |
|||
%patch73 -p1 -b .ityp-include |
|||
%patch74 -p1 -b .StringPool-include |
|||
# %%patch68 -p1 -b .aarch64-clearkeycdm-binutils-workaround |
|||
%patch75 -p1 -b .fstatfix |
|||
%if 0%{?fedora} >= 35 |
|||
%patch76 -p1 -b .sigstkszfix |
|||
%endif |
|||
%patch77 -p1 -b .gcc-swiftshader-visibility |
|||
|
|||
|
|||
# EPEL specific patches |
|||
%if 0%{?rhel} == 7 |
|||
@ -717,7 +706,6 @@ Requires: minizip%{_isa} |
|||
%patch400 -p1 -b .gcc11 |
|||
|
|||
# RPM Fusion patches [free/chromium-freeworld]: |
|||
%patch502 -p1 -b .enable-widevine |
|||
%patch503 -p1 -b .manpage |
|||
|
|||
# RPM Fusion patches [free/chromium-browser-privacy]: |
|||
@ -887,7 +875,6 @@ build/linux/unbundle/remove_bundled_libraries.py \ |
|||
'net/third_party/quiche' \ |
|||
'net/third_party/uri_template' \ |
|||
'third_party/abseil-cpp' \ |
|||
'third_party/adobe' \ |
|||
'third_party/angle' \ |
|||
'third_party/angle/src/common/third_party/base' \ |
|||
'third_party/angle/src/common/third_party/smhasher' \ |
|||
@ -896,13 +883,6 @@ build/linux/unbundle/remove_bundled_libraries.py \ |
|||
'third_party/angle/src/third_party/libXNVCtrl' \ |
|||
'third_party/angle/src/third_party/trace_event' \ |
|||
'third_party/angle/src/third_party/volk' \ |
|||
'third_party/angle/third_party/glslang' \ |
|||
'third_party/angle/third_party/spirv-headers' \ |
|||
'third_party/angle/third_party/spirv-tools' \ |
|||
'third_party/angle/third_party/vulkan-headers' \ |
|||
'third_party/angle/third_party/vulkan-loader' \ |
|||
'third_party/angle/third_party/vulkan-tools' \ |
|||
'third_party/angle/third_party/vulkan-validation-layers' \ |
|||
'third_party/apple_apsl' \ |
|||
'third_party/axe-core' \ |
|||
'third_party/blanketjs' \ |
|||
@ -963,14 +943,12 @@ build/linux/unbundle/remove_bundled_libraries.py \ |
|||
'third_party/fontconfig' \ |
|||
'third_party/freetype' \ |
|||
'third_party/fusejs' \ |
|||
'third_party/glslang' \ |
|||
'third_party/google_input_tools' \ |
|||
'third_party/google_input_tools/third_party/closure_library' \ |
|||
'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ |
|||
'third_party/google_trust_services' \ |
|||
'third_party/googletest' \ |
|||
'third_party/grpc' \ |
|||
'third_party/grpc/src/third_party/nanopb' \ |
|||
'third_party/harfbuzz-ng' \ |
|||
'third_party/hunspell' \ |
|||
'third_party/iccjpeg' \ |
|||
@ -997,7 +975,9 @@ build/linux/unbundle/remove_bundled_libraries.py \ |
|||
'third_party/libsrtp' \ |
|||
'third_party/libsync' \ |
|||
'third_party/libudev' \ |
|||
'third_party/liburlpattern' \ |
|||
'third_party/libusb' \ |
|||
'third_party/libva_protected_content' \ |
|||
'third_party/libvpx' \ |
|||
'third_party/libvpx/source/libvpx/third_party/x86inc' \ |
|||
'third_party/libwebm' \ |
|||
@ -1017,6 +997,7 @@ build/linux/unbundle/remove_bundled_libraries.py \ |
|||
%endif |
|||
'third_party/mesa' \ |
|||
'third_party/metrics_proto' \ |
|||
'third_party/minigbm' \ |
|||
'third_party/modp_b64' \ |
|||
'third_party/nasm' \ |
|||
'third_party/nearby' \ |
|||
@ -1043,6 +1024,8 @@ build/linux/unbundle/remove_bundled_libraries.py \ |
|||
'third_party/pdfium/third_party/libtiff' \ |
|||
'third_party/pdfium/third_party/skia_shared' \ |
|||
'third_party/perfetto' \ |
|||
'third_party/perfetto/protos/third_party/chromium' \ |
|||
'third_party/perfetto/protos/third_party/pprof' \ |
|||
'third_party/pffft' \ |
|||
'third_party/ply' \ |
|||
'third_party/polymer' \ |
|||
@ -1060,7 +1043,6 @@ build/linux/unbundle/remove_bundled_libraries.py \ |
|||
'third_party/s2cellid' \ |
|||
'third_party/schema_org' \ |
|||
'third_party/securemessage' \ |
|||
'third_party/shaka-player' \ |
|||
'third_party/shell-encryption' \ |
|||
'third_party/simplejson' \ |
|||
'third_party/sinonjs' \ |
|||
@ -1072,8 +1054,6 @@ build/linux/unbundle/remove_bundled_libraries.py \ |
|||
'third_party/smhasher' \ |
|||
'third_party/snappy' \ |
|||
'third_party/speech-dispatcher' \ |
|||
'third_party/spirv-headers' \ |
|||
'third_party/SPIRV-Tools' \ |
|||
'third_party/sqlite' \ |
|||
'third_party/swiftshader' \ |
|||
'third_party/swiftshader/third_party/astc-encoder' \ |
|||
@ -1417,7 +1397,7 @@ fi |
|||
%{_datadir}/icons/hicolor/*/apps/%{chromium_browser_channel}.png |
|||
%{_datadir}/applications/*.desktop |
|||
%{_datadir}/metainfo/*.appdata.xml |
|||
%{_datadir}/gnome-control-center/default-apps/chromium-browser.xml |
|||
%{_datadir}/gnome-control-center/default-apps/ungoogled-chromium.xml |
|||
|
|||
%{chromium_path}/headless_*.pak |
|||
%if %{build_clear_key_cdm} |
|||
@ -1488,6 +1468,9 @@ fi |
|||
%endif |
|||
|
|||
%changelog |
|||
* Sun Mar 7 2021 wchen342 <[email protected]> - 89.0.4389.72-1 |
|||
- Update Chromium to 89.0.4389.72 |
|||
|
|||
* Fri Feb 19 2021 wchen342 <[email protected]> - 88.0.4324.182-1 |
|||
- Update Chromium to 88.0.4234.182 |
|||
|
|||
|
|||
Loading…
Reference in new issue