Tom spot Callaway
3 years ago
commit
d23de21471
@ -1,26 +0,0 @@
|
||||
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,12 @@
|
||||
diff -up chromium-92.0.4515.159/base/allocator/partition_allocator/partition_alloc_config.h.epel8-uffd-off chromium-92.0.4515.159/base/allocator/partition_allocator/partition_alloc_config.h
|
||||
--- chromium-92.0.4515.159/base/allocator/partition_allocator/partition_alloc_config.h.epel8-uffd-off 2021-08-30 09:25:56.878243728 -0400
|
||||
+++ chromium-92.0.4515.159/base/allocator/partition_allocator/partition_alloc_config.h 2021-08-30 09:26:12.489322762 -0400
|
||||
@@ -37,7 +37,7 @@ static_assert(sizeof(void*) != 8, "");
|
||||
#if defined(PA_HAS_64_BITS_POINTERS) && \
|
||||
(defined(OS_LINUX) || defined(OS_ANDROID))
|
||||
// TODO(bikineev): Enable for ChromeOS.
|
||||
-#define PA_STARSCAN_UFFD_WRITE_PROTECTOR_SUPPORTED
|
||||
+// #define PA_STARSCAN_UFFD_WRITE_PROTECTOR_SUPPORTED
|
||||
#endif
|
||||
|
||||
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
|
||||
@ -0,0 +1,47 @@
|
||||
From 7108f83c8ad1bad4072e4f32da3db6d59cf51400 Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Murashov <ivan.murashov@lge.com>
|
||||
Date: Tue, 20 Jul 2021 13:16:44 +0300
|
||||
Subject: [PATCH] GCC: Remove double declaration of ContextSet
|
||||
|
||||
After the CL
|
||||
https://chromium-review.googlesource.com/c/angle/angle/+/2965780
|
||||
the build with GCC failed with error:
|
||||
/third_party/angle/src/libANGLE/Display.h:325:37: error: declaration of
|
||||
'typedef class std::__1::set<gl::Context*> egl::Display::ContextSet'
|
||||
changes meaning of 'ContextSet' [-fpermissive]
|
||||
/third_party/angle/src/libANGLE/Display.h:75:7: note: 'ContextSet'
|
||||
declared here as 'using ContextSet = class std::__1::set<gl::Context*>'
|
||||
|
||||
To fix the error the double declaration of ContextSet is removed.
|
||||
|
||||
Bug: angleproject:5878, chromium:819294
|
||||
Change-Id: Id9e52061af53ea18dd5d13b960daaa67a14f61ca
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3038804
|
||||
Reviewed-by: Jamie Madill <jmadill@chromium.org>
|
||||
Commit-Queue: Jamie Madill <jmadill@chromium.org>
|
||||
---
|
||||
|
||||
diff --git a/third_party/angle/CONTRIBUTORS b/third_party/angle/CONTRIBUTORS
|
||||
index 887ddc2..94b1b4d 100644
|
||||
--- a/third_party/angle/CONTRIBUTORS
|
||||
+++ b/third_party/angle/CONTRIBUTORS
|
||||
@@ -154,6 +154,7 @@
|
||||
|
||||
LG Electronics, Inc.
|
||||
Jani Hautakangas
|
||||
+ Ivan Murashov
|
||||
|
||||
IBM Inc.
|
||||
Junliang Yan
|
||||
diff --git a/third_party/angle/src/libANGLE/Display.h b/third_party/angle/src/libANGLE/Display.h
|
||||
index f33123b..f0c0910 100644
|
||||
--- a/third_party/angle/src/libANGLE/Display.h
|
||||
+++ b/third_party/angle/src/libANGLE/Display.h
|
||||
@@ -322,7 +322,6 @@
|
||||
|
||||
ConfigSet mConfigSet;
|
||||
|
||||
- typedef std::set<gl::Context *> ContextSet;
|
||||
ContextSet mContextSet;
|
||||
|
||||
typedef std::set<Image *> ImageSet;
|
||||
@ -0,0 +1,24 @@
|
||||
From 409859ad9ba763a4267fb3457df7cd8eb0b7387b Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Hartmann <stha09@googlemail.com>
|
||||
Date: Sun, 25 Jul 2021 19:43:45 +0000
|
||||
Subject: [PATCH] IWYU: add vector for std::vector
|
||||
|
||||
---
|
||||
chrome/browser/devtools/devtools_embedder_message_dispatcher.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
|
||||
index 12f8500..4007112 100644
|
||||
--- a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
|
||||
+++ b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
+#include <vector>
|
||||
|
||||
#include "base/callback.h"
|
||||
#include "ui/gfx/geometry/insets.h"
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
From 92fc089d50fc81b9903cd0573c95749e41081474 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Hartmann <stha09@googlemail.com>
|
||||
Date: Sun, 25 Jul 2021 21:38:26 +0000
|
||||
Subject: [PATCH] IWYU: add cstring for std::strcpy
|
||||
|
||||
---
|
||||
extensions/browser/extension_dialog_auto_confirm.cc | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/extensions/browser/extension_dialog_auto_confirm.cc b/extensions/browser/extension_dialog_auto_confirm.cc
|
||||
index adb4ac3..be8b161 100644
|
||||
--- a/extensions/browser/extension_dialog_auto_confirm.cc
|
||||
+++ b/extensions/browser/extension_dialog_auto_confirm.cc
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
#include "extensions/browser/extension_dialog_auto_confirm.h"
|
||||
|
||||
+#include <cstring>
|
||||
#include <utility>
|
||||
|
||||
#include "base/check.h"
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,117 @@
|
||||
From 7a6289c5ace52cf88f0e19caa5f78b7c15d0e7a6 Mon Sep 17 00:00:00 2001
|
||||
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
||||
Date: Wed, 21 Jul 2021 17:42:30 +0000
|
||||
Subject: [PATCH] fxcodec, fxge: fix missing includes with libstdc++
|
||||
|
||||
These missing includes break the build with gcc/libstdc++, they were not
|
||||
a problem in practice with clang/libc++.
|
||||
|
||||
Change-Id: I40013f97ba7ab06f32aa59f87b04aec06a19478c
|
||||
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83210
|
||||
Commit-Queue: Lei Zhang <thestig@chromium.org>
|
||||
Reviewed-by: Lei Zhang <thestig@chromium.org>
|
||||
---
|
||||
|
||||
diff --git a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
|
||||
index cea0679..036f250 100644
|
||||
--- a/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
|
||||
+++ b/third_party/pdfium/core/fxcodec/jpeg/jpegmodule.cpp
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "core/fxcodec/jpeg/jpegmodule.h"
|
||||
|
||||
#include <setjmp.h>
|
||||
+#include <string.h>
|
||||
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
diff --git a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
|
||||
index c66985a..9c1122b 100644
|
||||
--- a/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
|
||||
+++ b/third_party/pdfium/core/fxcodec/jpx/cjpx_decoder.cpp
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#include "core/fxcodec/jpx/cjpx_decoder.h"
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
#include <algorithm>
|
||||
#include <limits>
|
||||
#include <utility>
|
||||
diff --git a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
|
||||
index 5369d52..d198852 100644
|
||||
--- a/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
|
||||
+++ b/third_party/pdfium/core/fxge/cfx_cliprgn.cpp
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#include "core/fxge/cfx_cliprgn.h"
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
#include <utility>
|
||||
|
||||
#include "core/fxge/dib/cfx_dibitmap.h"
|
||||
diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
|
||||
index 6f9b420..0f1ffae 100644
|
||||
--- a/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
|
||||
+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapcomposer.cpp
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#include "core/fxge/dib/cfx_bitmapcomposer.h"
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
#include "core/fxge/cfx_cliprgn.h"
|
||||
#include "core/fxge/dib/cfx_dibitmap.h"
|
||||
|
||||
diff --git a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
|
||||
index f57c00e..45a0a18 100644
|
||||
--- a/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
|
||||
+++ b/third_party/pdfium/core/fxge/dib/cfx_bitmapstorer.cpp
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#include "core/fxge/dib/cfx_bitmapstorer.h"
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
#include <utility>
|
||||
|
||||
#include "core/fxge/dib/cfx_dibitmap.h"
|
||||
diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
|
||||
index 4ec0ddb..a1de2fb 100644
|
||||
--- a/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
|
||||
+++ b/third_party/pdfium/core/fxge/dib/cfx_dibbase.cpp
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#include "core/fxge/dib/cfx_dibbase.h"
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
#include <algorithm>
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
diff --git a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
|
||||
index d7ccf6c..94e8acc 100644
|
||||
--- a/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
|
||||
+++ b/third_party/pdfium/core/fxge/dib/cfx_dibitmap.cpp
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#include "core/fxge/dib/cfx_dibitmap.h"
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
#include <limits>
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
diff --git a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
|
||||
index e8362d7..c04c6dc 100644
|
||||
--- a/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
|
||||
+++ b/third_party/pdfium/core/fxge/dib/cfx_scanlinecompositor.cpp
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
#include "core/fxge/dib/cfx_scanlinecompositor.h"
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
#include <algorithm>
|
||||
|
||||
#include "core/fxge/dib/fx_dib.h"
|
||||
@ -0,0 +1,34 @@
|
||||
diff -up chromium-93.0.4577.63/buildtools/linux64/clang-format.clang-format-py3 chromium-93.0.4577.63/buildtools/linux64/clang-format
|
||||
--- chromium-93.0.4577.63/buildtools/linux64/clang-format.clang-format-py3 2021-09-03 04:42:46.736294345 +0000
|
||||
+++ chromium-93.0.4577.63/buildtools/linux64/clang-format 2021-09-03 04:59:55.296512600 +0000
|
||||
@@ -10,9 +10,9 @@ import sys
|
||||
args = sys.argv[1:]
|
||||
inputfiles = [a for a in args if not a.startswith('-')]
|
||||
|
||||
-contents = ''
|
||||
+contents = b''
|
||||
if '-' in args or not inputfiles:
|
||||
- contents = sys.stdin.read()
|
||||
+ contents = sys.stdin.buffer.read()
|
||||
|
||||
# Tarball builds may or may not have depot_tools in $PATH. In the former case,
|
||||
# running 'clang-format' will call back into this script infinitely. Strip off
|
||||
@@ -34,14 +34,14 @@ try:
|
||||
stdout, stderr = proc.communicate(input=contents)
|
||||
# Ignore if clang-format fails. Eg: it may be too old to support C++14.
|
||||
if proc.returncode == 0:
|
||||
- sys.stdout.write(stdout)
|
||||
- sys.stderr.write(stderr)
|
||||
+ sys.stdout.buffer.write(stdout)
|
||||
+ sys.stderr.buffer.write(stderr)
|
||||
sys.exit(0)
|
||||
except OSError:
|
||||
# Ignore if clang-format is not installed.
|
||||
pass
|
||||
|
||||
# If any failure happens, continue with unformatted files.
|
||||
-sys.stdout.write(contents)
|
||||
+sys.stdout.buffer.write(contents)
|
||||
for inputfile in inputfiles:
|
||||
- sys.stdout.write(open(inputfile).read())
|
||||
+ sys.stdout.buffer.write(open(inputfile).read())
|
||||
@ -0,0 +1,52 @@
|
||||
diff -up chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11 chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
|
||||
--- chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.freetype-2.11 2021-09-02 08:49:18.996863417 -0400
|
||||
+++ chromium-93.0.4577.63/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp 2021-09-02 08:56:07.716626801 -0400
|
||||
@@ -712,7 +712,11 @@ void colrv1_draw_paint(SkCanvas* canvas,
|
||||
canvas->drawPaint(colrPaint);
|
||||
break;
|
||||
}
|
||||
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
|
||||
case FT_COLR_PAINTFORMAT_TRANSFORM:
|
||||
+#else
|
||||
+ case FT_COLR_PAINTFORMAT_TRANSFORMED:
|
||||
+#endif
|
||||
case FT_COLR_PAINTFORMAT_TRANSLATE:
|
||||
case FT_COLR_PAINTFORMAT_SCALE:
|
||||
case FT_COLR_PAINTFORMAT_ROTATE:
|
||||
@@ -760,10 +764,17 @@ void colrv1_transform(SkCanvas* canvas,
|
||||
SkMatrix transform;
|
||||
|
||||
switch (colrv1_paint.format) {
|
||||
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
|
||||
case FT_COLR_PAINTFORMAT_TRANSFORM: {
|
||||
transform = ToSkMatrix(colrv1_paint.u.transform.affine);
|
||||
break;
|
||||
}
|
||||
+#else
|
||||
+ case FT_COLR_PAINTFORMAT_TRANSFORMED: {
|
||||
+ transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
|
||||
+ break;
|
||||
+ }
|
||||
+#endif
|
||||
case FT_COLR_PAINTFORMAT_TRANSLATE: {
|
||||
transform = SkMatrix::Translate(
|
||||
SkFixedToScalar(colrv1_paint.u.translate.dx),
|
||||
@@ -889,11 +900,18 @@ bool colrv1_traverse_paint(SkCanvas* can
|
||||
traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
|
||||
FT_COLOR_NO_ROOT_TRANSFORM);
|
||||
break;
|
||||
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
|
||||
case FT_COLR_PAINTFORMAT_TRANSFORM:
|
||||
colrv1_transform(canvas, face, paint);
|
||||
traverse_result = colrv1_traverse_paint(canvas, palette, face,
|
||||
paint.u.transform.paint, visited_set);
|
||||
break;
|
||||
+#else
|
||||
+ case FT_COLR_PAINTFORMAT_TRANSFORMED:
|
||||
+ colrv1_transform(canvas, face, paint);
|
||||
+ traverse_result = colrv1_traverse_paint(canvas, palette, face,
|
||||
+ paint.u.transformed.paint, visited_set);
|
||||
+#endif
|
||||
case FT_COLR_PAINTFORMAT_TRANSLATE:
|
||||
colrv1_transform(canvas, face, paint);
|
||||
traverse_result = colrv1_traverse_paint(canvas, palette, face,
|
||||
@ -0,0 +1,45 @@
|
||||
diff -up chromium-93.0.4577.63/net/base/test_data_stream.cc.missing-cstring chromium-93.0.4577.63/net/base/test_data_stream.cc
|
||||
--- chromium-93.0.4577.63/net/base/test_data_stream.cc.missing-cstring 2021-09-03 13:59:54.051831465 +0000
|
||||
+++ chromium-93.0.4577.63/net/base/test_data_stream.cc 2021-09-03 14:00:05.448414041 +0000
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "net/base/test_data_stream.h"
|
||||
|
||||
#include <algorithm>
|
||||
+#include <cstring>
|
||||
|
||||
namespace net {
|
||||
|
||||
diff -up chromium-93.0.4577.63/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring chromium-93.0.4577.63/third_party/webrtc/audio/utility/channel_mixer.cc
|
||||
--- chromium-93.0.4577.63/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring 2021-09-03 12:29:44.105246962 +0000
|
||||
+++ chromium-93.0.4577.63/third_party/webrtc/audio/utility/channel_mixer.cc 2021-09-03 12:29:44.106246925 +0000
|
||||
@@ -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-93.0.4577.63/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring chromium-93.0.4577.63/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
|
||||
--- chromium-93.0.4577.63/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring 2021-09-03 12:29:43.585266089 +0000
|
||||
+++ chromium-93.0.4577.63/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc 2021-09-03 12:29:43.585266089 +0000
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <sys/mman.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
+#include <cstring>
|
||||
#include <memory>
|
||||
#include <utility>
|
||||
|
||||
diff -up chromium-93.0.4577.63/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring chromium-93.0.4577.63/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
|
||||
--- chromium-93.0.4577.63/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring 2021-09-03 12:29:43.275277492 +0000
|
||||
+++ chromium-93.0.4577.63/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc 2021-09-03 12:29:43.273277565 +0000
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
#include "modules/video_coding/utility/ivf_file_reader.h"
|
||||
|
||||
+#include <cstring>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff -up chromium-93.0.4577.63/services/network/test/test_url_loader_factory.h.mojo-header-fix chromium-93.0.4577.63/services/network/test/test_url_loader_factory.h
|
||||
--- chromium-93.0.4577.63/services/network/test/test_url_loader_factory.h.mojo-header-fix 2021-09-03 17:22:17.902206557 +0000
|
||||
+++ chromium-93.0.4577.63/services/network/test/test_url_loader_factory.h 2021-09-03 17:22:31.853693947 +0000
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "services/network/public/cpp/resource_request.h"
|
||||
#include "services/network/public/mojom/url_loader.mojom.h"
|
||||
#include "services/network/public/mojom/url_loader_factory.mojom.h"
|
||||
-#include "services/network/public/mojom/url_response_head.mojom-forward.h"
|
||||
+#include "services/network/public/mojom/url_response_head.mojom.h"
|
||||
|
||||
namespace network {
|
||||
class WeakWrapperSharedURLLoaderFactory;
|
||||
@ -0,0 +1,90 @@
|
||||
diff -up chromium-93.0.4577.63/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-93.0.4577.63/chrome/common/safe_browsing/BUILD.gn
|
||||
--- chromium-93.0.4577.63/chrome/common/safe_browsing/BUILD.gn.nounrar 2021-09-02 08:22:31.280927364 -0400
|
||||
+++ chromium-93.0.4577.63/chrome/common/safe_browsing/BUILD.gn 2021-09-02 08:23:32.143189935 -0400
|
||||
@@ -43,39 +43,6 @@ if (safe_browsing_mode == 1) {
|
||||
public_deps = [ "//components/safe_browsing/core/common/proto: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/content/common:file_type_policies",
|
||||
- "//components/safe_browsing/core/common",
|
||||
- "//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/common/proto:csd_proto" ]
|
||||
- }
|
||||
-
|
||||
if (is_mac) {
|
||||
source_set("disk_image_type_sniffer_mac") {
|
||||
sources = [
|
||||
@@ -149,7 +116,6 @@ source_set("safe_browsing") {
|
||||
":archive_analyzer_results",
|
||||
":binary_feature_extractor",
|
||||
":download_type_util",
|
||||
- ":rar_analyzer",
|
||||
"//components/safe_browsing/core/common",
|
||||
]
|
||||
|
||||
diff -up chromium-93.0.4577.63/chrome/common/safe_browsing/DEPS.nounrar chromium-93.0.4577.63/chrome/common/safe_browsing/DEPS
|
||||
--- chromium-93.0.4577.63/chrome/common/safe_browsing/DEPS.nounrar 2021-09-02 08:22:31.280927364 -0400
|
||||
+++ chromium-93.0.4577.63/chrome/common/safe_browsing/DEPS 2021-09-02 08:23:56.092293262 -0400
|
||||
@@ -2,6 +2,5 @@ include_rules = [
|
||||
"+components/safe_browsing/content/common",
|
||||
"+components/safe_browsing/core/common",
|
||||
"+third_party/protobuf",
|
||||
- "+third_party/unrar",
|
||||
"+third_party/zlib",
|
||||
]
|
||||
diff -up chromium-93.0.4577.63/chrome/services/file_util/BUILD.gn.nounrar chromium-93.0.4577.63/chrome/services/file_util/BUILD.gn
|
||||
--- chromium-93.0.4577.63/chrome/services/file_util/BUILD.gn.nounrar 2021-08-31 21:39:29.000000000 -0400
|
||||
+++ chromium-93.0.4577.63/chrome/services/file_util/BUILD.gn 2021-09-02 08:22:31.280927364 -0400
|
||||
@@ -50,7 +50,6 @@ source_set("file_util") {
|
||||
deps += [
|
||||
"//chrome/common/safe_browsing",
|
||||
"//chrome/common/safe_browsing:archive_analyzer_results",
|
||||
- "//chrome/common/safe_browsing:rar_analyzer",
|
||||
]
|
||||
}
|
||||
|
||||
diff -up chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc
|
||||
--- chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2021-08-31 21:39:29.000000000 -0400
|
||||
+++ chromium-93.0.4577.63/chrome/services/file_util/safe_archive_analyzer.cc 2021-09-02 08:22:31.281927369 -0400
|
||||
@@ -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,12 @@
|
||||
diff -up chromium-93.0.4577.63/tools/gn/bootstrap/bootstrap.py.py3 chromium-93.0.4577.63/tools/gn/bootstrap/bootstrap.py
|
||||
--- chromium-93.0.4577.63/tools/gn/bootstrap/bootstrap.py.py3 2021-08-31 21:40:34.000000000 -0400
|
||||
+++ chromium-93.0.4577.63/tools/gn/bootstrap/bootstrap.py 2021-09-02 08:26:04.415846917 -0400
|
||||
@@ -130,7 +130,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/python3',
|
||||
'--args=%s' % gn_gen_args, "--root=" + SRC_ROOT
|
||||
])
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
diff -up chromium-93.0.4577.63/remoting/host/remote_open_url_client.cc.remoting-nodestructor-fix chromium-93.0.4577.63/remoting/host/remote_open_url_client.cc
|
||||
--- chromium-93.0.4577.63/remoting/host/remote_open_url_client.cc.remoting-nodestructor-fix 2021-09-03 17:30:44.162605313 +0000
|
||||
+++ chromium-93.0.4577.63/remoting/host/remote_open_url_client.cc 2021-09-03 17:31:01.017986003 +0000
|
||||
@@ -56,7 +56,7 @@ void ShowMessageDialog(const std::string
|
||||
}
|
||||
|
||||
bool IsBrowserValid(const std::string& browser) {
|
||||
- static const base::NoDestructor<base::flat_set<std::string>> invalid_browsers(
|
||||
+ static const base::NoDestructor<base::flat_set<std::string>> invalid_browsers{
|
||||
{
|
||||
// This is the chromoting forwarder itself.
|
||||
"crd-url-forwarder.desktop",
|
||||
@@ -64,7 +64,7 @@ bool IsBrowserValid(const std::string& b
|
||||
// XFCE's forwarder. May potentially launch the chromoting forwarder
|
||||
// recursively.
|
||||
"xfce4-web-browser.desktop",
|
||||
- });
|
||||
+ }};
|
||||
if (browser.empty()) {
|
||||
return false;
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
diff -up chromium-93.0.4577.63/components/cast_channel/enum_table.h.vector-fix chromium-93.0.4577.63/components/cast_channel/enum_table.h
|
||||
--- chromium-93.0.4577.63/components/cast_channel/enum_table.h.vector-fix 2021-09-03 12:23:37.974714814 +0000
|
||||
+++ chromium-93.0.4577.63/components/cast_channel/enum_table.h 2021-09-03 12:23:51.330223540 +0000
|
||||
@@ -8,6 +8,7 @@
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <ostream>
|
||||
+#include <vector>
|
||||
|
||||
#include "base/check_op.h"
|
||||
#include "base/macros.h"
|
||||
@ -0,0 +1,14 @@
|
||||
diff -up chromium-93.0.4577.63/chrome/browser/component_updater/registration.cc.widevine-no-download chromium-93.0.4577.63/chrome/browser/component_updater/registration.cc
|
||||
--- chromium-93.0.4577.63/chrome/browser/component_updater/registration.cc.widevine-no-download 2021-09-02 08:37:03.910692041 -0400
|
||||
+++ chromium-93.0.4577.63/chrome/browser/component_updater/registration.cc 2021-09-02 08:45:07.446778150 -0400
|
||||
@@ -118,10 +118,6 @@ void RegisterComponentsForUpdate(bool is
|
||||
RegisterMediaFoundationWidevineCdmComponent(cus);
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
|
||||
- RegisterWidevineCdmComponent(cus);
|
||||
-#endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
|
||||
-
|
||||
#if BUILDFLAG(ENABLE_NACL) && !defined(OS_ANDROID)
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
// PNaCl on Chrome OS is on rootfs and there is no need to download it. But
|
||||
Loading…
Reference in new issue