From 27d6266b2dbca740d3b36360def06d72f700aacf Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Fri, 10 Apr 2020 10:23:55 -0700 Subject: [PATCH] chore: remove export_fetchapi... patch (#23067) --- patches/chromium/.patches | 1 - ...i_mojo_traits_to_fix_component_build.patch | 36 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 patches/chromium/export_fetchapi_mojo_traits_to_fix_component_build.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 2bdfc12439b5..d98459e3a487 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -71,7 +71,6 @@ allow_new_privileges_in_unsandboxed_child_processes.patch expose_setuseragent_on_networkcontext.patch feat_add_set_theme_source_to_allow_apps_to.patch revert_cleanup_remove_menu_subtitles_sublabels.patch -export_fetchapi_mojo_traits_to_fix_component_build.patch add_webmessageportconverter_entangleandinjectmessageportchannel.patch revert_remove_contentrendererclient_shouldfork.patch ignore_rc_check.patch diff --git a/patches/chromium/export_fetchapi_mojo_traits_to_fix_component_build.patch b/patches/chromium/export_fetchapi_mojo_traits_to_fix_component_build.patch deleted file mode 100644 index c763ea3cf05b..000000000000 --- a/patches/chromium/export_fetchapi_mojo_traits_to_fix_component_build.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jeremy Apthorp -Date: Fri, 20 Sep 2019 16:44:18 -0400 -Subject: export FetchAPI mojo traits to fix component build - -Without these, we get link errors in the component build when using the -blink::CloneableMessage mojo traits. - -diff --git a/third_party/blink/public/common/fetch/fetch_api_request_body_mojom_traits.h b/third_party/blink/public/common/fetch/fetch_api_request_body_mojom_traits.h -index 1ddfc2108f9a0104247ea2559b597552cd20a342..f9a10b5b428e29a8824b87616f19292b38e38024 100644 ---- a/third_party/blink/public/common/fetch/fetch_api_request_body_mojom_traits.h -+++ b/third_party/blink/public/common/fetch/fetch_api_request_body_mojom_traits.h -@@ -11,12 +11,13 @@ - #include "mojo/public/cpp/bindings/pending_remote.h" - #include "services/network/public/cpp/resource_request_body.h" - #include "services/network/public/mojom/url_loader.mojom-forward.h" -+#include "third_party/blink/public/common/common_export.h" - #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-forward.h" - - namespace mojo { - - template <> --struct StructTraits> { - static bool IsNull(const scoped_refptr& r) { - return !r; -@@ -46,7 +47,7 @@ struct StructTraits --struct StructTraits { - static const network::mojom::DataElementType& type( - const network::DataElement& element) {