aboutsummaryrefslogtreecommitdiff
path: root/www/chromium
diff options
context:
space:
mode:
authorChristoph Moench-Tegeder <cmt@FreeBSD.org>2020-03-09 10:25:45 +0000
committerChristoph Moench-Tegeder <cmt@FreeBSD.org>2020-03-09 10:25:45 +0000
commitb3ca6f9079a18829608706fc112ea08a057d448a (patch)
treec4e287bbd3fefce72456dbf2ef1371d695bb058e /www/chromium
parentccbea2cf7d2ccef753951acbf80235625f3d3dbf (diff)
downloadports-b3ca6f9079a18829608706fc112ea08a057d448a.tar.gz
ports-b3ca6f9079a18829608706fc112ea08a057d448a.zip
remove patches obviously forgotten when updating to chrome 80
these patches don't apply anymore and are not needed anymore, according to my reading of the code PR: 244625 Approved by: "trivial build fixes" blanket
Notes
Notes: svn path=/head/; revision=528101
Diffstat (limited to 'www/chromium')
-rw-r--r--www/chromium/files/patch-base_memory_protected__memory__posix.cc31
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__features.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__features.h14
-rw-r--r--www/chromium/files/patch-chrome_browser_platform__util.h11
-rw-r--r--www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc11
-rw-r--r--www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc11
-rw-r--r--www/chromium/files/patch-media_gpu_libyuv__image__processor.cc38
-rw-r--r--www/chromium/files/patch-remoting_webapp_base_js_platform.js17
-rw-r--r--www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc20
-rw-r--r--www/chromium/files/patch-ui_gl_gl__surface__glx.cc14
-rw-r--r--www/chromium/files/patch-ui_platform__window_platform__window__delegate.h20
-rw-r--r--www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc20
-rw-r--r--www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h11
-rw-r--r--www/chromium/files/patch-v8_src_trap-handler_trap-handler.h11
14 files changed, 0 insertions, 243 deletions
diff --git a/www/chromium/files/patch-base_memory_protected__memory__posix.cc b/www/chromium/files/patch-base_memory_protected__memory__posix.cc
deleted file mode 100644
index 988ce327bbf2..000000000000
--- a/www/chromium/files/patch-base_memory_protected__memory__posix.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- base/memory/protected_memory_posix.cc.orig 2019-05-01 17:25:41 UTC
-+++ base/memory/protected_memory_posix.cc
-@@ -8,9 +8,9 @@
- #include <sys/mman.h>
- #include <unistd.h>
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <sys/resource.h>
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- #if defined(OS_MACOSX) && !defined(OS_IOS)
- #include <mach/mach.h>
-@@ -44,7 +44,7 @@ bool AutoWritableMemory::SetMemoryReadOnly(void* start
- return SetMemory(start, end, PROT_READ);
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- void AssertMemoryIsReadOnly(const void* ptr) {
- #if DCHECK_IS_ON()
- const uintptr_t page_mask = ~(base::GetPageSize() - 1);
-@@ -74,6 +74,6 @@ void AssertMemoryIsReadOnly(const void* ptr) {
- DCHECK_EQ(region_info.protection, VM_PROT_READ);
- #endif // DCHECK_IS_ON()
- }
--#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
-+#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD)
-
- } // namespace base
diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc
deleted file mode 100644
index 6a854f49b1a6..000000000000
--- a/www/chromium/files/patch-chrome_browser_browser__features.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- chrome/browser/browser_features.cc.orig 2019-10-30 15:46:57 UTC
-+++ chrome/browser/browser_features.cc
-@@ -13,9 +13,9 @@ const base::Feature kDoubleTapToZoomInTabletMode{
- "DoubleTapToZoomInTabletMode", base::FEATURE_DISABLED_BY_DEFAULT};
- #endif
-
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- const base::Feature kSyncClipboardServiceFeature{
- "SyncClipboardService", base::FEATURE_DISABLED_BY_DEFAULT};
--#endif // OS_WIN || OS_MACOSX || OS_LINUX
-+#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
-
- } // namespace features
diff --git a/www/chromium/files/patch-chrome_browser_browser__features.h b/www/chromium/files/patch-chrome_browser_browser__features.h
deleted file mode 100644
index 4b2aa71959b4..000000000000
--- a/www/chromium/files/patch-chrome_browser_browser__features.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- chrome/browser/browser_features.h.orig 2019-10-30 15:47:15 UTC
-+++ chrome/browser/browser_features.h
-@@ -20,9 +20,9 @@ namespace features {
- extern const base::Feature kDoubleTapToZoomInTabletMode;
- #endif
-
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- extern const base::Feature kSyncClipboardServiceFeature;
--#endif // OS_WIN || OS_MACOSX || OS_LINUX
-+#endif // OS_WIN || OS_MACOSX || OS_LINUX || defined(OS_BSD)
-
- } // namespace features
-
diff --git a/www/chromium/files/patch-chrome_browser_platform__util.h b/www/chromium/files/patch-chrome_browser_platform__util.h
deleted file mode 100644
index a7b46792e1bd..000000000000
--- a/www/chromium/files/patch-chrome_browser_platform__util.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/platform_util.h.orig 2019-06-04 18:55:17 UTC
-+++ chrome/browser/platform_util.h
-@@ -41,7 +41,7 @@ enum OpenOperationResult {
- enum OpenItemType {
- OPEN_FILE,
- OPEN_FOLDER,
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- SHOW_ITEM_IN_FOLDER
- #endif
- };
diff --git a/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc b/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc
deleted file mode 100644
index 9a4179259ea8..000000000000
--- a/www/chromium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/public/app/v8_snapshot_overlay_manifest.cc.orig 2019-04-30 22:22:47 UTC
-+++ content/public/app/v8_snapshot_overlay_manifest.cc
-@@ -15,7 +15,7 @@ namespace content {
- const service_manager::Manifest& GetV8SnapshotOverlayManifest() {
- static base::NoDestructor<service_manager::Manifest> manifest {
- service_manager::ManifestBuilder()
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- .PreloadFile(kV8NativesDataDescriptor,
- base::FilePath(FILE_PATH_LITERAL("natives_blob.bin")))
- #if defined(USE_V8_CONTEXT_SNAPSHOT)
diff --git a/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc b/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc
deleted file mode 100644
index ffcf97d087fb..000000000000
--- a/www/chromium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc.orig 2019-10-21 19:06:32 UTC
-+++ content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc
-@@ -244,7 +244,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) {
- TEST_F(WebRtcAudioRendererTest, VerifySinkParameters) {
- SetupRenderer(kDefaultOutputDeviceId);
- renderer_proxy_->Start();
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD)
- static const int kExpectedBufferSize = kHardwareSampleRate / 100;
- #elif defined(OS_ANDROID)
- static const int kExpectedBufferSize = 2 * kHardwareSampleRate / 100;
diff --git a/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc b/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc
deleted file mode 100644
index b2313a9e7610..000000000000
--- a/www/chromium/files/patch-media_gpu_libyuv__image__processor.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- media/gpu/libyuv_image_processor.cc.orig 2019-12-16 21:51:27 UTC
-+++ media/gpu/libyuv_image_processor.cc
-@@ -78,7 +78,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
- // LibYUVImageProcessor supports only memory-based video frame for input.
- VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN;
- for (auto input_type : input_config.preferred_storage_types) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (input_type == VideoFrame::STORAGE_DMABUFS) {
- video_frame_mapper = VideoFrameMapperFactory::CreateMapper(
- input_config.fourcc.ToVideoPixelFormat(), true);
-@@ -87,7 +87,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
- break;
- }
- }
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- if (VideoFrame::IsStorageTypeMappable(input_type)) {
- input_storage_type = input_type;
-@@ -186,7 +186,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
- FrameReadyCB cb) {
- DCHECK(process_thread_.task_runner()->BelongsToCurrentThread());
- DVLOGF(4);
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (input_frame->storage_type() == VideoFrame::STORAGE_DMABUFS) {
- DCHECK_NE(video_frame_mapper_.get(), nullptr);
- input_frame = video_frame_mapper_->Map(std::move(input_frame));
-@@ -196,7 +196,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
- return;
- }
- }
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- int res = DoConversion(input_frame.get(), output_frame.get());
- if (res != 0) {
diff --git a/www/chromium/files/patch-remoting_webapp_base_js_platform.js b/www/chromium/files/patch-remoting_webapp_base_js_platform.js
deleted file mode 100644
index b03f6c2d525e..000000000000
--- a/www/chromium/files/patch-remoting_webapp_base_js_platform.js
+++ /dev/null
@@ -1,17 +0,0 @@
---- remoting/webapp/base/js/platform.js.orig 2019-03-11 22:01:01 UTC
-+++ remoting/webapp/base/js/platform.js
-@@ -107,6 +107,14 @@ remoting.getSystemInfo = function() {
- return result;
- }
-
-+ match = new RegExp('FreeBSD ([a-zA-Z0-9_]*)').exec(userAgent);
-+ if (match && (match.length >= 2)) {
-+ result.osName = remoting.Os.LINUX;
-+ result.osVersion = '';
-+ result.cpu = match[1];
-+ return result;
-+ }
-+
- match = new RegExp('([a-zA-Z]*) Mac OS X ([0-9_]*)').exec(userAgent);
- if (match && (match.length >= 3)) {
- result.osName = remoting.Os.MAC;
diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
deleted file mode 100644
index 99c80524d355..000000000000
--- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- services/device/time_zone_monitor/time_zone_monitor.cc.orig 2019-12-16 21:51:27 UTC
-+++ services/device/time_zone_monitor/time_zone_monitor.cc
-@@ -30,7 +30,7 @@ void TimeZoneMonitor::Bind(
-
- void TimeZoneMonitor::NotifyClients() {
- DCHECK(thread_checker_.CalledOnValidThread());
--#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(IS_CHROMECAST))
-+#if defined(OS_CHROMEOS) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(IS_CHROMECAST))
- // On CrOS (and Chromecast), ICU's default tz is already set to a new zone. No
- // need to redetect it with detectHostTimeZone().
- std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
-@@ -42,7 +42,7 @@ void TimeZoneMonitor::NotifyClients() {
- #else
- std::unique_ptr<icu::TimeZone> new_zone(icu::TimeZone::detectHostTimeZone());
- #endif
--#if defined(OS_LINUX) && !defined(IS_CHROMECAST)
-+#if (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
- // We get here multiple times on Linux per a single tz change, but
- // want to update the ICU default zone and notify renderer only once.
- std::unique_ptr<icu::TimeZone> current_zone(icu::TimeZone::createDefault());
diff --git a/www/chromium/files/patch-ui_gl_gl__surface__glx.cc b/www/chromium/files/patch-ui_gl_gl__surface__glx.cc
deleted file mode 100644
index c956037fa3f1..000000000000
--- a/www/chromium/files/patch-ui_gl_gl__surface__glx.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- ui/gl/gl_surface_glx.cc.orig 2019-12-16 21:51:34 UTC
-+++ ui/gl/gl_surface_glx.cc
-@@ -459,7 +459,10 @@ bool GLSurfaceGLX::InitializeOneOff() {
- return false;
- }
-
-- const auto& visual_info = gl::GLVisualPickerGLX::GetInstance()->rgba_visual();
-+ const auto& visual_info =
-+ ui::IsCompositingManagerPresent()
-+ ? gl::GLVisualPickerGLX::GetInstance()->rgba_visual()
-+ : gl::GLVisualPickerGLX::GetInstance()->system_visual();
- g_visual = visual_info.visual;
- g_depth = visual_info.depth;
- g_colormap =
diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h
deleted file mode 100644
index 1734e0d6cb1b..000000000000
--- a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/platform_window/platform_window_delegate.h.orig 2019-10-30 16:37:03 UTC
-+++ ui/platform_window/platform_window_delegate.h
-@@ -9,7 +9,7 @@
-
- // By default, PlatformWindowDelegateBase is used. However, different platforms
- // should specify what delegate they would like to use if needed.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "ui/platform_window/platform_window_delegate_linux.h"
- #else
- #include "ui/platform_window/platform_window_delegate_base.h"
-@@ -17,7 +17,7 @@
-
- namespace ui {
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- using PlatformWindowDelegate = PlatformWindowDelegateLinux;
- #else
- using PlatformWindowDelegate = PlatformWindowDelegateBase;
diff --git a/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc b/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc
deleted file mode 100644
index dd1ea4153ede..000000000000
--- a/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- v8/src/trap-handler/handler-inside-posix.cc.orig 2019-03-11 22:08:08 UTC
-+++ v8/src/trap-handler/handler-inside-posix.cc
-@@ -27,7 +27,7 @@
-
- #include <signal.h>
-
--#ifdef V8_OS_LINUX
-+#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)
- #include <ucontext.h>
- #elif V8_OS_MACOSX
- #include <sys/ucontext.h>
-@@ -112,6 +112,8 @@ bool TryHandleSignal(int signum, siginfo_t* info, void
- auto* context_rip = &uc->uc_mcontext.gregs[REG_RIP];
- #elif V8_OS_MACOSX
- auto* context_rip = &uc->uc_mcontext->__ss.__rip;
-+#elif V8_OS_FREEBSD
-+ auto* context_rip = &uc->uc_mcontext.mc_rip;
- #else
- #error Unsupported platform
- #endif
diff --git a/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h b/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h
deleted file mode 100644
index 3e8c86402c73..000000000000
--- a/www/chromium/files/patch-v8_src_trap-handler_handler-inside-posix.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- v8/src/trap-handler/handler-inside-posix.h.orig 2019-03-11 22:08:08 UTC
-+++ v8/src/trap-handler/handler-inside-posix.h
-@@ -12,7 +12,7 @@ namespace v8 {
- namespace internal {
- namespace trap_handler {
-
--#if V8_OS_LINUX
-+#if defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)
- constexpr int kOobSignal = SIGSEGV;
- #elif V8_OS_MACOSX
- constexpr int kOobSignal = SIGBUS;
diff --git a/www/chromium/files/patch-v8_src_trap-handler_trap-handler.h b/www/chromium/files/patch-v8_src_trap-handler_trap-handler.h
deleted file mode 100644
index 1d2e48b14832..000000000000
--- a/www/chromium/files/patch-v8_src_trap-handler_trap-handler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- v8/src/trap-handler/trap-handler.h.orig 2019-03-11 22:08:08 UTC
-+++ v8/src/trap-handler/trap-handler.h
-@@ -23,6 +23,8 @@ namespace trap_handler {
- #define V8_TRAP_HANDLER_SUPPORTED true
- #elif V8_TARGET_ARCH_X64 && V8_OS_MACOSX
- #define V8_TRAP_HANDLER_SUPPORTED true
-+#elif V8_TARGET_ARCH_X64 && V8_OS_FREEBSD
-+#define V8_TRAP_HANDLER_SUPPORTED true
- #else
- #define V8_TRAP_HANDLER_SUPPORTED false
- #endif