diff --git a/network/web/chromium-browser/files/patches/chromium-95-libyuv-arm.patch b/network/web/chromium-browser/files/patches/chromium-95-libyuv-arm.patch deleted file mode 100644 index 25a8cdb878..0000000000 --- a/network/web/chromium-browser/files/patches/chromium-95-libyuv-arm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/third_party/libyuv/source/row_neon.cc b/third_party/libyuv/source/row_neon.cc -index 6ef6f1c..e4a9e1e 100644 ---- a/third_party/libyuv/source/row_neon.cc -+++ b/third_party/libyuv/source/row_neon.cc -@@ -2346,7 +2346,7 @@ void ARGBToAB64Row_NEON(const uint8_t* src_argb, - uint16_t* dst_ab64, - int width) { - asm volatile( -- "vld1.8 q4, %3 \n" // shuffler -+ "vld1.8 {d8, d9}, %3 \n" // shuffler - "1: \n" - "vld1.8 {q0}, [%0]! \n" - "vld1.8 {q2}, [%0]! \n" diff --git a/network/web/chromium-browser/files/patches/chromium-98-MiraclePtr-gcc-ice.patch b/network/web/chromium-browser/files/patches/chromium-98-MiraclePtr-gcc-ice.patch deleted file mode 100644 index c538befef2..0000000000 --- a/network/web/chromium-browser/files/patches/chromium-98-MiraclePtr-gcc-ice.patch +++ /dev/null @@ -1,91 +0,0 @@ -Workaround GCC ICE with MiraclePtr, see https://gcc.gnu.org/PR103455 - ---- a/gpu/command_buffer/client/gl_helper.h -+++ b/gpu/command_buffer/client/gl_helper.h -@@ -34,7 +34,7 @@ class ScopedGLuint { - GenFunc gen_func, - DeleteFunc delete_func) - : gl_(gl), id_(0u), delete_func_(delete_func) { -- (gl_->*gen_func)(1, &id_); -+ (gl_.get()->*gen_func)(1, &id_); - } - - operator GLuint() const { return id_; } -@@ -46,7 +46,7 @@ class ScopedGLuint { - - ~ScopedGLuint() { - if (id_ != 0) { -- (gl_->*delete_func_)(1, &id_); -+ (gl_.get()->*delete_func_)(1, &id_); - } - } - -@@ -86,13 +86,13 @@ class ScopedBinder { - typedef void (gles2::GLES2Interface::*BindFunc)(GLenum target, GLuint id); - ScopedBinder(gles2::GLES2Interface* gl, GLuint id, BindFunc bind_func) - : gl_(gl), bind_func_(bind_func) { -- (gl_->*bind_func_)(Target, id); -+ (gl_.get()->*bind_func_)(Target, id); - } - - ScopedBinder(const ScopedBinder&) = delete; - ScopedBinder& operator=(const ScopedBinder&) = delete; - -- virtual ~ScopedBinder() { (gl_->*bind_func_)(Target, 0); } -+ virtual ~ScopedBinder() { (gl_.get()->*bind_func_)(Target, 0); } - - private: - raw_ptr gl_; ---- a/ui/accessibility/ax_node.h -+++ b/ui/accessibility/ax_node.h -@@ -822,10 +822,10 @@ AXNode::ChildIteratorBase*LastChild)()) -+ if (child_ == (parent_.get()->*LastChild)()) - child_ = nullptr; - else -- child_ = (child_->*NextSibling)(); -+ child_ = (child_.get()->*NextSibling)(); - } - - return *this; -@@ -850,12 +850,12 @@ AXNode::ChildIteratorBase*LastChild)(); -+ child_ = (parent_.get()->*LastChild)(); - // Decrement the iterator gives us the previous element, except when the - // iterator is at the beginning; in which case, decrementing the iterator - // remains at the beginning. -- else if (child_ != (parent_->*FirstChild)()) -- child_ = (child_->*PreviousSibling)(); -+ else if (child_ != (parent_.get()->*FirstChild)()) -+ child_ = (child_.get()->*PreviousSibling)(); - } - - return *this; ---- a/ui/views/layout/flex_layout_types.cc -+++ b/ui/views/layout/flex_layout_types.cc -@@ -59,7 +59,7 @@ class LazySize { - const gfx::Size& operator*() const { return *get(); } - const gfx::Size* get() const { - if (!size_) -- size_ = (view_->*size_func_)(); -+ size_ = (view_.get()->*size_func_)(); - return &size_.value(); - } - LazyDimension width() const { ---- a/chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.cc -+++ b/chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.cc -@@ -37,7 +37,7 @@ AutoSigninFirstRunDialogView::AutoSigninFirstRunDialogView( - auto call_controller = [](AutoSigninFirstRunDialogView* dialog, - ControllerCallbackFn func) { - if (dialog->controller_) { -- (dialog->controller_->*func)(); -+ (dialog->controller_.get()->*func)(); - } - }; - SetAcceptCallback( diff --git a/network/web/chromium-browser/files/patches/chromium-98-WaylandFrameManager-check.patch b/network/web/chromium-browser/files/patches/chromium-98-WaylandFrameManager-check.patch deleted file mode 100644 index dc8b06b394..0000000000 --- a/network/web/chromium-browser/files/patches/chromium-98-WaylandFrameManager-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8e2458ffc6727943518a622753b074b42e713403 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Sat, 18 Dec 2021 08:38:57 +0000 -Subject: [PATCH] libstdc++: fix DCHECK_NE in ui::WaylandFrameManager - -There is no CheckOpValueStr() for std::unique_ptr. Use get() to -compare pointer values. ---- - ui/ozone/platform/wayland/host/wayland_frame_manager.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ui/ozone/platform/wayland/host/wayland_frame_manager.cc b/ui/ozone/platform/wayland/host/wayland_frame_manager.cc -index 569526c..58fae14 100644 ---- a/ui/ozone/platform/wayland/host/wayland_frame_manager.cc -+++ b/ui/ozone/platform/wayland/host/wayland_frame_manager.cc -@@ -379,7 +379,7 @@ void WaylandFrameManager::OnPresentation( - // Investigate the issue with surface sync. - frame->feedback = gfx::PresentationFeedback::Failure(); - } -- CHECK_NE(frame, submitted_frames_.back()); -+ CHECK_NE(frame.get(), submitted_frames_.back().get()); - } - MaybeProcessSubmittedFrames(); - } --- -2.32.0 - diff --git a/network/web/chromium-browser/files/patches/chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch b/network/web/chromium-browser/files/patches/chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch new file mode 100644 index 0000000000..58b76a747b --- /dev/null +++ b/network/web/chromium-browser/files/patches/chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch @@ -0,0 +1,32 @@ +From f1befebb6cea78950b5a8133bf3e65d56889d353 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz +Date: Thu, 20 Jan 2022 09:38:13 +0100 +Subject: [PATCH] GCC: use braces initialization for NoDestructor in AutofillAssistantModelExecutor + +Fix build with GCC failing to resolve initialization of NoDestructor +with initializer list. + +Bug: 819294 +Change-Id: I5fe8d30b4aefdddd71ff7b220eeffcd838308f5a +--- + +diff --git a/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc b/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc +index 033205b..670376e 100644 +--- a/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc ++++ b/components/autofill_assistant/content/renderer/autofill_assistant_model_executor.cc +@@ -156,13 +156,13 @@ + // TODO(b/204841212): Implement this with use of ModelMetadata. + absl::optional AutofillAssistantModelExecutor::Postprocess( + const std::vector& output_tensors) { +- static const base::NoDestructor> output_roles( ++ static const base::NoDestructor> output_roles{ + {"UNKNOWN_ROLE", "NAME_FIRST", "NAME_LAST", "NAME_FULL", "ADDRESS_LINE1", + "ADDRESS_LINE2", "CITY", "STATE", "COUNTRY", "POSTAL_CODE", + "CREDIT_CARD_NUMBER", "CREDIT_CARD_EXP_MONTH", + "CREDIT_CARD_VERIFICATION_CODE", "ORGANIZATION", + "CREDIT_CARD_EXPIRATION", "PHONE_NUMBER", "USERNAME_OR_EMAIL", +- "CREDIT_CARD_EXP_YEAR"}); ++ "CREDIT_CARD_EXP_YEAR"}}; + + DCHECK_GE(output_tensors.size(), 1u); + std::vector data; diff --git a/network/web/chromium-browser/files/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch b/network/web/chromium-browser/files/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch index 5b9c0e353f..0faf894a8e 100644 --- a/network/web/chromium-browser/files/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch +++ b/network/web/chromium-browser/files/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch @@ -1,4 +1,4 @@ -From cb0aad687f34629a42053d600cf2947282cea2c0 Mon Sep 17 00:00:00 2001 +From ffeb67faf715475f6e463d65c368f556780adf19 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 31 Jan 2022 22:42:35 +0000 Subject: [PATCH] Use FT_Done_MM_Var() in CFX_Font::AdjustMMParams() when @@ -12,17 +12,15 @@ Change-Id: I044540893103921fc64cdd53fcd628cfebf2c9db Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/90130 Reviewed-by: Nigi Commit-Queue: Lei Zhang - -(cherry picked from commit ffeb67faf715475f6e463d65c368f556780adf19) --- core/fxge/cfx_font.cpp | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp -index 7a4e8eb24..0ef421fe7 100644 +index c08fe9608..8b3a72700 100644 --- a/core/fxge/cfx_font.cpp +++ b/core/fxge/cfx_font.cpp -@@ -43,6 +43,30 @@ struct OUTLINE_PARAMS { +@@ -44,6 +44,30 @@ struct OUTLINE_PARAMS { float m_CoordUnit; }; @@ -31,12 +29,12 @@ index 7a4e8eb24..0ef421fe7 100644 +// FT_Done_MM_Var() directly. +// +// Use weak symbols to check if FT_Done_MM_Var() is available at runtime. -+#if !defined(OS_WIN) ++#if !BUILDFLAG(IS_WIN) +extern "C" __attribute__((weak)) decltype(FT_Done_MM_Var) FT_Done_MM_Var; +#endif + +void FreeMMVar(FXFT_FaceRec* rec, FXFT_MM_VarPtr variation_desc) { -+#if defined(OS_WIN) ++#if BUILDFLAG(IS_WIN) + // Assume `use_system_freetype` GN var is never set on Windows. + constexpr bool has_ft_done_mm_var_func = true; +#else @@ -50,19 +48,20 @@ index 7a4e8eb24..0ef421fe7 100644 + } +} + - #ifdef PDF_ENABLE_XFA - unsigned long FTStreamRead(FXFT_StreamRec* stream, - unsigned long offset, -@@ -640,14 +664,14 @@ void CFX_Font::AdjustMMParams(int glyph_index, - int max_width = FXFT_Get_Glyph_HoriAdvance(m_Face->GetRec()) * 1000 / - FXFT_Get_Face_UnitsPerEM(m_Face->GetRec()); + FX_RECT FXRectFromFTPos(FT_Pos left, FT_Pos top, FT_Pos right, FT_Pos bottom) { + return FX_RECT(pdfium::base::checked_cast(left), + pdfium::base::checked_cast(top), +@@ -645,7 +669,7 @@ void CFX_Font::AdjustMMParams(int glyph_index, + FT_Pos max_width = FXFT_Get_Glyph_HoriAdvance(m_Face->GetRec()) * 1000 / + FXFT_Get_Face_UnitsPerEM(m_Face->GetRec()); if (max_width == min_width) { - FXFT_Free(m_Face->GetRec(), pMasters); + FreeMMVar(m_Face->GetRec(), pMasters); return; } - int param = min_param + (max_param - min_param) * (dest_width - min_width) / - (max_width - min_width); + FT_Pos param = min_param + (max_param - min_param) * +@@ -653,7 +677,7 @@ void CFX_Font::AdjustMMParams(int glyph_index, + (max_width - min_width); coords[1] = param; } - FXFT_Free(m_Face->GetRec(), pMasters); diff --git a/network/web/chromium-browser/files/webcodecs-stop-using-AudioOpusEncoder.patch b/network/web/chromium-browser/files/webcodecs-stop-using-AudioOpusEncoder.patch new file mode 100644 index 0000000000..32957d32fa --- /dev/null +++ b/network/web/chromium-browser/files/webcodecs-stop-using-AudioOpusEncoder.patch @@ -0,0 +1,49 @@ +From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001 +From: Eugene Zemtsov +Date: Thu, 24 Feb 2022 23:17:20 +0000 +Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo + audio encoder + +AudioOpusEncoder was only used here for testing. Let's not let it get +comfortable. We'll use MF AAC encoder here when we have it. (Soon...) + +Bug: 1259883 +Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449 +Commit-Queue: Eugene Zemtsov +Auto-Submit: Eugene Zemtsov +Reviewed-by: Dale Curtis +Commit-Queue: Dale Curtis +Cr-Commit-Position: refs/heads/main@{#974895} +--- + media/mojo/services/gpu_mojo_media_client.cc | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc +index 8f83a4d6cf6..40cdaff8d3a 100644 +--- a/media/mojo/services/gpu_mojo_media_client.cc ++++ b/media/mojo/services/gpu_mojo_media_client.cc +@@ -13,7 +13,6 @@ + #include "build/chromeos_buildflags.h" + #include "gpu/ipc/service/gpu_channel.h" + #include "media/audio/audio_features.h" +-#include "media/audio/audio_opus_encoder.h" + #include "media/base/audio_decoder.h" + #include "media/base/cdm_factory.h" + #include "media/base/media_switches.h" +@@ -119,14 +118,7 @@ std::unique_ptr GpuMojoMediaClient::CreateAudioEncoder( + scoped_refptr task_runner) { + if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder)) + return nullptr; +- // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on +- // we'll create a real platform encoder here. +- auto opus_encoder = std::make_unique(); +- auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner( +- {base::TaskPriority::USER_BLOCKING}); +- return std::make_unique(std::move(opus_encoder), +- std::move(encoding_runner), +- std::move(task_runner)); ++ return nullptr; + } + + VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() { diff --git a/network/web/chromium-browser/pspec.xml b/network/web/chromium-browser/pspec.xml index 703db1422c..e997ed6af6 100644 --- a/network/web/chromium-browser/pspec.xml +++ b/network/web/chromium-browser/pspec.xml @@ -13,7 +13,7 @@ app:gui A WebKit powered web browser Chromium-browser is an open-source web browser, powered by WebKit. - http://gsdview.appspot.com/chromium-browser-official/chromium-98.0.4758.91.tar.xz + http://gsdview.appspot.com/chromium-browser-official/chromium-99.0.4844.58.tar.xz alsa-lib-devel at-spi2-atk-devel @@ -104,6 +104,7 @@ + webcodecs-stop-using-AudioOpusEncoder.patch fix-build-break-with-system-libdrm.patch sql-make-VirtualCursor-standard-layout-type.patch @@ -117,8 +118,7 @@ patches/chromium-78-protobuf-RepeatedPtrField-export.patch patches/chromium-98-compiler.patch - patches/chromium-98-MiraclePtr-gcc-ice.patch - patches/chromium-98-WaylandFrameManager-check.patch + patches/chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch @@ -199,7 +199,14 @@ - + + + 2022-03 + 99.0.4844.58 + Version Bump + İdris Kalp + idriskalp@gmail.com + 2022-02-14 98.0.4758.91