Tom Callaway
6 years ago
commit
9d8ad7c073
@ -1,24 +0,0 @@
|
||||
diff -up chromium-70.0.3538.110/media/gpu/vaapi/BUILD.gn.i686permissive chromium-70.0.3538.110/media/gpu/vaapi/BUILD.gn
|
||||
--- chromium-70.0.3538.110/media/gpu/vaapi/BUILD.gn.i686permissive 2018-11-29 09:27:02.405909871 -0500
|
||||
+++ chromium-70.0.3538.110/media/gpu/vaapi/BUILD.gn 2018-11-29 09:29:50.648259696 -0500
|
||||
@@ -10,6 +10,11 @@ import("//ui/ozone/ozone.gni")
|
||||
|
||||
assert(use_vaapi)
|
||||
|
||||
+config("vaapi_permissive") {
|
||||
+ cflags = [ "-fpermissive" ]
|
||||
+}
|
||||
+
|
||||
+
|
||||
action("libva_generate_stubs") {
|
||||
extra_header = "va_stub_header.fragment"
|
||||
|
||||
@@ -98,6 +103,8 @@ source_set("vaapi") {
|
||||
"//third_party/libyuv",
|
||||
]
|
||||
|
||||
+ configs += [ ":vaapi_permissive" ]
|
||||
+
|
||||
if (use_x11) {
|
||||
configs += [ "//build/config/linux:x11" ]
|
||||
deps += [ "//ui/gfx/x" ]
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-71.0.3578.98/third_party/tcmalloc/gperftools-2.0/chromium/src/base/linux_syscall_support.h.gcc9 chromium-71.0.3578.98/third_party/tcmalloc/gperftools-2.0/chromium/src/base/linux_syscall_support.h
|
||||
--- chromium-71.0.3578.98/third_party/tcmalloc/gperftools-2.0/chromium/src/base/linux_syscall_support.h.gcc9 2019-01-08 13:27:25.193614727 -0500
|
||||
+++ chromium-71.0.3578.98/third_party/tcmalloc/gperftools-2.0/chromium/src/base/linux_syscall_support.h 2019-01-08 13:27:35.161392234 -0500
|
||||
@@ -1231,7 +1231,7 @@ typedef unsigned long int ulong;
|
||||
"d"(LSS_SYSCALL_ARG(parent_tidptr)),
|
||||
"r"(LSS_SYSCALL_ARG(newtls)),
|
||||
"r"(LSS_SYSCALL_ARG(child_tidptr))
|
||||
- : "rsp", "memory", "r8", "r10", "r11", "rcx");
|
||||
+ : "memory", "r8", "r10", "r11", "rcx");
|
||||
}
|
||||
LSS_RETURN(int, __res);
|
||||
}
|
||||
@ -1,11 +1,22 @@
|
||||
diff -up chromium-71.0.3578.98/third_party/widevine/cdm/BUILD.gn.wvhack chromium-71.0.3578.98/third_party/widevine/cdm/BUILD.gn
|
||||
diff -up chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h.wvhack chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h
|
||||
--- chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h.wvhack 2018-12-14 11:58:37.918972853 -0500
|
||||
+++ chromium-71.0.3578.98/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-14 11:58:57.327554078 -0500
|
||||
@@ -11,5 +11,6 @@
|
||||
// If the Widevine CDM is available define the following:
|
||||
diff -upr chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc chromium-71.0.3578.80/chrome/common/chrome_content_client.cc
|
||||
--- chromium-71.0.3578.80.orig/chrome/common/chrome_content_client.cc 2018-12-21 20:16:43.000000000 +0000
|
||||
+++ chromium-71.0.3578.80/chrome/common/chrome_content_client.cc 2018-12-21 21:34:28.658206942 +0000
|
||||
@@ -99,7 +99,7 @@
|
||||
// Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
|
||||
// bundled and not a component. When the Widevine CDM is a component, it is
|
||||
// registered in widevine_cdm_component_installer.cc.
|
||||
-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
|
||||
+#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
|
||||
#define REGISTER_BUNDLED_WIDEVINE_CDM
|
||||
#include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
|
||||
// TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support
|
||||
diff -upr chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h
|
||||
--- chromium-71.0.3578.80.orig/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-21 20:18:01.000000000 +0000
|
||||
+++ chromium-71.0.3578.80/third_party/widevine/cdm/widevine_cdm_version.h 2018-12-21 21:37:45.635374949 +0000
|
||||
@@ -12,4 +12,6 @@
|
||||
// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
|
||||
// as a string, e.g., "1.0.123.456").
|
||||
+#define WIDEVINE_CDM_VERSION_STRING "unknown"
|
||||
|
||||
+#define WIDEVINE_CDM_VERSION_STRING "unknown"
|
||||
+
|
||||
#endif // WIDEVINE_CDM_VERSION_H_
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-72.0.3626.121/content/common/user_agent.cc.fedora-user-agent chromium-72.0.3626.121/content/common/user_agent.cc
|
||||
--- chromium-72.0.3626.121/content/common/user_agent.cc.fedora-user-agent 2019-03-10 14:21:02.877454982 -0400
|
||||
+++ chromium-72.0.3626.121/content/common/user_agent.cc 2019-03-10 14:22:05.728812272 -0400
|
||||
@@ -36,7 +36,7 @@ std::string GetUserAgentPlatform() {
|
||||
#elif defined(OS_MACOSX)
|
||||
"Macintosh; ";
|
||||
#elif defined(USE_X11) || defined(USE_OZONE)
|
||||
- "X11; "; // strange, but that's what Firefox uses
|
||||
+ "X11; Fedora; "; // strange, but that's what Firefox uses
|
||||
#elif defined(OS_ANDROID)
|
||||
"Linux; ";
|
||||
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
|
||||
@ -0,0 +1,29 @@
|
||||
diff -up chromium-72.0.3626.121/media/gpu/vaapi/vaapi_wrapper.cc.fixvacheck chromium-72.0.3626.121/media/gpu/vaapi/vaapi_wrapper.cc
|
||||
--- chromium-72.0.3626.121/media/gpu/vaapi/vaapi_wrapper.cc.fixvacheck 2019-03-10 14:54:38.744305074 -0400
|
||||
+++ chromium-72.0.3626.121/media/gpu/vaapi/vaapi_wrapper.cc 2019-03-10 14:55:34.383221574 -0400
|
||||
@@ -334,15 +334,16 @@ bool VADisplayState::InitializeOnce() {
|
||||
<< va_vendor_string_;
|
||||
|
||||
// The VAAPI version is determined from what is loaded on the system by
|
||||
- // calling vaInitialize(). We want a runtime evaluation of libva version,
|
||||
- // of what is loaded on the system, with, what browser is compiled with.
|
||||
- // Also since the libva is now ABI-compatible, relax the version check
|
||||
- // which helps in upgrading the libva, without breaking any existing
|
||||
- // functionality.
|
||||
- if (!VA_CHECK_VERSION(major_version, minor_version, 0)) {
|
||||
- LOG(ERROR) << "This build of Chromium requires VA-API version "
|
||||
- << VA_MAJOR_VERSION << "." << VA_MINOR_VERSION
|
||||
- << ", system version: " << major_version << "." << minor_version;
|
||||
+ // calling vaInitialize(). Since the libva is now ABI-compatible, relax the
|
||||
+ // version check which helps in upgrading the libva, without breaking any
|
||||
+ // existing functionality. Make sure the system version is not older than
|
||||
+ // the version with which the chromium is built since libva is only
|
||||
+ // guaranteed to be backward (and not forward) compatible.
|
||||
+ if (VA_MAJOR_VERSION > major_version ||
|
||||
+ (VA_MAJOR_VERSION == major_version && VA_MINOR_VERSION > minor_version)) {
|
||||
+ LOG(ERROR) << "The system version " << major_version << "." << minor_version
|
||||
+ << " should be greater than or equal to "
|
||||
+ << VA_MAJOR_VERSION << "." << VA_MINOR_VERSION;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@ -0,0 +1,36 @@
|
||||
diff -up chromium-72.0.3626.121/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-72.0.3626.121/gpu/ipc/common/mailbox_struct_traits.h
|
||||
--- chromium-72.0.3626.121/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 2019-03-01 23:10:21.000000000 -0500
|
||||
+++ chromium-72.0.3626.121/gpu/ipc/common/mailbox_struct_traits.h 2019-03-10 14:07:48.300244125 -0400
|
||||
@@ -15,7 +15,7 @@ namespace mojo {
|
||||
template <>
|
||||
struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
|
||||
static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {
|
||||
- return mailbox.name;
|
||||
+ return base::make_span(mailbox.name);
|
||||
}
|
||||
static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
|
||||
};
|
||||
diff -up chromium-72.0.3626.121/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-72.0.3626.121/services/viz/public/cpp/compositing/quads_struct_traits.h
|
||||
--- chromium-72.0.3626.121/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 2019-03-01 23:10:31.000000000 -0500
|
||||
+++ chromium-72.0.3626.121/services/viz/public/cpp/compositing/quads_struct_traits.h 2019-03-10 14:07:48.303244046 -0400
|
||||
@@ -340,7 +340,7 @@ struct StructTraits<viz::mojom::TextureQ
|
||||
static base::span<const float> vertex_opacity(const viz::DrawQuad& input) {
|
||||
const viz::TextureDrawQuad* quad =
|
||||
viz::TextureDrawQuad::MaterialCast(&input);
|
||||
- return quad->vertex_opacity;
|
||||
+ return base::make_span(quad->vertex_opacity);
|
||||
}
|
||||
|
||||
static bool y_flipped(const viz::DrawQuad& input) {
|
||||
diff -up chromium-72.0.3626.121/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-72.0.3626.121/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
|
||||
--- chromium-72.0.3626.121/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 2019-03-10 14:07:48.307243941 -0400
|
||||
+++ chromium-72.0.3626.121/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2019-03-10 14:09:16.565920044 -0400
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "modules/audio_processing/aec3/aec_state.h"
|
||||
|
||||
-#include <math.h>
|
||||
+#include <cmath>
|
||||
#include <algorithm>
|
||||
#include <numeric>
|
||||
#include <vector>
|
||||
@ -0,0 +1,79 @@
|
||||
diff -up chromium-72.0.3626.121/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-72.0.3626.121/chrome/common/safe_browsing/BUILD.gn
|
||||
--- chromium-72.0.3626.121/chrome/common/safe_browsing/BUILD.gn.nounrar 2019-03-10 14:15:47.187705953 -0400
|
||||
+++ chromium-72.0.3626.121/chrome/common/safe_browsing/BUILD.gn 2019-03-10 14:16:47.154138649 -0400
|
||||
@@ -56,40 +56,6 @@ if (safe_browsing_mode == 1) {
|
||||
]
|
||||
}
|
||||
|
||||
- source_set("rar_analyzer") {
|
||||
- sources = [
|
||||
- "rar_analyzer.cc",
|
||||
- "rar_analyzer.h",
|
||||
- ]
|
||||
-
|
||||
- deps = [
|
||||
- ":archive_analyzer_results",
|
||||
- ":download_type_util",
|
||||
- ":file_type_policies",
|
||||
- "//base",
|
||||
- "//base:i18n",
|
||||
- "//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:csd_proto",
|
||||
- ]
|
||||
- }
|
||||
-
|
||||
source_set("disk_image_type_sniffer_mac") {
|
||||
sources = [
|
||||
"disk_image_type_sniffer_mac.cc",
|
||||
@@ -150,7 +116,6 @@ source_set("safe_browsing") {
|
||||
deps += [
|
||||
":archive_analyzer_results",
|
||||
":download_type_util",
|
||||
- ":rar_analyzer",
|
||||
"//components/safe_browsing:features",
|
||||
]
|
||||
|
||||
diff -up chromium-72.0.3626.121/chrome/common/safe_browsing/DEPS.nounrar chromium-72.0.3626.121/chrome/common/safe_browsing/DEPS
|
||||
--- chromium-72.0.3626.121/chrome/common/safe_browsing/DEPS.nounrar 2019-03-01 23:10:03.000000000 -0500
|
||||
+++ chromium-72.0.3626.121/chrome/common/safe_browsing/DEPS 2019-03-10 14:14:55.430058716 -0400
|
||||
@@ -1,6 +1,5 @@
|
||||
include_rules = [
|
||||
"+components/safe_browsing",
|
||||
"+third_party/protobuf",
|
||||
- "+third_party/unrar",
|
||||
"+third_party/zlib",
|
||||
]
|
||||
diff -up chromium-72.0.3626.121/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-72.0.3626.121/chrome/services/file_util/safe_archive_analyzer.cc
|
||||
--- chromium-72.0.3626.121/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2019-03-01 23:10:04.000000000 -0500
|
||||
+++ chromium-72.0.3626.121/chrome/services/file_util/safe_archive_analyzer.cc 2019-03-10 14:14:55.433058638 -0400
|
||||
@@ -47,9 +47,13 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
|
||||
|
||||
void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
|
||||
AnalyzeRarFileCallback callback) {
|
||||
+#if 0
|
||||
DCHECK(rar_file.IsValid());
|
||||
|
||||
safe_browsing::ArchiveAnalyzerResults results;
|
||||
safe_browsing::rar_analyzer::AnalyzeRarFile(std::move(rar_file), &results);
|
||||
std::move(callback).Run(results);
|
||||
+#else
|
||||
+ NOTREACHED();
|
||||
+#endif
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
diff -up chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd.notest chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd
|
||||
--- chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd.notest 2019-03-10 13:54:17.843583876 -0400
|
||||
+++ chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd 2019-03-10 14:03:29.302063637 -0400
|
||||
@@ -8,7 +8,6 @@
|
||||
</outputs>
|
||||
<release seq="1">
|
||||
<includes>
|
||||
- <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
|
||||
<include name="IDR_WEB_UI_TEST_MOJO_JS" file="${root_gen_dir}/chrome/test/data/webui/web_ui_test.mojom.js" use_base_dir="false" type="BINDATA"/>
|
||||
<include name="IDR_WEB_UI_TEST_MOJO_LITE_JS" file="${root_gen_dir}/chrome/test/data/webui/web_ui_test.mojom-lite.js" use_base_dir="false" type="BINDATA"/>
|
||||
</includes>
|
||||
@ -0,0 +1,11 @@
|
||||
diff -up chromium-73.0.3683.75/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc.aarch64-limits chromium-73.0.3683.75/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
|
||||
--- chromium-73.0.3683.75/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc.aarch64-limits 2019-03-15 12:08:21.208676651 -0400
|
||||
+++ chromium-73.0.3683.75/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc 2019-03-15 12:08:40.934251685 -0400
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
+#include <limits>
|
||||
|
||||
#include "base/logging.h"
|
||||
|
||||
@ -0,0 +1,48 @@
|
||||
diff -up chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn.disable-ndnpc chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn
|
||||
--- chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn.disable-ndnpc 2019-03-13 10:29:00.331009643 -0400
|
||||
+++ chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn 2019-03-13 10:29:28.344458746 -0400
|
||||
@@ -31,7 +31,7 @@ gcc_toolchain("arm64") {
|
||||
ld = cxx
|
||||
readelf = "${toolprefix}readelf"
|
||||
nm = "${toolprefix}nm"
|
||||
- extra_cppflags = "-fno-delete-null-pointer-checks"
|
||||
+ extra_cppflags = ""
|
||||
|
||||
toolchain_args = {
|
||||
current_cpu = "arm64"
|
||||
@@ -50,7 +50,7 @@ gcc_toolchain("arm") {
|
||||
ld = cxx
|
||||
readelf = "${toolprefix}readelf"
|
||||
nm = "${toolprefix}nm"
|
||||
- extra_cppflags = "-fno-delete-null-pointer-checks"
|
||||
+ extra_cppflags = ""
|
||||
|
||||
toolchain_args = {
|
||||
current_cpu = "arm"
|
||||
@@ -101,7 +101,7 @@ gcc_toolchain("x86") {
|
||||
nm = "nm"
|
||||
ar = "ar"
|
||||
ld = cxx
|
||||
- extra_cppflags = "-fno-delete-null-pointer-checks -g1"
|
||||
+ extra_cppflags = "-g1"
|
||||
|
||||
# Output linker map files for binary size analysis.
|
||||
enable_linker_map = true
|
||||
@@ -155,7 +155,7 @@ gcc_toolchain("x64") {
|
||||
nm = "nm"
|
||||
ar = "ar"
|
||||
ld = cxx
|
||||
- extra_cppflags = "-fno-delete-null-pointer-checks"
|
||||
+ extra_cppflags = ""
|
||||
|
||||
# Output linker map files for binary size analysis.
|
||||
enable_linker_map = true
|
||||
@@ -190,7 +190,7 @@ gcc_toolchain("mipsel") {
|
||||
ld = cxx
|
||||
readelf = "${toolprefix}readelf"
|
||||
nm = "${toolprefix}nm"
|
||||
- extra_cppflags = "-fno-delete-null-pointer-checks"
|
||||
+ extra_cppflags = ""
|
||||
|
||||
toolchain_args = {
|
||||
cc_wrapper = ""
|
||||
@ -0,0 +1,48 @@
|
||||
diff -up chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc.el7-noexcept chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc
|
||||
--- chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc.el7-noexcept 2019-03-19 11:03:09.820613771 -0400
|
||||
+++ chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc 2019-03-19 11:08:05.915213225 -0400
|
||||
@@ -19,7 +19,7 @@ MediaSink::MediaSink(const MediaSink::Id
|
||||
provider_id_(provider_id) {}
|
||||
|
||||
MediaSink::MediaSink(const MediaSink& other) = default;
|
||||
-MediaSink::MediaSink(MediaSink&& other) noexcept = default;
|
||||
+MediaSink::MediaSink(MediaSink&& other) = default;
|
||||
MediaSink::MediaSink() = default;
|
||||
MediaSink::~MediaSink() = default;
|
||||
|
||||
diff -up chromium-73.0.3683.75/components/policy/core/common/policy_map.cc.el7-noexcept chromium-73.0.3683.75/components/policy/core/common/policy_map.cc
|
||||
--- chromium-73.0.3683.75/components/policy/core/common/policy_map.cc.el7-noexcept 2019-03-11 18:00:56.000000000 -0400
|
||||
+++ chromium-73.0.3683.75/components/policy/core/common/policy_map.cc 2019-03-19 11:03:09.823613699 -0400
|
||||
@@ -25,7 +25,7 @@ PolicyMap::Entry::Entry() = default;
|
||||
PolicyMap::Entry::~Entry() = default;
|
||||
|
||||
PolicyMap::Entry::Entry(Entry&&) noexcept = default;
|
||||
-PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) noexcept = default;
|
||||
+PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) = default;
|
||||
|
||||
PolicyMap::Entry PolicyMap::Entry::DeepCopy() const {
|
||||
Entry copy;
|
||||
diff -up chromium-73.0.3683.75/components/signin/core/browser/account_info.cc.el7-noexcept chromium-73.0.3683.75/components/signin/core/browser/account_info.cc
|
||||
--- chromium-73.0.3683.75/components/signin/core/browser/account_info.cc.el7-noexcept 2019-03-11 18:00:57.000000000 -0400
|
||||
+++ chromium-73.0.3683.75/components/signin/core/browser/account_info.cc 2019-03-19 11:03:09.872612537 -0400
|
||||
@@ -50,7 +50,7 @@ AccountInfo::AccountInfo(AccountInfo&& o
|
||||
|
||||
AccountInfo& AccountInfo::operator=(const AccountInfo& other) = default;
|
||||
|
||||
-AccountInfo& AccountInfo::operator=(AccountInfo&& other) noexcept = default;
|
||||
+AccountInfo& AccountInfo::operator=(AccountInfo&& other) = default;
|
||||
|
||||
bool AccountInfo::IsEmpty() const {
|
||||
return account_id.empty() && email.empty() && gaia.empty() &&
|
||||
diff -up chromium-73.0.3683.75/gpu/config/gpu_info.cc.el7-noexcept chromium-73.0.3683.75/gpu/config/gpu_info.cc
|
||||
--- chromium-73.0.3683.75/gpu/config/gpu_info.cc.el7-noexcept 2019-03-11 18:00:59.000000000 -0400
|
||||
+++ chromium-73.0.3683.75/gpu/config/gpu_info.cc 2019-03-19 11:03:10.238603858 -0400
|
||||
@@ -118,7 +118,7 @@ GPUInfo::GPUDevice& GPUInfo::GPUDevice::
|
||||
const GPUInfo::GPUDevice& other) = default;
|
||||
|
||||
GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=(
|
||||
- GPUInfo::GPUDevice&& other) noexcept = default;
|
||||
+ GPUInfo::GPUDevice&& other) = default;
|
||||
|
||||
GPUInfo::GPUInfo()
|
||||
: optimus(false),
|
||||
@ -0,0 +1,17 @@
|
||||
diff -up chromium-73.0.3683.75/third_party/swiftshader/third_party/llvm-7.0/BUILD.gn.nohh chromium-73.0.3683.75/third_party/swiftshader/third_party/llvm-7.0/BUILD.gn
|
||||
--- chromium-73.0.3683.75/third_party/swiftshader/third_party/llvm-7.0/BUILD.gn.nohh 2019-03-15 09:02:26.167929864 -0400
|
||||
+++ chromium-73.0.3683.75/third_party/swiftshader/third_party/llvm-7.0/BUILD.gn 2019-03-15 09:03:30.334433446 -0400
|
||||
@@ -74,9 +74,12 @@ config("swiftshader_llvm_private_config"
|
||||
"-Wno-unused-private-field",
|
||||
"-Wno-unused-result",
|
||||
"-Wno-unused-variable",
|
||||
- "-Wno-error=header-hygiene",
|
||||
]
|
||||
|
||||
+ if (is_clang) {
|
||||
+ cflags += [ "-Wno-error=header-hygiene" ]
|
||||
+ }
|
||||
+
|
||||
defines = [
|
||||
"__STDC_CONSTANT_MACROS",
|
||||
"__STDC_LIMIT_MACROS",
|
||||
@ -0,0 +1,81 @@
|
||||
diff -up chromium-73.0.3683.75/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-73.0.3683.75/chrome/common/safe_browsing/BUILD.gn
|
||||
--- chromium-73.0.3683.75/chrome/common/safe_browsing/BUILD.gn.nounrar 2019-03-13 08:59:45.988801102 -0400
|
||||
+++ chromium-73.0.3683.75/chrome/common/safe_browsing/BUILD.gn 2019-03-13 09:00:20.244977448 -0400
|
||||
@@ -64,41 +64,6 @@ if (safe_browsing_mode == 1) {
|
||||
]
|
||||
}
|
||||
|
||||
- source_set("rar_analyzer") {
|
||||
- sources = [
|
||||
- "rar_analyzer.cc",
|
||||
- "rar_analyzer.h",
|
||||
- ]
|
||||
-
|
||||
- deps = [
|
||||
- ":archive_analyzer_results",
|
||||
- ":download_type_util",
|
||||
- ":file_type_policies",
|
||||
- "//base",
|
||||
- "//base:i18n",
|
||||
- "//components/safe_browsing:features",
|
||||
- "//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:csd_proto",
|
||||
- ]
|
||||
- }
|
||||
-
|
||||
source_set("disk_image_type_sniffer_mac") {
|
||||
sources = [
|
||||
"disk_image_type_sniffer_mac.cc",
|
||||
@@ -167,7 +132,6 @@ source_set("safe_browsing") {
|
||||
":archive_analyzer_results",
|
||||
":binary_feature_extractor",
|
||||
":download_type_util",
|
||||
- ":rar_analyzer",
|
||||
"//components/safe_browsing:features",
|
||||
]
|
||||
|
||||
diff -up chromium-73.0.3683.75/chrome/common/safe_browsing/DEPS.nounrar chromium-73.0.3683.75/chrome/common/safe_browsing/DEPS
|
||||
--- chromium-73.0.3683.75/chrome/common/safe_browsing/DEPS.nounrar 2019-03-11 18:00:54.000000000 -0400
|
||||
+++ chromium-73.0.3683.75/chrome/common/safe_browsing/DEPS 2019-03-13 08:59:26.513282690 -0400
|
||||
@@ -1,6 +1,5 @@
|
||||
include_rules = [
|
||||
"+components/safe_browsing",
|
||||
"+third_party/protobuf",
|
||||
- "+third_party/unrar",
|
||||
"+third_party/zlib",
|
||||
]
|
||||
diff -up chromium-73.0.3683.75/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-73.0.3683.75/chrome/services/file_util/safe_archive_analyzer.cc
|
||||
--- chromium-73.0.3683.75/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2019-03-13 08:59:26.518282566 -0400
|
||||
+++ chromium-73.0.3683.75/chrome/services/file_util/safe_archive_analyzer.cc 2019-03-13 09:01:03.885935483 -0400
|
||||
@@ -48,10 +48,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,11 @@
|
||||
diff -up chromium-73.0.3683.75/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.cstringfix chromium-73.0.3683.75/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
|
||||
--- chromium-73.0.3683.75/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.cstringfix 2019-03-13 13:04:25.290842447 -0400
|
||||
+++ chromium-73.0.3683.75/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc 2019-03-13 13:05:13.234897441 -0400
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <spa/param/video/raw-utils.h>
|
||||
#include <spa/support/type-map.h>
|
||||
|
||||
+#include <cstring>
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
diff -up chromium-73.0.3683.75/media/gpu/vaapi/BUILD.gn.i686permissive chromium-73.0.3683.75/media/gpu/vaapi/BUILD.gn
|
||||
--- chromium-73.0.3683.75/media/gpu/vaapi/BUILD.gn.i686permissive 2019-03-15 10:10:18.689287815 +0100
|
||||
+++ chromium-73.0.3683.75/media/gpu/vaapi/BUILD.gn 2019-03-15 10:11:56.943294101 +0100
|
||||
@@ -11,6 +11,10 @@ import("//ui/ozone/ozone.gni")
|
||||
|
||||
assert(use_vaapi)
|
||||
|
||||
+config("vaapi_permissive") {
|
||||
+ cflags = [ "-fpermissive" ]
|
||||
+}
|
||||
+
|
||||
generate_stubs("libva_stubs") {
|
||||
extra_header = "va_stub_header.fragment"
|
||||
sigs = [ "va.sigs" ]
|
||||
@@ -79,6 +83,8 @@ source_set("vaapi") {
|
||||
configs += [ "//build/config/linux/libva" ]
|
||||
}
|
||||
|
||||
+ configs += [ ":vaapi_permissive" ]
|
||||
+
|
||||
if (use_x11) {
|
||||
configs += [ "//build/config/linux:x11" ]
|
||||
deps += [ "//ui/gfx/x" ]
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue